Ensure we don't overwrite pr templates during generation

kubernetes-sigs · Aug 11, 2021 · 44efade · 44efade
1 parent deb29c1
commit 44efade
Show file tree

Hide file tree

Showing 30 changed files with 242 additions and 174 deletions.
diff --git a/templates/cluster-template-aad.yaml b/templates/cluster-template-aad.yaml
@@ -115,6 +115,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
     useExperimentalRetryJoin: true
   machineTemplate:

diff --git a/templates/cluster-template-azure-bastion.yaml b/templates/cluster-template-azure-bastion.yaml
@@ -112,6 +112,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template-ephemeral.yaml b/templates/cluster-template-ephemeral.yaml
@@ -110,6 +110,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template-external-cloud-provider.yaml b/templates/cluster-template-external-cloud-provider.yaml
@@ -111,6 +111,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template-machinepool-multiple-subnets.yaml b/templates/cluster-template-machinepool-multiple-subnets.yaml
@@ -117,6 +117,8 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
+    preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:
       apiVersion: infrastructure.cluster.x-k8s.io/v1alpha4

diff --git a/templates/cluster-template-machinepool-system-assigned-identity.yaml b/templates/cluster-template-machinepool-system-assigned-identity.yaml
@@ -106,6 +106,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template-machinepool-user-assigned-identity.yaml b/templates/cluster-template-machinepool-user-assigned-identity.yaml
@@ -106,6 +106,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template-machinepool.yaml b/templates/cluster-template-machinepool.yaml
@@ -110,6 +110,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template-nat-gateway.yaml b/templates/cluster-template-nat-gateway.yaml
@@ -123,6 +123,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template-nvidia-gpu.yaml b/templates/cluster-template-nvidia-gpu.yaml
@@ -111,6 +111,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template-system-assigned-identity.yaml b/templates/cluster-template-system-assigned-identity.yaml
@@ -106,6 +106,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template-user-assigned-identity.yaml b/templates/cluster-template-user-assigned-identity.yaml
@@ -106,6 +106,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -110,6 +110,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/flavors/base/cluster-template.yaml b/templates/flavors/base/cluster-template.yaml
@@ -110,6 +110,7 @@ spec:
       - - LABEL=etcd_disk
         - /var/lib/etcddisk
     preKubeadmCommands: []
+    postKubeadmCommands: []
   version: "${KUBERNETES_VERSION}"
 ---
 kind: AzureMachineTemplate

diff --git a/templates/test/ci/cluster-template-prow-ci-version.yaml b/templates/test/ci/cluster-template-prow-ci-version.yaml
@@ -181,6 +181,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands:
     - bash -c /tmp/kubeadm-bootstrap.sh
     useExperimentalRetryJoin: true

diff --git a/templates/test/ci/cluster-template-prow-custom-vnet.yaml b/templates/test/ci/cluster-template-prow-custom-vnet.yaml
@@ -126,6 +126,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml b/templates/test/ci/cluster-template-prow-external-cloud-provider.yaml
@@ -116,6 +116,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/test/ci/cluster-template-prow-identity-from-env.yaml b/templates/test/ci/cluster-template-prow-identity-from-env.yaml
@@ -111,6 +111,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

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
@@ -181,6 +181,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands:
     - bash -c /tmp/kubeadm-bootstrap.sh
     useExperimentalRetryJoin: true

diff --git a/templates/test/ci/cluster-template-prow-machine-pool.yaml b/templates/test/ci/cluster-template-prow-machine-pool.yaml
@@ -115,6 +115,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml b/templates/test/ci/cluster-template-prow-nvidia-gpu.yaml
@@ -116,6 +116,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/test/ci/cluster-template-prow.yaml b/templates/test/ci/cluster-template-prow.yaml
@@ -115,6 +115,7 @@ spec:
     mounts:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
+    postKubeadmCommands: []
     preKubeadmCommands: []
   machineTemplate:
     infrastructureRef:

diff --git a/templates/test/dev/cluster-template-custom-builds-windows.yaml b/templates/test/dev/cluster-template-custom-builds-windows.yaml
@@ -95,6 +95,25 @@ spec:
         overwrite: false
         tableType: gpt
     files:
+    - content: |
+        network:
+          version: 2
+          ethernets:
+            eth0:
+              mtu: 1400
+              match:
+                macaddress: MACADDRESS
+              set-name: eth0
+      owner: root:root
+      path: /etc/netplan/60-eth0.yaml
+      permissions: "0644"
+    - contentFrom:
+        secret:
+          key: control-plane-azure.json
+          name: ${CLUSTER_NAME}-control-plane-azure-json
+      owner: root:root
+      path: /etc/kubernetes/azure.json
+      permissions: "0644"
     - content: |
         #!/bin/bash
 
@@ -144,13 +163,6 @@ spec:
       owner: root:root
       path: /tmp/replace-k8s-components.sh
       permissions: "0744"
-    - contentFrom:
-        secret:
-          key: control-plane-azure.json
-          name: ${CLUSTER_NAME}-control-plane-azure-json
-      owner: root:root
-      path: /etc/kubernetes/azure.json
-      permissions: "0644"
     initConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
@@ -169,6 +181,9 @@ spec:
     - - LABEL=etcd_disk
       - /var/lib/etcddisk
     postKubeadmCommands:
