Skip to content

Commit a133b4d

Browse files
committed
Try azure linux 3
1 parent 4ad8f96 commit a133b4d

File tree

44 files changed

+231
-31
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+231
-31
lines changed

azure/defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const (
5050
// DefaultPublicGalleryName is the default Azure compute gallery.
5151
DefaultPublicGalleryName = "ClusterAPI-f72ceb4f-5159-4c26-a0fe-2ea738f0d019"
5252
// DefaultLinuxGalleryImageName is the default Linux community gallery image definition.
53-
DefaultLinuxGalleryImageName = "capi-ubun2-2404"
53+
DefaultLinuxGalleryImageName = "capi-azurelinux-3"
5454
// DefaultWindowsGalleryImageName is the default Windows community gallery image definition.
5555
DefaultWindowsGalleryImageName = "capi-win-2019-containerd"
5656
)

templates/addons/cluster-api-helm/cloud-provider-azure-ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ spec:
1313
infra:
1414
clusterName: {{ .Cluster.metadata.name }}
1515
cloudControllerManager:
16+
caCertDir: "/etc/pki/tls/certs"
1617
cloudConfig: ${CLOUD_CONFIG:-"/etc/kubernetes/azure.json"}
1718
cloudConfigSecretName: ${CONFIG_SECRET_NAME:-""}
1819
clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }}

templates/addons/cluster-api-helm/cloud-provider-azure.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ spec:
1313
infra:
1414
clusterName: {{ .Cluster.metadata.name }}
1515
cloudControllerManager:
16+
caCertDir: "/etc/pki/tls/certs"
1617
clusterCIDR: {{ .Cluster.spec.clusterNetwork.pods.cidrBlocks | join "," }}
1718
logVerbosity: 4

templates/test/ci/cluster-template-prow-apiserver-ilb-custom-images.yaml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-apiserver-ilb.yaml

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-azure-cni-v1.yaml

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-dra.yaml

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-dual-stack.yaml

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-ipv6.yaml

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/test/ci/cluster-template-prow-ci-version-md-and-mp.yaml

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)