switch order

signalfx · Oct 5, 2023 · 00cc0f6 · 00cc0f6
1 parent ed0f61d
commit 00cc0f6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/.github/workflows/configs/e2e-kind-config-v1.24.15.yaml b/.github/workflows/configs/e2e-kind-config-v1.24.15.yaml
@@ -1,9 +1,5 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
-kubeadmConfigPatches:
-  - |
-    kind: KubeletConfiguration
-    serverTLSBootstrap: true
 nodes:
   - role: control-plane
     image: kindest/node:v1.24.15
@@ -13,6 +9,9 @@ nodes:
         nodeRegistration:
           kubeletExtraArgs:
             node-labels: "ingress-ready=true"
+      - |
+        kind: KubeletConfiguration
+        serverTLSBootstrap: true
     extraPortMappings:
       - containerPort: 80
         hostPort: 80

diff --git a/.github/workflows/configs/e2e-kind-config-v1.25.11.yaml b/.github/workflows/configs/e2e-kind-config-v1.25.11.yaml
@@ -1,9 +1,5 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
-kubeadmConfigPatches:
-  - |
-    kind: KubeletConfiguration
-    serverTLSBootstrap: true
 nodes:
   - role: control-plane
     image: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8
@@ -13,6 +9,9 @@ nodes:
         nodeRegistration:
           kubeletExtraArgs:
             node-labels: "ingress-ready=true"
+      - |
+        kind: KubeletConfiguration
+        serverTLSBootstrap: true
     extraPortMappings:
       - containerPort: 80
         hostPort: 80

diff --git a/.github/workflows/configs/e2e-kind-config-v1.26.6.yaml b/.github/workflows/configs/e2e-kind-config-v1.26.6.yaml
@@ -1,9 +1,5 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
-kubeadmConfigPatches:
-  - |
-    kind: KubeletConfiguration
-    serverTLSBootstrap: true
 nodes:
   - role: control-plane
     image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb
@@ -13,6 +9,9 @@ nodes:
         nodeRegistration:
           kubeletExtraArgs:
             node-labels: "ingress-ready=true"
+      - |
+        kind: KubeletConfiguration
+        serverTLSBootstrap: true
     extraPortMappings:
       - containerPort: 80
         hostPort: 80

diff --git a/.github/workflows/configs/e2e-kind-config-v1.28.0.yaml b/.github/workflows/configs/e2e-kind-config-v1.28.0.yaml
@@ -1,9 +1,5 @@
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
-kubeadmConfigPatches:
-  - |
-    kind: KubeletConfiguration
-    serverTLSBootstrap: true
 nodes:
   - role: control-plane
     image: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31
@@ -13,6 +9,9 @@ nodes:
         nodeRegistration:
           kubeletExtraArgs:
             node-labels: "ingress-ready=true"
+      - |
+        kind: KubeletConfiguration
+        serverTLSBootstrap: true
     extraPortMappings:
       - containerPort: 80
         hostPort: 80

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -43,9 +43,6 @@ jobs:
           kubectl_version: ${{ matrix.k8s-version }}
           cluster_name: kind
           config: ./.github/workflows/configs/e2e-kind-config-${{ matrix.k8s-version }}.yaml
-      - name: Fix kubelet TLS server certificates
-        run: |
-          kubectl get csr -o=jsonpath='{range.items[?(@.spec.signerName=="kubernetes.io/kubelet-serving")]}{.metadata.name}{" "}{end}' | xargs kubectl certificate approve
       - name: Deploy cert-manager
         run: |
           make cert-manager
@@ -54,6 +51,9 @@ jobs:
           cd e2e_tests/testdata/nodejs
           docker build -t nodejs_test:latest .
           kind load docker-image nodejs_test:latest --name kind
+      - name: Fix kubelet TLS server certificates
+        run: |
+          kubectl get csr -o=jsonpath='{range.items[?(@.spec.signerName=="kubernetes.io/kubelet-serving")]}{.metadata.name}{" "}{end}' | xargs kubectl certificate approve
       - name: run e2e tests
         run: |
           cd e2e_tests