+    - mac=$(ip -o link | grep eth0 | grep ether | awk '{ print $17 }')
+    - sed -i -e "s/MACADDRESS/$${mac}/g" /etc/netplan/60-eth0.yaml
+    - netplan apply
     - bash -c /tmp/replace-k8s-components.sh
     preKubeadmCommands:
     - bash -c /tmp/replace-k8s-binaries.sh
@@ -260,6 +275,25 @@ spec:
   template:
     spec:
       files:
+      - contentFrom:
+          secret:
+            key: worker-node-azure.json
+            name: ${CLUSTER_NAME}-md-0-azure-json
+        owner: root:root
+        path: /etc/kubernetes/azure.json
+        permissions: "0644"
+      - content: |
+          network:
+            version: 2
+            ethernets:
+              eth0:
+                mtu: 1400
+                match:
+                  macaddress: MACADDRESS
+                set-name: eth0
+        owner: root:root
+        path: /etc/netplan/60-eth0.yaml
+        permissions: "0644"
       - content: |
           #!/bin/bash
 
@@ -281,13 +315,6 @@ spec:
         owner: root:root
         path: /tmp/replace-k8s-binaries.sh
         permissions: "0744"
-      - contentFrom:
-          secret:
-            key: control-plane-azure.json
-            name: ${CLUSTER_NAME}-control-plane-azure-json
-        owner: root:root
-        path: /etc/kubernetes/azure.json
-        permissions: "0644"
       joinConfiguration:
         nodeRegistration:
           kubeletExtraArgs:

diff --git a/templates/test/dev/cluster-template-custom-builds.yaml b/templates/test/dev/cluster-template-custom-builds.yaml
@@ -94,6 +94,13 @@ spec:
         overwrite: false
         tableType: gpt
     files:
+    - contentFrom:
+        secret:
+          key: control-plane-azure.json
+          name: ${CLUSTER_NAME}-control-plane-azure-json
+      owner: root:root
+      path: /etc/kubernetes/azure.json
+      permissions: "0644"
     - content: |
         #!/bin/bash
 
@@ -143,13 +150,6 @@ spec:
       owner: root:root
       path: /tmp/replace-k8s-components.sh
       permissions: "0744"
-    - contentFrom:
-        secret:
-          key: control-plane-azure.json
-          name: ${CLUSTER_NAME}-control-plane-azure-json
-      owner: root:root
-      path: /etc/kubernetes/azure.json
-      permissions: "0644"
     initConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
@@ -259,6 +259,13 @@ spec:
   template:
     spec:
       files:
+      - contentFrom:
+          secret:
+            key: worker-node-azure.json
+            name: ${CLUSTER_NAME}-md-0-azure-json
+        owner: root:root
+        path: /etc/kubernetes/azure.json
+        permissions: "0644"
       - content: |
           #!/bin/bash
 
@@ -280,13 +287,6 @@ spec:
         owner: root:root
         path: /tmp/replace-k8s-binaries.sh
         permissions: "0744"
-      - contentFrom:
-          secret:
-            key: control-plane-azure.json
-            name: ${CLUSTER_NAME}-control-plane-azure-json
-        owner: root:root
-        path: /etc/kubernetes/azure.json
-        permissions: "0644"
       joinConfiguration:
         nodeRegistration:
           kubeletExtraArgs:

diff --git a/templates/test/dev/custom-builds-windows/kustomization.yaml b/templates/test/dev/custom-builds-windows/kustomization.yaml
@@ -2,8 +2,8 @@ namespace: default
 resources:
   - ../../../test/ci/prow-windows
 patchesStrategicMerge:
-  - ../custom-builds/patches/custom-builds.yaml
   - patches/windows-image-update.yaml
+  - ../custom-builds/patches/machine-deployment-pr-version.yaml
 patchesJson6902:
 - target:
     group: bootstrap.cluster.x-k8s.io
@@ -12,3 +12,16 @@ patchesJson6902:
     name: .*-md-win
     namespace: default
   path: patches/custom-builds-windows.yaml
+- target:
+    group: bootstrap.cluster.x-k8s.io
+    version: v1alpha4
+    kind: KubeadmConfigTemplate
+    name: .*-md-0
+    namespace: default
+  path: ../custom-builds/patches/kubeadm-bootstrap.yaml
+- target:
+    group: controlplane.cluster.x-k8s.io
+    version: v1alpha4
+    kind: KubeadmControlPlane
+    name: .*-control-plane
+  path: ../custom-builds/patches/kubeadm-controlplane-bootstrap.yaml
diff --git a/templates/test/dev/custom-builds/kustomization.yaml b/templates/test/dev/custom-builds/kustomization.yaml
@@ -2,5 +2,18 @@ namespace: default
 resources:
   - ../../../test/ci/prow
 patchesStrategicMerge:
-  - ../patches/control-plane-custom-builds.yaml
-  - patches/custom-builds.yaml
+  - patches/machine-deployment-pr-version.yaml
+patches:
+- target:
+    group: bootstrap.cluster.x-k8s.io
+    version: v1alpha4
+    kind: KubeadmConfigTemplate
+    name: .*-md-0
+    namespace: default
+  path: patches/kubeadm-bootstrap.yaml
+- target:
+    group: controlplane.cluster.x-k8s.io
+    version: v1alpha4
+    kind: KubeadmControlPlane
+    name: .*-control-plane
+  path: patches/kubeadm-controlplane-bootstrap.yaml