diff --git a/machineconfiguration/v1alpha1/tests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml b/machineconfiguration/v1alpha1/tests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml index bae73d1b259..abdf80b1ecc 100644 --- a/machineconfiguration/v1alpha1/tests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml +++ b/machineconfiguration/v1alpha1/tests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml @@ -80,35 +80,6 @@ tests: node: name: foobar expectedError: "spec.configVersion: Required value, : Invalid value: \"null\"" - - name: Should be able to create a MachineConfigNode with a PinnedImageSet - initial: | - apiVersion: machineconfiguration.openshift.io/v1alpha1 - kind: MachineConfigNode - metadata: - name: foobar - spec: - node: - name: foobar - pool: - name: worker - configVersion: - desired: rendered-worker-abc - pinnedImageSets: - - name: test-pinned-image-set - expected: | - apiVersion: machineconfiguration.openshift.io/v1alpha1 - kind: MachineConfigNode - metadata: - name: foobar - spec: - node: - name: foobar - pool: - name: worker - configVersion: - desired: rendered-worker-abc - pinnedImageSets: - - name: test-pinned-image-set onUpdate: - name: PinnedImageSet desired generation must be greater than or equal to the current generation initial: | @@ -123,8 +94,6 @@ tests: name: worker configVersion: desired: rendered-worker-abc - pinnedImageSets: - - name: test-pinned-image-set status: observedGeneration: 1 configVersion: @@ -145,8 +114,6 @@ tests: name: worker configVersion: desired: rendered-worker-abc - pinnedImageSets: - - name: test-pinned-image-set status: observedGeneration: 1 configVersion: @@ -169,8 +136,6 @@ tests: name: worker configVersion: desired: rendered-worker-abc - pinnedImageSets: - - name: test-pinned-image-set status: observedGeneration: 4 configVersion: @@ -191,8 +156,6 @@ tests: name: worker configVersion: desired: rendered-worker-abc - pinnedImageSets: - - name: test-pinned-image-set status: observedGeneration: 5 configVersion: @@ -216,8 +179,6 @@ tests: name: worker configVersion: desired: rendered-worker-abc - pinnedImageSets: - - name: test-pinned-image-set status: observedGeneration: 4 configVersion: @@ -238,8 +199,6 @@ tests: name: worker configVersion: desired: rendered-worker-abc - pinnedImageSets: - - name: test-pinned-image-set status: observedGeneration: 5 configVersion: diff --git a/machineconfiguration/v1alpha1/types_machineconfignode.go b/machineconfiguration/v1alpha1/types_machineconfignode.go index cfda07fd01b..fdb6509373e 100644 --- a/machineconfiguration/v1alpha1/types_machineconfignode.go +++ b/machineconfiguration/v1alpha1/types_machineconfignode.go @@ -10,7 +10,7 @@ import ( // +kubebuilder:object:root=true // +kubebuilder:resource:path=machineconfignodes,scope=Cluster // +kubebuilder:subresource:status -// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2201 +// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2256 // +openshift:file-pattern=cvoRunLevel=0000_80,operatorName=machine-config,operatorOrdering=01 // +openshift:enable:FeatureGate=MachineConfigNodes // +kubebuilder:printcolumn:name="PoolName",type="string",JSONPath=.spec.pool.name,priority=0 @@ -104,7 +104,10 @@ type MachineConfigNodeSpec struct { // +listMapKey=name // +kubebuilder:validation:MaxItems=100 // +optional - PinnedImageSets []MachineConfigNodeSpecPinnedImageSet `json:"pinnedImageSets,omitempty"` + // Tombstone: Functionality to correctly and consistely populate this field was not implemented in the MCO, so + // when applying a PIS, this field is not being updated. Since this field is not being used, it is being removed + // before this API is GAed. + // PinnedImageSets []MachineConfigNodeSpecPinnedImageSet `json:"pinnedImageSets,omitempty"` } // MachineConfigNodeStatus holds the reported information on a particular machine config node. @@ -218,18 +221,20 @@ type MachineConfigNodeSpecMachineConfigVersion struct { Desired string `json:"desired"` } +// Tombstone: This struct defines the type of `Spec.PinnedImageSets`, which is being removed. Therefore, this field +// is also being tombstoned. // MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node // should pin and pull. -type MachineConfigNodeSpecPinnedImageSet struct { - // name is the name of the pinned image set. - // Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting - // of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end - // with an alphanumeric character, and be at most 253 characters in length. - // +kubebuilder:validation:MaxLength:=253 - // +kubebuilder:validation:XValidation:rule="!format.dns1123Subdomain().validate(self).hasValue()",message="a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character." - // +required - Name string `json:"name"` -} +// type MachineConfigNodeSpecPinnedImageSet struct { +// // name is the name of the pinned image set. +// // Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting +// // of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end +// // with an alphanumeric character, and be at most 253 characters in length. +// // +kubebuilder:validation:MaxLength:=253 +// // +kubebuilder:validation:XValidation:rule="!format.dns1123Subdomain().validate(self).hasValue()",message="a lowercase RFC 1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character." +// // +required +// Name string `json:"name"` +// } // StateProgress is each possible state for each possible MachineConfigNodeType // Please note: These conditions are subject to change. Both additions and deletions may be made. diff --git a/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml b/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml index da38b62b519..89bbbd61d75 100644 --- a/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml +++ b/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/2201 + api-approved.openshift.io: https://github.com/openshift/api/pull/2256 api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" @@ -145,35 +145,6 @@ spec: required: - name type: object - pinnedImageSets: - description: pinnedImageSets is a user defined value that holds the - names of the desired image sets that the node should pull and pin. - items: - description: |- - MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node - should pin and pull. - properties: - name: - description: |- - name is the name of the pinned image set. - Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting - of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end - with an alphanumeric character, and be at most 253 characters in length. - maxLength: 253 - type: string - x-kubernetes-validations: - - message: a lowercase RFC 1123 subdomain must consist of lower - case alphanumeric characters, '-' or '.', and must start - and end with an alphanumeric character. - rule: '!format.dns1123Subdomain().validate(self).hasValue()' - required: - - name - type: object - maxItems: 100 - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map pool: description: |- pool contains a reference to the machine config pool that this machine config node's diff --git a/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml index c54bd751b53..374dc144dbd 100644 --- a/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml +++ b/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/2201 + api-approved.openshift.io: https://github.com/openshift/api/pull/2256 api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" @@ -145,35 +145,6 @@ spec: required: - name type: object - pinnedImageSets: - description: pinnedImageSets is a user defined value that holds the - names of the desired image sets that the node should pull and pin. - items: - description: |- - MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node - should pin and pull. - properties: - name: - description: |- - name is the name of the pinned image set. - Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting - of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end - with an alphanumeric character, and be at most 253 characters in length. - maxLength: 253 - type: string - x-kubernetes-validations: - - message: a lowercase RFC 1123 subdomain must consist of lower - case alphanumeric characters, '-' or '.', and must start - and end with an alphanumeric character. - rule: '!format.dns1123Subdomain().validate(self).hasValue()' - required: - - name - type: object - maxItems: 100 - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map pool: description: |- pool contains a reference to the machine config pool that this machine config node's diff --git a/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml b/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml index 6fafd384e0e..938a4b71c56 100644 --- a/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml +++ b/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/2201 + api-approved.openshift.io: https://github.com/openshift/api/pull/2256 api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" @@ -145,35 +145,6 @@ spec: required: - name type: object - pinnedImageSets: - description: pinnedImageSets is a user defined value that holds the - names of the desired image sets that the node should pull and pin. - items: - description: |- - MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node - should pin and pull. - properties: - name: - description: |- - name is the name of the pinned image set. - Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting - of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end - with an alphanumeric character, and be at most 253 characters in length. - maxLength: 253 - type: string - x-kubernetes-validations: - - message: a lowercase RFC 1123 subdomain must consist of lower - case alphanumeric characters, '-' or '.', and must start - and end with an alphanumeric character. - rule: '!format.dns1123Subdomain().validate(self).hasValue()' - required: - - name - type: object - maxItems: 100 - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map pool: description: |- pool contains a reference to the machine config pool that this machine config node's diff --git a/machineconfiguration/v1alpha1/zz_generated.deepcopy.go b/machineconfiguration/v1alpha1/zz_generated.deepcopy.go index 2dcbbb7997c..53dfa95b271 100644 --- a/machineconfiguration/v1alpha1/zz_generated.deepcopy.go +++ b/machineconfiguration/v1alpha1/zz_generated.deepcopy.go @@ -92,7 +92,7 @@ func (in *MachineConfigNode) DeepCopyInto(out *MachineConfigNode) { *out = *in out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - in.Spec.DeepCopyInto(&out.Spec) + out.Spec = in.Spec in.Status.DeepCopyInto(&out.Status) return } @@ -154,11 +154,6 @@ func (in *MachineConfigNodeSpec) DeepCopyInto(out *MachineConfigNodeSpec) { out.Node = in.Node out.Pool = in.Pool out.ConfigVersion = in.ConfigVersion - if in.PinnedImageSets != nil { - in, out := &in.PinnedImageSets, &out.PinnedImageSets - *out = make([]MachineConfigNodeSpecPinnedImageSet, len(*in)) - copy(*out, *in) - } return } @@ -188,22 +183,6 @@ func (in *MachineConfigNodeSpecMachineConfigVersion) DeepCopy() *MachineConfigNo return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MachineConfigNodeSpecPinnedImageSet) DeepCopyInto(out *MachineConfigNodeSpecPinnedImageSet) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineConfigNodeSpecPinnedImageSet. -func (in *MachineConfigNodeSpecPinnedImageSet) DeepCopy() *MachineConfigNodeSpecPinnedImageSet { - if in == nil { - return nil - } - out := new(MachineConfigNodeSpecPinnedImageSet) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MachineConfigNodeStatus) DeepCopyInto(out *MachineConfigNodeStatus) { *out = *in diff --git a/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests.yaml b/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests.yaml index af53426da3d..dd5be0d37fc 100644 --- a/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests.yaml +++ b/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests.yaml @@ -1,6 +1,6 @@ machineconfignodes.machineconfiguration.openshift.io: Annotations: {} - ApprovedPRNumber: https://github.com/openshift/api/pull/2201 + ApprovedPRNumber: https://github.com/openshift/api/pull/2256 CRDName: machineconfignodes.machineconfiguration.openshift.io Capability: "" Category: "" diff --git a/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml b/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml index 0de45defef5..d8215eea475 100644 --- a/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml +++ b/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/2201 + api-approved.openshift.io: https://github.com/openshift/api/pull/2256 api.openshift.io/filename-cvo-runlevel: "0000_80" api.openshift.io/filename-operator: machine-config api.openshift.io/filename-ordering: "01" @@ -145,35 +145,6 @@ spec: required: - name type: object - pinnedImageSets: - description: pinnedImageSets is a user defined value that holds the - names of the desired image sets that the node should pull and pin. - items: - description: |- - MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node - should pin and pull. - properties: - name: - description: |- - name is the name of the pinned image set. - Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting - of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end - with an alphanumeric character, and be at most 253 characters in length. - maxLength: 253 - type: string - x-kubernetes-validations: - - message: a lowercase RFC 1123 subdomain must consist of lower - case alphanumeric characters, '-' or '.', and must start - and end with an alphanumeric character. - rule: '!format.dns1123Subdomain().validate(self).hasValue()' - required: - - name - type: object - maxItems: 100 - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map pool: description: |- pool contains a reference to the machine config pool that this machine config node's diff --git a/machineconfiguration/v1alpha1/zz_generated.swagger_doc_generated.go b/machineconfiguration/v1alpha1/zz_generated.swagger_doc_generated.go index 672998d74df..efb4ef8378d 100644 --- a/machineconfiguration/v1alpha1/zz_generated.swagger_doc_generated.go +++ b/machineconfiguration/v1alpha1/zz_generated.swagger_doc_generated.go @@ -42,11 +42,10 @@ func (MachineConfigNodeList) SwaggerDoc() map[string]string { } var map_MachineConfigNodeSpec = map[string]string{ - "": "MachineConfigNodeSpec describes the MachineConfigNode we are managing.", - "node": "node contains a reference to the node for this machine config node.", - "pool": "pool contains a reference to the machine config pool that this machine config node's referenced node belongs to.", - "configVersion": "configVersion holds the desired config version for the node targeted by this machine config node resource. The desired version represents the machine config the node will attempt to update to and gets set before the machine config operator validates the new machine config against the current machine config.", - "pinnedImageSets": "pinnedImageSets is a user defined value that holds the names of the desired image sets that the node should pull and pin.", + "": "MachineConfigNodeSpec describes the MachineConfigNode we are managing.", + "node": "node contains a reference to the node for this machine config node.", + "pool": "pool contains a reference to the machine config pool that this machine config node's referenced node belongs to.", + "configVersion": "configVersion holds the desired config version for the node targeted by this machine config node resource. The desired version represents the machine config the node will attempt to update to and gets set before the machine config operator validates the new machine config against the current machine config.", } func (MachineConfigNodeSpec) SwaggerDoc() map[string]string { @@ -62,15 +61,6 @@ func (MachineConfigNodeSpecMachineConfigVersion) SwaggerDoc() map[string]string return map_MachineConfigNodeSpecMachineConfigVersion } -var map_MachineConfigNodeSpecPinnedImageSet = map[string]string{ - "": "MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node should pin and pull.", - "name": "name is the name of the pinned image set. Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end with an alphanumeric character, and be at most 253 characters in length.", -} - -func (MachineConfigNodeSpecPinnedImageSet) SwaggerDoc() map[string]string { - return map_MachineConfigNodeSpecPinnedImageSet -} - var map_MachineConfigNodeStatus = map[string]string{ "": "MachineConfigNodeStatus holds the reported information on a particular machine config node.", "conditions": "conditions represent the observations of a machine config node's current state.", diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index f412bb94bd0..1616b701290 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -792,7 +792,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeList": schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeList(ref), "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeSpec": schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeSpec(ref), "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeSpecMachineConfigVersion": schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeSpecMachineConfigVersion(ref), - "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeSpecPinnedImageSet": schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeSpecPinnedImageSet(ref), "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeStatus": schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeStatus(ref), "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeStatusMachineConfigVersion": schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeStatusMachineConfigVersion(ref), "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeStatusPinnedImageSet": schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeStatusPinnedImageSet(ref), @@ -40478,34 +40477,12 @@ func schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeSpec(re Ref: ref("github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeSpecMachineConfigVersion"), }, }, - "pinnedImageSets": { - VendorExtensible: spec.VendorExtensible{ - Extensions: spec.Extensions{ - "x-kubernetes-list-map-keys": []interface{}{ - "name", - }, - "x-kubernetes-list-type": "map", - }, - }, - SchemaProps: spec.SchemaProps{ - Description: "pinnedImageSets is a user defined value that holds the names of the desired image sets that the node should pull and pin.", - Type: []string{"array"}, - Items: &spec.SchemaOrArray{ - Schema: &spec.Schema{ - SchemaProps: spec.SchemaProps{ - Default: map[string]interface{}{}, - Ref: ref("github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeSpecPinnedImageSet"), - }, - }, - }, - }, - }, }, Required: []string{"node", "pool", "configVersion"}, }, }, Dependencies: []string{ - "github.com/openshift/api/machineconfiguration/v1alpha1.MCOObjectReference", "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeSpecMachineConfigVersion", "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeSpecPinnedImageSet"}, + "github.com/openshift/api/machineconfiguration/v1alpha1.MCOObjectReference", "github.com/openshift/api/machineconfiguration/v1alpha1.MachineConfigNodeSpecMachineConfigVersion"}, } } @@ -40531,28 +40508,6 @@ func schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeSpecMac } } -func schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeSpecPinnedImageSet(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node should pin and pull.", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "name": { - SchemaProps: spec.SchemaProps{ - Description: "name is the name of the pinned image set. Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end with an alphanumeric character, and be at most 253 characters in length.", - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"name"}, - }, - }, - } -} - func schema_openshift_api_machineconfiguration_v1alpha1_MachineConfigNodeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/openapi/openapi.json b/openapi/openapi.json index 95708e8c334..a521a8bcfe7 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -23398,18 +23398,6 @@ "default": {}, "$ref": "#/definitions/com.github.openshift.api.machineconfiguration.v1alpha1.MCOObjectReference" }, - "pinnedImageSets": { - "description": "pinnedImageSets is a user defined value that holds the names of the desired image sets that the node should pull and pin.", - "type": "array", - "items": { - "default": {}, - "$ref": "#/definitions/com.github.openshift.api.machineconfiguration.v1alpha1.MachineConfigNodeSpecPinnedImageSet" - }, - "x-kubernetes-list-map-keys": [ - "name" - ], - "x-kubernetes-list-type": "map" - }, "pool": { "description": "pool contains a reference to the machine config pool that this machine config node's referenced node belongs to.", "default": {}, @@ -23431,20 +23419,6 @@ } } }, - "com.github.openshift.api.machineconfiguration.v1alpha1.MachineConfigNodeSpecPinnedImageSet": { - "description": "MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node should pin and pull.", - "type": "object", - "required": [ - "name" - ], - "properties": { - "name": { - "description": "name is the name of the pinned image set. Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end with an alphanumeric character, and be at most 253 characters in length.", - "type": "string", - "default": "" - } - } - }, "com.github.openshift.api.machineconfiguration.v1alpha1.MachineConfigNodeStatus": { "description": "MachineConfigNodeStatus holds the reported information on a particular machine config node.", "type": "object", diff --git a/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml index da38b62b519..89bbbd61d75 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/2201 + api-approved.openshift.io: https://github.com/openshift/api/pull/2256 api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" @@ -145,35 +145,6 @@ spec: required: - name type: object - pinnedImageSets: - description: pinnedImageSets is a user defined value that holds the - names of the desired image sets that the node should pull and pin. - items: - description: |- - MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node - should pin and pull. - properties: - name: - description: |- - name is the name of the pinned image set. - Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting - of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end - with an alphanumeric character, and be at most 253 characters in length. - maxLength: 253 - type: string - x-kubernetes-validations: - - message: a lowercase RFC 1123 subdomain must consist of lower - case alphanumeric characters, '-' or '.', and must start - and end with an alphanumeric character. - rule: '!format.dns1123Subdomain().validate(self).hasValue()' - required: - - name - type: object - maxItems: 100 - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map pool: description: |- pool contains a reference to the machine config pool that this machine config node's diff --git a/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml index c54bd751b53..374dc144dbd 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/2201 + api-approved.openshift.io: https://github.com/openshift/api/pull/2256 api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" @@ -145,35 +145,6 @@ spec: required: - name type: object - pinnedImageSets: - description: pinnedImageSets is a user defined value that holds the - names of the desired image sets that the node should pull and pin. - items: - description: |- - MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node - should pin and pull. - properties: - name: - description: |- - name is the name of the pinned image set. - Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting - of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end - with an alphanumeric character, and be at most 253 characters in length. - maxLength: 253 - type: string - x-kubernetes-validations: - - message: a lowercase RFC 1123 subdomain must consist of lower - case alphanumeric characters, '-' or '.', and must start - and end with an alphanumeric character. - rule: '!format.dns1123Subdomain().validate(self).hasValue()' - required: - - name - type: object - maxItems: 100 - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map pool: description: |- pool contains a reference to the machine config pool that this machine config node's diff --git a/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml index 6fafd384e0e..938a4b71c56 100644 --- a/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/2201 + api-approved.openshift.io: https://github.com/openshift/api/pull/2256 api.openshift.io/merged-by-featuregates: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" @@ -145,35 +145,6 @@ spec: required: - name type: object - pinnedImageSets: - description: pinnedImageSets is a user defined value that holds the - names of the desired image sets that the node should pull and pin. - items: - description: |- - MachineConfigNodeSpecPinnedImageSet holds information on the desired pinned image sets that the current observed machine config node - should pin and pull. - properties: - name: - description: |- - name is the name of the pinned image set. - Must be a lowercase RFC-1123 subdomain name (https://tools.ietf.org/html/rfc1123) consisting - of only lowercase alphanumeric characters, hyphens (-), and periods (.), and must start and end - with an alphanumeric character, and be at most 253 characters in length. - maxLength: 253 - type: string - x-kubernetes-validations: - - message: a lowercase RFC 1123 subdomain must consist of lower - case alphanumeric characters, '-' or '.', and must start - and end with an alphanumeric character. - rule: '!format.dns1123Subdomain().validate(self).hasValue()' - required: - - name - type: object - maxItems: 100 - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map pool: description: |- pool contains a reference to the machine config pool that this machine config node's