diff --git a/templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml b/templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml index 51ede0adf208..04cfc66b24a4 100644 --- a/templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml +++ b/templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml @@ -22,7 +22,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml index 8222a0595386..760210ba5a54 100644 --- a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml +++ b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml @@ -292,7 +292,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml index adcacb69f26c..5c7727acfdab 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dra.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dra.yaml @@ -595,7 +595,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml index f5934beacbb7..1dd1551fd9ea 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml @@ -572,7 +572,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml index 66390c7b6c94..81becf6aaba8 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -590,7 +590,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 3907f1c83927..6dfcffdfde94 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -783,7 +783,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml index ba5728c33611..e9b090f4ca54 100644 --- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml +++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml @@ -345,7 +345,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml index e1cd26d5e2f8..00785e93da69 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -410,7 +410,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml index 50890f8d054b..ef1b007edf2c 100644 --- a/templates/test/ci/cluster-template-prow-edgezone.yaml +++ b/templates/test/ci/cluster-template-prow-edgezone.yaml @@ -328,7 +328,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index 50d76871fedb..7f5b8659c672 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -430,7 +430,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-load.yaml b/templates/test/ci/cluster-template-prow-load.yaml index 0f09b0035c50..328e38b83e16 100644 --- a/templates/test/ci/cluster-template-prow-load.yaml +++ b/templates/test/ci/cluster-template-prow-load.yaml @@ -519,7 +519,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml index 7c43124a9d19..30d0254e8c8c 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-ci-version.yaml @@ -717,7 +717,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml index 82bc945ffb09..23763ba01af8 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -449,7 +449,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index 759c55b64bf1..f61c6d4914e9 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -443,7 +443,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml index 56bc7208a547..8e773ac691bd 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -310,7 +310,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml index aae162e537c0..4f6613665e1d 100644 --- a/templates/test/ci/cluster-template-prow-private.yaml +++ b/templates/test/ci/cluster-template-prow-private.yaml @@ -362,7 +362,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-spot.yaml b/templates/test/ci/cluster-template-prow-spot.yaml index 8586d1fee1fd..5dc7f601945c 100644 --- a/templates/test/ci/cluster-template-prow-spot.yaml +++ b/templates/test/ci/cluster-template-prow-spot.yaml @@ -341,7 +341,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml index 3cf6a9d86744..c6b5beb8bafd 100644 --- a/templates/test/ci/cluster-template-prow-topology.yaml +++ b/templates/test/ci/cluster-template-prow-topology.yaml @@ -178,7 +178,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index 566391bb1368..d65a2895f7c6 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -513,7 +513,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/dev/cluster-template-custom-builds-dra.yaml b/templates/test/dev/cluster-template-custom-builds-dra.yaml index a339bc114f77..d423a81616cc 100644 --- a/templates/test/dev/cluster-template-custom-builds-dra.yaml +++ b/templates/test/dev/cluster-template-custom-builds-dra.yaml @@ -551,7 +551,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml index d03c60d4046a..9a7869ba571f 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -671,7 +671,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 3e338658533e..d4325e51ae65 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -749,7 +749,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml index 3ab462445624..8d2951854ce2 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-remediation.yaml @@ -91,7 +91,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml index 07c7496be6ca..965076370d55 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-kcp-scale-in.yaml @@ -91,7 +91,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-and-machine-pool.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-and-machine-pool.yaml index 08e11f98ea05..aeb41268966a 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-and-machine-pool.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-and-machine-pool.yaml @@ -91,7 +91,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml index c1d727d326a4..75612e5f6970 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-machine-pool.yaml @@ -91,7 +91,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml index 0ada71f9180d..048d8384c7e7 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-md-remediation.yaml @@ -91,7 +91,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml index ccc5a9b71084..bbf87df9ca53 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template-node-drain.yaml @@ -91,7 +91,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}" diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml index 2b7f4abb8656..c72d8539caf1 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml @@ -91,7 +91,6 @@ spec: logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} - caCertDir: ${CCM_CA_CERT_DIR:-/etc/ssl} cloudNodeManager: imageName: "${CNM_IMAGE_NAME:-""}" imageRepository: "${IMAGE_REGISTRY:-""}"