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 ba05ea4b2f7..04cfc66b24a 100644 --- a/templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml +++ b/templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml @@ -16,13 +16,13 @@ spec: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} \ No newline at end of file + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" diff --git a/templates/addons/cluster-api-helm/cloud-provider-azure-flatcar.yaml b/templates/addons/cluster-api-helm/cloud-provider-azure-flatcar.yaml index c7b95708ab4..ce9c0523cad 100644 --- a/templates/addons/cluster-api-helm/cloud-provider-azure-flatcar.yaml +++ b/templates/addons/cluster-api-helm/cloud-provider-azure-flatcar.yaml @@ -15,4 +15,4 @@ spec: cloudControllerManager: clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} logVerbosity: 4 - caCertDir: /usr/share/ca-certificates \ No newline at end of file + caCertDir: /usr/share/ca-certificates diff --git a/templates/addons/cluster-api-helm/cloud-provider-azure.yaml b/templates/addons/cluster-api-helm/cloud-provider-azure.yaml index b56f45ec56c..7838783312e 100644 --- a/templates/addons/cluster-api-helm/cloud-provider-azure.yaml +++ b/templates/addons/cluster-api-helm/cloud-provider-azure.yaml @@ -14,4 +14,4 @@ spec: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - logVerbosity: 4 \ No newline at end of file + logVerbosity: 4 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 757b7632c2a..4867d8c057e 100644 --- a/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml +++ b/templates/test/ci/cluster-template-prow-azure-cni-v1.yaml @@ -252,7 +252,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -271,20 +271,20 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" 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 cbade6708b6..802e2fbca15 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 @@ -515,7 +515,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -534,23 +534,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: 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 45dcea08165..28b3e10caa4 100644 --- a/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml @@ -533,7 +533,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -552,23 +552,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml index 39f5771d2df..1c25deae291 100644 --- a/templates/test/ci/cluster-template-prow-ci-version.yaml +++ b/templates/test/ci/cluster-template-prow-ci-version.yaml @@ -712,7 +712,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -731,23 +731,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml index b6d14fb82fd..888fbcf3252 100644 --- a/templates/test/ci/cluster-template-prow-custom-vnet.yaml +++ b/templates/test/ci/cluster-template-prow-custom-vnet.yaml @@ -308,7 +308,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -327,20 +327,20 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" diff --git a/templates/test/ci/cluster-template-prow-dual-stack.yaml b/templates/test/ci/cluster-template-prow-dual-stack.yaml index 1d7db150395..31d1c72e5bd 100644 --- a/templates/test/ci/cluster-template-prow-dual-stack.yaml +++ b/templates/test/ci/cluster-template-prow-dual-stack.yaml @@ -381,7 +381,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -400,20 +400,20 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" diff --git a/templates/test/ci/cluster-template-prow-edgezone.yaml b/templates/test/ci/cluster-template-prow-edgezone.yaml index 3dcd3757308..b13db764d76 100644 --- a/templates/test/ci/cluster-template-prow-edgezone.yaml +++ b/templates/test/ci/cluster-template-prow-edgezone.yaml @@ -292,7 +292,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -311,20 +311,20 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml index 8693e17f2c1..9bbc72a98de 100644 --- a/templates/test/ci/cluster-template-prow-flatcar.yaml +++ b/templates/test/ci/cluster-template-prow-flatcar.yaml @@ -319,7 +319,7 @@ spec: cloud-provider: azure-flatcar releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: diff --git a/templates/test/ci/cluster-template-prow-ipv6.yaml b/templates/test/ci/cluster-template-prow-ipv6.yaml index bc03cfe63a9..e15821a4049 100644 --- a/templates/test/ci/cluster-template-prow-ipv6.yaml +++ b/templates/test/ci/cluster-template-prow-ipv6.yaml @@ -398,7 +398,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -417,20 +417,20 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" 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 7e7807f0076..455770a8116 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 @@ -646,7 +646,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -665,23 +665,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: 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 94ff273423b..292bca47838 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool-flex.yaml @@ -417,7 +417,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -436,23 +436,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml index 799e8c5906d..ed0d682693a 100644 --- a/templates/test/ci/cluster-template-prow-machine-pool.yaml +++ b/templates/test/ci/cluster-template-prow-machine-pool.yaml @@ -411,7 +411,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -430,23 +430,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml index 682d7441912..23ef7283998 100644 --- a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml +++ b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml @@ -278,7 +278,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -297,20 +297,20 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" diff --git a/templates/test/ci/cluster-template-prow-private.yaml b/templates/test/ci/cluster-template-prow-private.yaml index 5b6832e2eaf..aa93ae55da6 100644 --- a/templates/test/ci/cluster-template-prow-private.yaml +++ b/templates/test/ci/cluster-template-prow-private.yaml @@ -331,7 +331,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -350,23 +350,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-spot.yaml b/templates/test/ci/cluster-template-prow-spot.yaml index 3eef8902d9e..a0d0b92dc48 100644 --- a/templates/test/ci/cluster-template-prow-spot.yaml +++ b/templates/test/ci/cluster-template-prow-spot.yaml @@ -304,7 +304,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -323,20 +323,20 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" diff --git a/templates/test/ci/cluster-template-prow-topology.yaml b/templates/test/ci/cluster-template-prow-topology.yaml index 1c8e0f743ac..dcfbfe35626 100644 --- a/templates/test/ci/cluster-template-prow-topology.yaml +++ b/templates/test/ci/cluster-template-prow-topology.yaml @@ -146,7 +146,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -165,23 +165,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: diff --git a/templates/test/ci/cluster-template-prow-workload-identity.yaml b/templates/test/ci/cluster-template-prow-workload-identity.yaml index 9edec2d70af..f91367e97cc 100644 --- a/templates/test/ci/cluster-template-prow-workload-identity.yaml +++ b/templates/test/ci/cluster-template-prow-workload-identity.yaml @@ -284,7 +284,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -303,20 +303,20 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml index 4e1fb92e425..5bccde1375e 100644 --- a/templates/test/ci/cluster-template-prow.yaml +++ b/templates/test/ci/cluster-template-prow.yaml @@ -475,7 +475,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -494,23 +494,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: 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 65b3c8e52b2..58f962d47b4 100644 --- a/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml +++ b/templates/test/dev/cluster-template-custom-builds-machine-pool.yaml @@ -594,7 +594,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -613,23 +613,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml index 328dbd1fd7a..5b1ebde43ea 100644 --- a/templates/test/dev/cluster-template-custom-builds.yaml +++ b/templates/test/dev/cluster-template-custom-builds.yaml @@ -687,7 +687,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -706,23 +706,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: v1 data: 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 1c30a0928ff..d8061262b92 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 @@ -60,7 +60,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -78,23 +78,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate 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 b94216f82d6..ed086062412 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 @@ -60,7 +60,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -78,23 +78,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate 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 1ecb15fdea8..bd36a6a30a5 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 @@ -60,7 +60,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -78,23 +78,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfig 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 702dde4105c..a2e328c97af 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 @@ -60,7 +60,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -78,23 +78,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate 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 5e48d37795b..f4f03c464ba 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 @@ -60,7 +60,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -78,23 +78,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate diff --git a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml index 139054cfc0a..5e515c7de19 100644 --- a/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml +++ b/test/e2e/data/infrastructure-azure/v1beta1/cluster-template.yaml @@ -60,7 +60,7 @@ spec: cloud-provider: azure releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: @@ -78,23 +78,23 @@ spec: cloud-provider: azure-ci releaseName: cloud-provider-azure-oot repoURL: https://raw.githubusercontent.com/kubernetes-sigs/cloud-provider-azure/master/helm/repo - valuesTemplate: |- + valuesTemplate: | infra: clusterName: {{ .Cluster.metadata.name }} cloudControllerManager: cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"} cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""} clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }} - imageName: ${CCM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CCM:-""} + imageName: "${CCM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CCM:-""}" logVerbosity: ${CCM_LOG_VERBOSITY:-4} replicas: ${CCM_COUNT:-1} enableDynamicReloading: ${ENABLE_DYNAMIC_RELOADING:-false} cloudNodeManager: - imageName: ${CNM_IMAGE_NAME:-""} - imageRepository: ${IMAGE_REGISTRY:-""} - imageTag: ${IMAGE_TAG_CNM:-""} + imageName: "${CNM_IMAGE_NAME:-""}" + imageRepository: "${IMAGE_REGISTRY:-""}" + imageTag: "${IMAGE_TAG_CNM:-""}" --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate