Merge pull request openshift#2868 from bryan-cox/HOSTEDCP-1046-update…

…-api-note HOSTEDCP-1046: Add ImageDigestMirrorSet to Config API comment
tssurya · Aug 1, 2023 · b79df9e · b79df9e
2 parents 1fc3c32 + da698dc
commit b79df9e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/api/v1beta1/nodepool_types.go b/api/v1beta1/nodepool_types.go
@@ -116,8 +116,9 @@ type NodePoolSpec struct {
 	// KubeletConfig
 	// ContainerRuntimeConfig
 	// MachineConfig
-	// or
 	// ImageContentSourcePolicy
+	// or
+	// ImageDigestMirrorSet
 	//
 	// +kubebuilder:validation:Optional
 	Config []corev1.LocalObjectReference `json:"config,omitempty"`

diff --git a/cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml b/cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml
@@ -1059,7 +1059,8 @@ spec:
                   is defined here: \n https://github.com/openshift/machine-config-operator/blob/18963e4f8fe66e8c513ca4b131620760a414997f/pkg/apis/machineconfiguration.openshift.io/v1/types.go#L185
                   \n Each ConfigMap must have a single key named \"config\" whose
                   value is the JSON or YAML of a serialized Resource for machineconfiguration.openshift.io:
-                  KubeletConfig ContainerRuntimeConfig MachineConfig or ImageContentSourcePolicy"
+                  KubeletConfig ContainerRuntimeConfig MachineConfig ImageContentSourcePolicy
+                  or ImageDigestMirrorSet"
                 items:
                   description: LocalObjectReference contains enough information to
                     let you locate the referenced object inside the same namespace.

diff --git a/docs/content/reference/api.md b/docs/content/reference/api.md
@@ -642,8 +642,9 @@ JSON or YAML of a serialized Resource for machineconfiguration.openshift.io:
 KubeletConfig
 ContainerRuntimeConfig
 MachineConfig
+ImageContentSourcePolicy
 or
-ImageContentSourcePolicy</p>
+ImageDigestMirrorSet</p>
 </td>
 </tr>
 <tr>
@@ -6189,8 +6190,9 @@ JSON or YAML of a serialized Resource for machineconfiguration.openshift.io:
 KubeletConfig
 ContainerRuntimeConfig
 MachineConfig
+ImageContentSourcePolicy
 or
-ImageContentSourcePolicy</p>
+ImageDigestMirrorSet</p>
 </td>
 </tr>
 <tr>

diff --git a/hack/app-sre/saas_template.yaml b/hack/app-sre/saas_template.yaml
@@ -43729,7 +43729,8 @@ objects:
                     schema is defined here: \n https://github.com/openshift/machine-config-operator/blob/18963e4f8fe66e8c513ca4b131620760a414997f/pkg/apis/machineconfiguration.openshift.io/v1/types.go#L185
                     \n Each ConfigMap must have a single key named \"config\" whose
                     value is the JSON or YAML of a serialized Resource for machineconfiguration.openshift.io:
-                    KubeletConfig ContainerRuntimeConfig MachineConfig or ImageContentSourcePolicy"
+                    KubeletConfig ContainerRuntimeConfig MachineConfig ImageContentSourcePolicy
+                    or ImageDigestMirrorSet"
                   items:
                     description: LocalObjectReference contains enough information
                       to let you locate the referenced object inside the same namespace.