Merge pull request #1514 from ching-kuo/deprecate_intree

⚠️ Deprecate In-tree Cloud Provider

Author: k8s-ci-robot

Makefile

@@ -157,7 +157,6 @@ e2e-templates: $(addprefix $(E2E_TEMPLATES_DIR)/, \
 		 cluster-template-v1alpha6.yaml \
 		 cluster-template-md-remediation.yaml \
 		 cluster-template-kcp-remediation.yaml \
-		 cluster-template-external-cloud-provider.yaml \
 		 cluster-template-multi-az.yaml \
 		 cluster-template-multi-network.yaml \
 		 cluster-template-without-lb.yaml \
@@ -425,7 +424,6 @@ release-notes: $(RELEASE_NOTES) ## Generate release notes
 templates: ## Generate cluster templates
 templates: templates/cluster-template.yaml \
 	templates/cluster-template-without-lb.yaml \
-	templates/cluster-template-external-cloud-provider.yaml \
 	templates/cluster-template-flatcar.yaml \
 	templates/cluster-template-external-cloud-provider-flatcar.yaml \
 

RELEASE.md

@@ -71,7 +71,6 @@ It is recommended to create at least one release candidate when bumping `X` or `
 1. Attach the following files to the draft release:
     - `./out/infrastructure-components.yaml`
     - `./out/cluster-template.yaml`
-    - `./out/cluster-template-external-cloud-provider.yaml`
     - `./out/cluster-template-without-lb.yaml`
     - `./out/metadata.yaml`
 1. Ensure that the release image has been promoted.

docs/book/src/clusteropenstack/configuration.md

@@ -46,17 +46,9 @@ This command actually uses [the template file](https://github.com/kubernetes-sig
 
 Note: You can use [the template file](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/templates/cluster-template.yaml) by manually replacing values.
 
-**Note:** By default the command creates highly available control plane with internal OpenStack cloud provider. If you wish to create highly available control plane with external OpenStack cloud provider or single control plane without load balancer, use external-cloud-provider or without-lb [flavor](https://cluster-api.sigs.k8s.io/clusterctl/commands/config-cluster.html#flavors) respectively. For example,
+**Note:** By default the command creates highly available control plane with 3 control plane nodes. If you wish to create single control plane without load balancer, use without-lb flavor. For example,
 
 ```bash
-# Using 'external-cloud-provider' flavor
-clusterctl generate cluster capi-quickstart \
-  --flavor external-cloud-provider \
-  --kubernetes-version v1.24.2 \
-  --control-plane-machine-count=3 \
-  --worker-machine-count=1 \
-  > capi-quickstart.yaml
-
 # Using 'without-lb' flavor
 clusterctl generate cluster capi-quickstart \
   --flavor without-lb \

kustomize/v1alpha7/default/cluster-template.yaml

@@ -50,48 +50,20 @@ spec:
       nodeRegistration:
         name: '{{ local_hostname }}'
         kubeletExtraArgs:
-          cloud-provider: openstack
-          cloud-config: /etc/kubernetes/cloud.conf
+          cloud-provider: external
     clusterConfiguration:
       apiServer:
         extraArgs:
-          cloud-provider: openstack
-          cloud-config: /etc/kubernetes/cloud.conf
-        extraVolumes:
-        - name: cloud
-          hostPath: /etc/kubernetes/cloud.conf
-          mountPath: /etc/kubernetes/cloud.conf
-          readOnly: true
+          cloud-provider: external
       controllerManager:
         extraArgs:
-          cloud-provider: openstack
-          cloud-config: /etc/kubernetes/cloud.conf
-        extraVolumes:
-        - name: cloud
-          hostPath: /etc/kubernetes/cloud.conf
-          mountPath: /etc/kubernetes/cloud.conf
-          readOnly: true
-        - name: cacerts
-          hostPath: /etc/certs/cacert
-          mountPath: /etc/certs/cacert
-          readOnly: true
+          cloud-provider: external
     joinConfiguration:
       nodeRegistration:
         name: '{{ local_hostname }}'
         kubeletExtraArgs:
-          cloud-config: /etc/kubernetes/cloud.conf
-          cloud-provider: openstack
-    files:
-    - path: /etc/kubernetes/cloud.conf
-      owner: root
-      permissions: "0600"
-      content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
-      encoding: base64
-    - path: /etc/certs/cacert
-      owner: root
-      permissions: "0600"
-      content: ${OPENSTACK_CLOUD_CACERT_B64}
-      encoding: base64
+          cloud-provider: external
+    files: []
   version: "${KUBERNETES_VERSION}"
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1alpha7
@@ -155,23 +127,12 @@ metadata:
 spec:
   template:
     spec:
-      files:
-      - content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
-        encoding: base64
-        owner: root
-        path: /etc/kubernetes/cloud.conf
-        permissions: "0600"
-      - content: ${OPENSTACK_CLOUD_CACERT_B64}
-        encoding: base64
-        owner: root
-        path: /etc/certs/cacert
-        permissions: "0600"
+      files: []
       joinConfiguration:
         nodeRegistration:
           name: '{{ local_hostname }}'
           kubeletExtraArgs:
-            cloud-config: /etc/kubernetes/cloud.conf
-            cloud-provider: openstack
+            cloud-provider: external
 ---
 apiVersion: v1
 kind: Secret

templates/cluster-template-external-cloud-provider.yaml renamed to templates/cluster-template-intree-cloud-provider.yaml

@@ -15,11 +15,22 @@ metadata:
 spec:
   template:
     spec:
-      files: []
+      files:
+      - content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
+        encoding: base64
+        owner: root
+        path: /etc/kubernetes/cloud.conf
+        permissions: "0600"
+      - content: ${OPENSTACK_CLOUD_CACERT_B64}
+        encoding: base64
+        owner: root
+        path: /etc/certs/cacert
+        permissions: "0600"
       joinConfiguration:
         nodeRegistration:
           kubeletExtraArgs:
-            cloud-provider: external
+            cloud-config: /etc/kubernetes/cloud.conf
+            cloud-provider: openstack
           name: '{{ local_hostname }}'
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
@@ -74,20 +85,48 @@ spec:
     clusterConfiguration:
       apiServer:
         extraArgs:
-          cloud-provider: external
+          cloud-config: /etc/kubernetes/cloud.conf
+          cloud-provider: openstack
+        extraVolumes:
+        - hostPath: /etc/kubernetes/cloud.conf
+          mountPath: /etc/kubernetes/cloud.conf
+          name: cloud
+          readOnly: true
       controllerManager:
         extraArgs:
-          cloud-provider: external
-    files: []
+          cloud-config: /etc/kubernetes/cloud.conf
+          cloud-provider: openstack
+        extraVolumes:
+        - hostPath: /etc/kubernetes/cloud.conf
+          mountPath: /etc/kubernetes/cloud.conf
+          name: cloud
+          readOnly: true
+        - hostPath: /etc/certs/cacert
+          mountPath: /etc/certs/cacert
+          name: cacerts
+          readOnly: true
+    files:
+    - content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
+      encoding: base64
+      owner: root
+      path: /etc/kubernetes/cloud.conf
+      permissions: "0600"
+    - content: ${OPENSTACK_CLOUD_CACERT_B64}
+      encoding: base64
+      owner: root
+      path: /etc/certs/cacert
+      permissions: "0600"
     initConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
-          cloud-provider: external
+          cloud-config: /etc/kubernetes/cloud.conf
+          cloud-provider: openstack
         name: '{{ local_hostname }}'
     joinConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
-          cloud-provider: external
+          cloud-config: /etc/kubernetes/cloud.conf
+          cloud-provider: openstack
         name: '{{ local_hostname }}'
   machineTemplate:
     infrastructureRef:

templates/cluster-template-without-lb.yaml

@@ -15,22 +15,11 @@ metadata:
 spec:
   template:
     spec:
-      files:
-      - content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
-        encoding: base64
-        owner: root
-        path: /etc/kubernetes/cloud.conf
-        permissions: "0600"
-      - content: ${OPENSTACK_CLOUD_CACERT_B64}
-        encoding: base64
-        owner: root
-        path: /etc/certs/cacert
-        permissions: "0600"
+      files: []
       joinConfiguration:
         nodeRegistration:
           kubeletExtraArgs:
-            cloud-config: /etc/kubernetes/cloud.conf
-            cloud-provider: openstack
+            cloud-provider: external
           name: '{{ local_hostname }}'
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
@@ -85,48 +74,20 @@ spec:
     clusterConfiguration:
       apiServer:
         extraArgs:
-          cloud-config: /etc/kubernetes/cloud.conf
-          cloud-provider: openstack
-        extraVolumes:
-        - hostPath: /etc/kubernetes/cloud.conf
-          mountPath: /etc/kubernetes/cloud.conf
-          name: cloud
-          readOnly: true
+          cloud-provider: external
       controllerManager:
         extraArgs:
-          cloud-config: /etc/kubernetes/cloud.conf
-          cloud-provider: openstack
-        extraVolumes:
-        - hostPath: /etc/kubernetes/cloud.conf
-          mountPath: /etc/kubernetes/cloud.conf
-          name: cloud
-          readOnly: true
-        - hostPath: /etc/certs/cacert
-          mountPath: /etc/certs/cacert
-          name: cacerts
-          readOnly: true
-    files:
-    - content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
-      encoding: base64
-      owner: root
-      path: /etc/kubernetes/cloud.conf
-      permissions: "0600"
-    - content: ${OPENSTACK_CLOUD_CACERT_B64}
-      encoding: base64
-      owner: root
-      path: /etc/certs/cacert
-      permissions: "0600"
+          cloud-provider: external
+    files: []
     initConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
-          cloud-config: /etc/kubernetes/cloud.conf
-          cloud-provider: openstack
+          cloud-provider: external
         name: '{{ local_hostname }}'
     joinConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
-          cloud-config: /etc/kubernetes/cloud.conf
-          cloud-provider: openstack
+          cloud-provider: external
         name: '{{ local_hostname }}'
   machineTemplate:
     infrastructureRef:

templates/cluster-template.yaml

@@ -15,22 +15,11 @@ metadata:
 spec:
   template:
     spec:
-      files:
-      - content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
-        encoding: base64
-        owner: root
-        path: /etc/kubernetes/cloud.conf
-        permissions: "0600"
-      - content: ${OPENSTACK_CLOUD_CACERT_B64}
-        encoding: base64
-        owner: root
-        path: /etc/certs/cacert
-        permissions: "0600"
+      files: []
       joinConfiguration:
         nodeRegistration:
           kubeletExtraArgs:
-            cloud-config: /etc/kubernetes/cloud.conf
-            cloud-provider: openstack
+            cloud-provider: external
           name: '{{ local_hostname }}'
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
@@ -85,48 +74,20 @@ spec:
     clusterConfiguration:
       apiServer:
         extraArgs:
-          cloud-config: /etc/kubernetes/cloud.conf
-          cloud-provider: openstack
-        extraVolumes:
-        - hostPath: /etc/kubernetes/cloud.conf
-          mountPath: /etc/kubernetes/cloud.conf
-          name: cloud
-          readOnly: true
+          cloud-provider: external
       controllerManager:
         extraArgs:
-          cloud-config: /etc/kubernetes/cloud.conf
-          cloud-provider: openstack
-        extraVolumes:
-        - hostPath: /etc/kubernetes/cloud.conf
-          mountPath: /etc/kubernetes/cloud.conf
-          name: cloud
-          readOnly: true
-        - hostPath: /etc/certs/cacert
-          mountPath: /etc/certs/cacert
-          name: cacerts
-          readOnly: true
-    files:
-    - content: ${OPENSTACK_CLOUD_PROVIDER_CONF_B64}
-      encoding: base64
-      owner: root
-      path: /etc/kubernetes/cloud.conf
-      permissions: "0600"
-    - content: ${OPENSTACK_CLOUD_CACERT_B64}
-      encoding: base64
-      owner: root
-      path: /etc/certs/cacert
-      permissions: "0600"
+          cloud-provider: external
+    files: []
     initConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
-          cloud-config: /etc/kubernetes/cloud.conf
-          cloud-provider: openstack
+          cloud-provider: external
         name: '{{ local_hostname }}'
     joinConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
-          cloud-config: /etc/kubernetes/cloud.conf
-          cloud-provider: openstack
+          cloud-provider: external
         name: '{{ local_hostname }}'
   machineTemplate:
     infrastructureRef:

test/e2e/data/e2e_conf.yaml

@@ -111,7 +111,6 @@ providers:
     files:
     - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
     - sourcePath: "./infrastructure-openstack/cluster-template.yaml"
-    - sourcePath: "./infrastructure-openstack/cluster-template-external-cloud-provider.yaml"
     - sourcePath: "./infrastructure-openstack/cluster-template-without-lb.yaml"
     replacements:
     - old: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:dev

test/e2e/data/kustomize/external-cloud-provider/kustomization.yaml renamed to test/e2e/data/kustomize/common-patches/ccm/kustomization.yaml

@@ -1,11 +1,7 @@
+# Modifications to release templates common to all e2e test scenarios
 ---
-resources:
-- ../../../../../kustomize/v1alpha7/external-cloud-provider
-- ccm.yaml
-
-components:
-- ../common-patches/cni
-- ../common-patches/containerd
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
 
 patchesStrategicMerge:
 - patch-ccm.yaml

test/e2e/data/kustomize/external-cloud-provider-flatcar/patch-allow-all-in-cluster-traffic.yaml renamed to test/e2e/data/kustomize/common-patches/ccm/patch-allow-all-in-cluster-traffic.yaml

@@ -1,8 +1,10 @@
 ---
 resources:
 - ../../../../../kustomize/v1alpha7/default
+- ccm.yaml
 
 components:
 - ../common-patches/cni
 - ../common-patches/containerd
 - ../upgrade-patches
+- ../common-patches/ccm