Skip to content

Commit fdccb6a

Browse files
committed
prow-ci-versions using pre-existing user-assigned
Signed-off-by: Jack Francis <[email protected]>
1 parent 992eef2 commit fdccb6a

6 files changed

+32
-5
lines changed

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

Lines changed: 1 addition & 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-ipv6.yaml

Lines changed: 1 addition & 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.yaml

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

templates/test/ci/prow-ci-version/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ patches:
5252
- path: ../patches/windows-machine-deployment-replicas.yaml
5353
- path: patches/machine-deployment-ci-version.yaml
5454
- path: patches/machine-deployment-ci-version-windows.yaml
55+
- path: patches/machine-deployment-ci-version-control-plane.yaml
5556
- path: ../patches/metrics-server-enabled-cluster.yaml
5657
- path: ../patches/controller-manager-featuregates.yaml
5758
configMapGenerator:
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
2+
kind: AzureMachineTemplate
3+
metadata:
4+
name: ${CLUSTER_NAME}-control-plane
5+
namespace: default
6+
spec:
7+
template:
8+
spec:
9+
dataDisks:
10+
- diskSizeGB: 256
11+
lun: 0
12+
nameSuffix: etcddisk
13+
identity: UserAssigned
14+
image:
15+
marketplace:
16+
offer: capi
17+
publisher: cncf-upstream
18+
sku: ubuntu-2204-gen1
19+
version: latest
20+
osDisk:
21+
diskSizeGB: 128
22+
osType: Linux
23+
sshPublicKey: ${AZURE_SSH_PUBLIC_KEY_B64:=""}
24+
userAssignedIdentities:
25+
- providerID: /subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/capz-ci/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cloud-provider-user-identity
26+
vmSize: ${AZURE_CONTROL_PLANE_MACHINE_TYPE}

templates/test/ci/prow-ci-version/patches/machine-deployment-ci-version-windows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ spec:
1515
version: "latest"
1616
identity: UserAssigned
1717
userAssignedIdentities:
18-
- providerID: /subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/${CI_RG:=capz-ci}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/${USER_IDENTITY:=cloud-provider-user-identity}
18+
- providerID: /subscriptions/${AZURE_SUBSCRIPTION_ID}/resourceGroups/capz-ci/providers/Microsoft.ManagedIdentity/userAssignedIdentities/cloud-provider-user-identity

0 commit comments

Comments
 (0)