Merge pull request #174 from lobziik/pdb2

Bug 2051457: CCM PodDisruptionBudgets
openshift · Apr 14, 2022 · 4fbdd53 · 4fbdd53
2 parents 74f7916 + 7488432
commit 4fbdd53
Show file tree

Hide file tree

Showing 37 changed files with 1,103 additions and 223 deletions.
diff --git a/...erator_16_credentialsrequest-vsphere.yaml → ...erator_17_credentialsrequest-vsphere.yaml b/...erator_16_credentialsrequest-vsphere.yaml → ...erator_17_credentialsrequest-vsphere.yaml
diff --git a/pkg/cloud/alibaba/alibaba.go b/pkg/cloud/alibaba/alibaba.go
@@ -30,7 +30,8 @@ type imagesReference struct {
 }
 
 var templateValuesValidationMap = map[string]interface{}{
-	"images": "required",
+	"images":            "required",
+	"cloudproviderName": "required,type(string)",
 }
 
 type alibabaAssets struct {
@@ -42,9 +43,10 @@ func (a *alibabaAssets) GetRenderedResources() []client.Object {
 	return a.renderedResources
 }
 
-func getTemplateValues(images *imagesReference) (common.TemplateValues, error) {
+func getTemplateValues(images *imagesReference, operatorConfig config.OperatorConfig) (common.TemplateValues, error) {
 	values := common.TemplateValues{
-		"images": images,
+		"images":            images,
+		"cloudproviderName": operatorConfig.GetPlatformNameString(),
 	}
 	_, err := govalidator.ValidateMap(values, templateValuesValidationMap)
 	if err != nil {
@@ -68,7 +70,7 @@ func NewProviderAssets(config config.OperatorConfig) (common.CloudProviderAssets
 	if err != nil {
 		return nil, err
 	}
-	templateValues, err := getTemplateValues(images)
+	templateValues, err := getTemplateValues(images, config)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/cloud/alibaba/alibaba_test.go b/pkg/cloud/alibaba/alibaba_test.go
@@ -5,6 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	configv1 "github.com/openshift/api/config/v1"
+
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
 )
 
@@ -25,6 +27,7 @@ func TestGetResources(t *testing.T) {
 				ImagesReference: config.ImagesReference{
 					CloudControllerManagerAlibaba: "CloudControllerManagerAlibaba",
 				},
+				PlatformStatus: &configv1.PlatformStatus{Type: configv1.AlibabaCloudPlatformType},
 			},
 		},
 	}

diff --git a/pkg/cloud/alibaba/assets/cloud-controller-manager-deployment.yaml b/pkg/cloud/alibaba/assets/cloud-controller-manager-deployment.yaml
@@ -2,20 +2,23 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   labels:
-    app: alibaba-cloud-controller-manager
+    k8s-app: alibaba-cloud-controller-manager
+    infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
   name: alibaba-cloud-controller-manager
   namespace: openshift-cloud-controller-manager
 spec:
   replicas: 2
   selector:
     matchLabels:
-      app: alibaba-cloud-controller-manager
+      k8s-app: alibaba-cloud-controller-manager
+      infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: alibaba-cloud-controller-manager
+        k8s-app: alibaba-cloud-controller-manager
+        infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
     spec:
       hostNetwork: true
       serviceAccountName: cloud-controller-manager
@@ -28,7 +31,8 @@ spec:
             - topologyKey: "kubernetes.io/hostname"
               labelSelector:
                 matchLabels:
-                  app: alibaba-cloud-controller-manager
+                  k8s-app: alibaba-cloud-controller-manager
+                  infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master

diff --git a/pkg/cloud/aws/assets/deployment.yaml b/pkg/cloud/aws/assets/deployment.yaml
@@ -3,13 +3,15 @@ kind: Deployment
 metadata:
   labels:
     k8s-app: aws-cloud-controller-manager
+    infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
   name: aws-cloud-controller-manager
   namespace: openshift-cloud-controller-manager
 spec:
   replicas: 2
   selector:
     matchLabels:
       k8s-app: aws-cloud-controller-manager
+      infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
   strategy:
     type: Recreate
   template:
@@ -18,6 +20,7 @@ spec:
         target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
       labels:
         k8s-app: aws-cloud-controller-manager
+        infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
     spec:
       priorityClassName: system-cluster-critical
       containers:
@@ -68,6 +71,7 @@ spec:
             labelSelector:
               matchLabels:
                 k8s-app: aws-cloud-controller-manager
+                infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
       serviceAccountName: cloud-controller-manager
       tolerations:
       - effect: NoSchedule

diff --git a/pkg/cloud/aws/aws.go b/pkg/cloud/aws/aws.go
@@ -28,7 +28,8 @@ type imagesReference struct {
 }
 
 var templateValuesValidationMap = map[string]interface{}{
-	"images": "required",
+	"images":            "required",
+	"cloudproviderName": "required,type(string)",
 }
 
 type awsAssets struct {
@@ -40,9 +41,10 @@ func (a *awsAssets) GetRenderedResources() []client.Object {
 	return a.renderedResources
 }
 
-func getTemplateValues(images *imagesReference) (common.TemplateValues, error) {
+func getTemplateValues(images *imagesReference, operatorConfig config.OperatorConfig) (common.TemplateValues, error) {
 	values := common.TemplateValues{
-		"images": images,
+		"images":            images,
+		"cloudproviderName": operatorConfig.GetPlatformNameString(),
 	}
 	_, err := govalidator.ValidateMap(values, templateValuesValidationMap)
 	if err != nil {
@@ -66,7 +68,7 @@ func NewProviderAssets(config config.OperatorConfig) (common.CloudProviderAssets
 	if err != nil {
 		return nil, err
 	}
-	templateValues, err := getTemplateValues(images)
+	templateValues, err := getTemplateValues(images, config)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/cloud/aws/aws_test.go b/pkg/cloud/aws/aws_test.go
@@ -5,6 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	configv1 "github.com/openshift/api/config/v1"
+
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
 )
 
@@ -25,6 +27,7 @@ func TestResourcesRenderingSmoke(t *testing.T) {
 				ImagesReference: config.ImagesReference{
 					CloudControllerManagerAWS: "CloudControllerManagerAws",
 				},
+				PlatformStatus: &configv1.PlatformStatus{Type: configv1.AWSPlatformType},
 			},
 		},
 	}

diff --git a/pkg/cloud/azure/assets/cloud-controller-manager-deployment.yaml b/pkg/cloud/azure/assets/cloud-controller-manager-deployment.yaml
@@ -4,17 +4,21 @@ metadata:
   name: azure-cloud-controller-manager
   namespace: openshift-cloud-controller-manager
   labels:
-    app: azure-cloud-controller-manager
+    k8s-app: azure-cloud-controller-manager
+    infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
 spec:
+  replicas: 2
   selector:
     matchLabels:
-      app: azure-cloud-controller-manager
+      k8s-app: azure-cloud-controller-manager
+      infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: azure-cloud-controller-manager
+        k8s-app: azure-cloud-controller-manager
+        infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
     spec:
       hostNetwork: true
       serviceAccountName: cloud-controller-manager
@@ -27,7 +31,8 @@ spec:
             - topologyKey: "kubernetes.io/hostname"
               labelSelector:
                 matchLabels:
-                  app: azure-cloud-controller-manager
+                  k8s-app: azure-cloud-controller-manager
+                  infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master

diff --git a/pkg/cloud/azure/assets/cloud-node-manager-daemonset.yaml b/pkg/cloud/azure/assets/cloud-node-manager-daemonset.yaml
@@ -4,20 +4,24 @@ metadata:
   name: azure-cloud-node-manager
   namespace: openshift-cloud-controller-manager
   labels:
+    k8s-app: azure-cloud-node-manager
+    infrastructure.openshift.io/cloud-node-manager: {{ .cloudproviderName }}
     component: azure-cloud-node-manager
     kubernetes.io/cluster-service: "true"
 spec:
   selector:
     matchLabels:
-      app: azure-cloud-node-manager
+      k8s-app: azure-cloud-node-manager
+      infrastructure.openshift.io/cloud-node-manager: {{ .cloudproviderName }}
   updateStrategy:
     type: RollingUpdate
     rollingUpdate:
       maxUnavailable: 10%
   template:
     metadata:
       labels:
-        app: azure-cloud-node-manager
+        k8s-app: azure-cloud-node-manager
+        infrastructure.openshift.io/cloud-node-manager: {{ .cloudproviderName }}
       annotations:
         cluster-autoscaler.kubernetes.io/daemonset-pod: "true"
     spec:

diff --git a/pkg/cloud/azure/azure.go b/pkg/cloud/azure/azure.go
@@ -31,6 +31,7 @@ type imagesReference struct {
 var templateValuesValidationMap = map[string]interface{}{
 	"images":             "required",
 	"infrastructureName": "required,type(string)",
+	"cloudproviderName":  "required,notnull,type(string)",
 }
 
 type azureAssets struct {
@@ -46,6 +47,7 @@ func getTemplateValues(images *imagesReference, operatorConfig config.OperatorCo
 	values := common.TemplateValues{
 		"images":             images,
 		"infrastructureName": operatorConfig.InfrastructureName,
+		"cloudproviderName":  operatorConfig.GetPlatformNameString(),
 	}
 	_, err := govalidator.ValidateMap(values, templateValuesValidationMap)
 	if err != nil {

diff --git a/pkg/cloud/azure/azure_test.go b/pkg/cloud/azure/azure_test.go
@@ -28,6 +28,7 @@ func TestResourcesRenderingSmoke(t *testing.T) {
 					CloudControllerManagerAzure: "CloudControllerManagerAzure",
 					CloudNodeManagerAzure:       "CloudNodeManagerAzure",
 				},
+				PlatformStatus: &configv1.PlatformStatus{Type: configv1.AzurePlatformType},
 			},
 			initErrMsg: "can not construct template values for azure assets: infrastructureName: non zero value required",
 		}, {
@@ -38,6 +39,7 @@ func TestResourcesRenderingSmoke(t *testing.T) {
 					CloudControllerManagerAzure: "CloudControllerManagerAzure",
 					CloudNodeManagerAzure:       "CloudNodeManagerAzure",
 				},
+				PlatformStatus:     &configv1.PlatformStatus{Type: configv1.AzurePlatformType},
 				InfrastructureName: "infra",
 			},
 		}, {
@@ -48,6 +50,7 @@ func TestResourcesRenderingSmoke(t *testing.T) {
 					CloudControllerManagerAzure: "CloudControllerManagerAzure",
 					CloudNodeManagerAzure:       "CloudNodeManagerAzure",
 				},
+				PlatformStatus:     &configv1.PlatformStatus{Type: configv1.AlibabaCloudPlatformType},
 				InfrastructureName: "infra",
 				ClusterProxy: &configv1.Proxy{
 					Status: configv1.ProxyStatus{

diff --git a/pkg/cloud/azurestack/assets/cloud-controller-manager-deployment.yaml b/pkg/cloud/azurestack/assets/cloud-controller-manager-deployment.yaml
@@ -4,17 +4,21 @@ metadata:
   name: azure-cloud-controller-manager
   namespace: openshift-cloud-controller-manager
   labels:
-    app: azure-cloud-controller-manager
+    k8s-app: azure-cloud-controller-manager
+    infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
 spec:
+  replicas: 2
   selector:
     matchLabels:
-      app: azure-cloud-controller-manager
+      k8s-app: azure-cloud-controller-manager
+      infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
   strategy:
     type: Recreate
   template:
     metadata:
       labels:
-        app: azure-cloud-controller-manager
+        k8s-app: azure-cloud-controller-manager
+        infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
     spec:
       hostNetwork: true
       serviceAccountName: cloud-controller-manager
@@ -27,7 +31,8 @@ spec:
             - topologyKey: "kubernetes.io/hostname"
               labelSelector:
                 matchLabels:
-                  app: azure-cloud-controller-manager
+                  k8s-app: azure-cloud-controller-manager
+                  infrastructure.openshift.io/cloud-controller-manager: {{ .cloudproviderName }}
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master

diff --git a/pkg/cloud/azurestack/assets/cloud-node-manager-daemonset.yaml b/pkg/cloud/azurestack/assets/cloud-node-manager-daemonset.yaml
@@ -4,20 +4,24 @@ metadata:
   name: azure-cloud-node-manager
   namespace: openshift-cloud-controller-manager
   labels:
+    k8s-app: azure-cloud-node-manager
+    infrastructure.openshift.io/cloud-node-manager: {{ .cloudproviderName }}
     component: azure-cloud-node-manager
     kubernetes.io/cluster-service: "true"
 spec:
   selector:
     matchLabels:
-      app: azure-cloud-node-manager
+      k8s-app: azure-cloud-node-manager
+      infrastructure.openshift.io/cloud-node-manager: {{ .cloudproviderName }}
   updateStrategy:
     type: RollingUpdate
     rollingUpdate:
       maxUnavailable: 10%
   template:
     metadata:
       labels:
-        app: azure-cloud-node-manager
+        k8s-app: azure-cloud-node-manager
+        infrastructure.openshift.io/cloud-node-manager: {{ .cloudproviderName }}
       annotations:
         cluster-autoscaler.kubernetes.io/daemonset-pod: "true"
     spec:

diff --git a/pkg/cloud/azurestack/azurestack.go b/pkg/cloud/azurestack/azurestack.go
@@ -32,6 +32,7 @@ type imagesReference struct {
 var templateValuesValidationMap = map[string]interface{}{
 	"images":             "required",
 	"infrastructureName": "required,type(string)",
+	"cloudproviderName":  "required,type(string)",
 }
 
 type azurestackAssets struct {
@@ -47,6 +48,7 @@ func getTemplateValues(images imagesReference, operatorConfig config.OperatorCon
 	values := common.TemplateValues{
 		"images":             images,
 		"infrastructureName": operatorConfig.InfrastructureName,
+		"cloudproviderName":  operatorConfig.GetPlatformNameString(),
 	}
 	_, err := govalidator.ValidateMap(values, templateValuesValidationMap)
 	if err != nil {

diff --git a/pkg/cloud/azurestack/azurestack_test.go b/pkg/cloud/azurestack/azurestack_test.go
@@ -3,6 +3,8 @@ package azurestack
 import (
 	"testing"
 
+	configv1 "github.com/openshift/api/config/v1"
+
 	"github.com/stretchr/testify/assert"
 
 	"github.com/openshift/cluster-cloud-controller-manager-operator/pkg/config"
@@ -28,6 +30,7 @@ func TestResourcesRenderingSmoke(t *testing.T) {
 					CloudControllerManagerAzure:    "CloudControllerManagerAzure",
 					CloudNodeManagerAzure:          "CloudNodeManagerAzure",
 				},
+				PlatformStatus: &configv1.PlatformStatus{Type: configv1.AzurePlatformType},
 			},
 			initErrMsg: "can not construct template values for azurestack assets: infrastructureName: non zero value required",
 		}, {
@@ -38,6 +41,7 @@ func TestResourcesRenderingSmoke(t *testing.T) {
 					CloudControllerManagerAzure:    "CloudControllerManagerAzure",
 					CloudNodeManagerAzure:          "CloudNodeManagerAzure",
 				},
+				PlatformStatus:     &configv1.PlatformStatus{Type: configv1.AzurePlatformType},
 				InfrastructureName: "infra",
 			},
 		},

diff --git a/pkg/cloud/cloud.go b/pkg/cloud/cloud.go
@@ -76,6 +76,12 @@ func GetResources(operatorConfig config.OperatorConfig) ([]client.Object, error)
 	}
 	renderedObjects := assets.GetRenderedResources()
 	substitutedObjects := common.SubstituteCommonPartsFromConfig(operatorConfig, renderedObjects)
+	commonResources, err := common.GetCommonResources(operatorConfig)
+	if err != nil {
+		klog.Errorf("can not create common resources %v", err)
+		return nil, err
+	}
+	substitutedObjects = append(substitutedObjects, commonResources...)
 	return substitutedObjects, nil
 }