Merge pull request #1409 from lobziik/extrernal-resource-remove-ccm

Remove `CloudControllerManagerSpec` from the `External` platform spec

Author: openshift-merge-robot

config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml

@@ -79,17 +79,6 @@ spec:
                     external:
                       description: ExternalPlatformType represents generic infrastructure provider. Platform-specific components should be supplemented separately.
                       properties:
-                        cloudControllerManager:
-                          description: CloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI)
-                          properties:
-                            state:
-                              description: "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager \n When set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected."
-                              enum:
-                                - ""
-                                - External
-                                - None
-                              type: string
-                          type: object
                         platformName:
                           default: Unknown
                           description: PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. This field is solely for informational and reporting purposes and is not expected to be used for decision-making.

config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml

@@ -79,17 +79,6 @@ spec:
                     external:
                       description: ExternalPlatformType represents generic infrastructure provider. Platform-specific components should be supplemented separately.
                       properties:
-                        cloudControllerManager:
-                          description: CloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI)
-                          properties:
-                            state:
-                              description: "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager \n When set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected."
-                              enum:
-                                - ""
-                                - External
-                                - None
-                              type: string
-                          type: object
                         platformName:
                           default: Unknown
                           description: PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. This field is solely for informational and reporting purposes and is not expected to be used for decision-making.

config/v1/types_infrastructure.go

@@ -227,36 +227,6 @@ const (
 	IBMCloudProviderTypeUPI IBMCloudProviderType = "UPI"
 )
 
-// CloudControllerManagerState defines whether Cloud Controller Manager presence is expected or not
-type CloudControllerManagerState string
-
-const (
-	// Cloud Controller Manager is enabled and expected to be installed.
-	// This value indicates that new nodes should be tainted as uninitialized when created,
-	// preventing them from running workloads until they are initialized by the cloud controller manager.
-	CloudControllerManagerExternal CloudControllerManagerState = "External"
-
-	// Cloud Controller Manager is disabled and not expected to be installed.
-	// This value indicates that new nodes should not be tainted
-	// and no extra node initialization is expected from the cloud controller manager.
-	CloudControllerManagerNone CloudControllerManagerState = "None"
-)
-
-// CloudControllerManagerSpec holds Cloud Controller Manager (a.k.a. CCM or CPI) related settings
-type CloudControllerManagerSpec struct {
-	// state determines whether or not an external Cloud Controller Manager is expected to
-	// be installed within the cluster.
-	// https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager
-	//
-	// When set to "External", new nodes will be tainted as uninitialized when created,
-	// preventing them from running workloads until they are initialized by the cloud controller manager.
-	// When omitted or set to "None", new nodes will be not tainted
-	// and no extra initialization from the cloud controller manager is expected.
-	// +kubebuilder:validation:Enum="";External;None
-	// +optional
-	State CloudControllerManagerState `json:"state"`
-}
-
 // ExternalPlatformSpec holds the desired state for the generic External infrastructure provider.
 type ExternalPlatformSpec struct {
 	// PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time.
@@ -266,9 +236,6 @@ type ExternalPlatformSpec struct {
 	// +kubebuilder:validation:XValidation:rule="oldSelf == 'Unknown' || self == oldSelf",message="platform name cannot be changed once set"
 	// +optional
 	PlatformName string `json:"platformName,omitempty"`
-	// CloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI)
-	// +optional
-	CloudControllerManager CloudControllerManagerSpec `json:"cloudControllerManager"`
 }
 
 // PlatformSpec holds the desired state specific to the underlying infrastructure provider

config/v1/zz_generated.deepcopy.go

@@ -4864,17 +4864,6 @@
         }
       }
     },
-    "com.github.openshift.api.config.v1.CloudControllerManagerSpec": {
-      "description": "CloudControllerManagerSpec holds Cloud Controller Manager (a.k.a. CCM or CPI) related settings",
-      "type": "object",
-      "properties": {
-        "state": {
-          "description": "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager\n\nWhen set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected.",
-          "type": "string",
-          "default": ""
-        }
-      }
-    },
     "com.github.openshift.api.config.v1.ClusterCondition": {
       "description": "ClusterCondition is a union of typed cluster conditions.  The 'type' property determines which of the type-specific properties are relevant. When evaluated on a cluster, the condition may match, not match, or fail to evaluate.",
       "type": "object",
@@ -5907,11 +5896,6 @@
       "description": "ExternalPlatformSpec holds the desired state for the generic External infrastructure provider.",
       "type": "object",
       "properties": {
-        "cloudControllerManager": {
-          "description": "CloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI)",
-          "default": {},
-          "$ref": "#/definitions/com.github.openshift.api.config.v1.CloudControllerManagerSpec"
-        },
         "platformName": {
           "description": "PlatformName holds the arbitrary string representing the infrastructure provider name, expected to be set at the installation time. This field is solely for informational and reporting purposes and is not expected to be used for decision-making.",
           "type": "string",