hack/update-expected.sh

nodeup/pkg/model/tests/golden/awsiam/tasks-kube-apiserver.yaml

@@ -51,8 +51,8 @@ contents: |
       - --etcd-servers-overrides=/events#https://127.0.0.1:4002
       - --etcd-servers=https://127.0.0.1:4001
       - --insecure-port=0
-      - --kubelet-client-certificate=/srv/kubernetes/kubelet-api.crt
+      - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt
-      - --kubelet-client-key=/srv/kubernetes/kubelet-api.key
+      - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key
       - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP
       - --proxy-client-cert-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.crt
       - --proxy-client-key-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.key
@@ -184,10 +184,6 @@ contents: |
 path: /etc/kubernetes/manifests/kube-apiserver.manifest
 type: file
 ---
-mode: "0755"
-path: /srv/kubernetes
-type: directory
----
 contents:
   task:
     Name: aws-iam-authenticator
@@ -284,6 +280,30 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/etcd-client.key
 type: file
 ---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0644"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.crt
+type: file
+---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.key
+type: file
+---
 contents:
   task:
     Name: master
@@ -341,30 +361,6 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/service-account.pub
 type: file
 ---
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0644"
-path: /srv/kubernetes/kubelet-api.crt
-type: file
----
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0600"
-path: /srv/kubernetes/kubelet-api.key
-type: file
----
 contents: ""
 ifNotExists: true
 mode: "0400"

nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml

@@ -29,8 +29,8 @@ contents: |
       - --etcd-servers-overrides=/events#https://events.etcd.minimal.example.com:4002
       - --etcd-servers=https://main.etcd.minimal.example.com:4001
       - --insecure-port=0
-      - --kubelet-client-certificate=/srv/kubernetes/kubelet-api.crt
+      - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt
-      - --kubelet-client-key=/srv/kubernetes/kubelet-api.key
+      - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key
       - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP
       - --proxy-client-cert-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.crt
       - --proxy-client-key-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.key
@@ -157,10 +157,6 @@ path: /etc/kubernetes/manifests/kube-apiserver.manifest
 type: file
 ---
 mode: "0755"
-path: /srv/kubernetes
-type: directory
----
-mode: "0755"
 path: /srv/kubernetes/kube-apiserver
 type: directory
 ---
@@ -222,6 +218,30 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/etcd-client.key
 type: file
 ---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0644"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.crt
+type: file
+---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.key
+type: file
+---
 contents:
   task:
     Name: master
@@ -279,30 +299,6 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/service-account.pub
 type: file
 ---
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0644"
-path: /srv/kubernetes/kubelet-api.crt
-type: file
----
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0600"
-path: /srv/kubernetes/kubelet-api.key
-type: file
----
 contents: ""
 ifNotExists: true
 mode: "0400"

nodeup/pkg/model/tests/golden/minimal/tasks-kube-apiserver.yaml

@@ -29,8 +29,8 @@ contents: |
       - --etcd-servers-overrides=/events#https://127.0.0.1:4002
       - --etcd-servers=https://127.0.0.1:4001
       - --insecure-port=0
-      - --kubelet-client-certificate=/srv/kubernetes/kubelet-api.crt
+      - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt
-      - --kubelet-client-key=/srv/kubernetes/kubelet-api.key
+      - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key
       - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP
       - --proxy-client-cert-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.crt
       - --proxy-client-key-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.key
@@ -157,10 +157,6 @@ path: /etc/kubernetes/manifests/kube-apiserver.manifest
 type: file
 ---
 mode: "0755"
-path: /srv/kubernetes
-type: directory
----
-mode: "0755"
 path: /srv/kubernetes/kube-apiserver
 type: directory
 ---
@@ -222,6 +218,30 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/etcd-client.key
 type: file
 ---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0644"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.crt
+type: file
+---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.key
+type: file
+---
 contents:
   task:
     Name: master
@@ -279,30 +299,6 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/service-account.pub
 type: file
 ---
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0644"
-path: /srv/kubernetes/kubelet-api.crt
-type: file
----
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0600"
-path: /srv/kubernetes/kubelet-api.key
-type: file
----
 contents: ""
 ifNotExists: true
 mode: "0400"

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-amd64.yaml

@@ -29,8 +29,8 @@ contents: |
       - --etcd-servers-overrides=/events#https://127.0.0.1:4002
       - --etcd-servers=https://127.0.0.1:4001
       - --insecure-port=0
-      - --kubelet-client-certificate=/srv/kubernetes/kubelet-api.crt
+      - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt
-      - --kubelet-client-key=/srv/kubernetes/kubelet-api.key
+      - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key
       - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP
       - --proxy-client-cert-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.crt
       - --proxy-client-key-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.key
@@ -157,10 +157,6 @@ path: /etc/kubernetes/manifests/kube-apiserver.manifest
 type: file
 ---
 mode: "0755"
-path: /srv/kubernetes
-type: directory
----
-mode: "0755"
 path: /srv/kubernetes/kube-apiserver
 type: directory
 ---
@@ -222,6 +218,30 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/etcd-client.key
 type: file
 ---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0644"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.crt
+type: file
+---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.key
+type: file
+---
 contents:
   task:
     Name: master
@@ -279,30 +299,6 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/service-account.pub
 type: file
 ---
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0644"
-path: /srv/kubernetes/kubelet-api.crt
-type: file
----
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0600"
-path: /srv/kubernetes/kubelet-api.key
-type: file
----
 contents: ""
 ifNotExists: true
 mode: "0400"

nodeup/pkg/model/tests/golden/side-loading/tasks-kube-apiserver-arm64.yaml

@@ -29,8 +29,8 @@ contents: |
       - --etcd-servers-overrides=/events#https://127.0.0.1:4002
       - --etcd-servers=https://127.0.0.1:4001
       - --insecure-port=0
-      - --kubelet-client-certificate=/srv/kubernetes/kubelet-api.crt
+      - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt
-      - --kubelet-client-key=/srv/kubernetes/kubelet-api.key
+      - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key
       - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP
       - --proxy-client-cert-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.crt
       - --proxy-client-key-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.key
@@ -157,10 +157,6 @@ path: /etc/kubernetes/manifests/kube-apiserver.manifest
 type: file
 ---
 mode: "0755"
-path: /srv/kubernetes
-type: directory
----
-mode: "0755"
 path: /srv/kubernetes/kube-apiserver
 type: directory
 ---
@@ -222,6 +218,30 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/etcd-client.key
 type: file
 ---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0644"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.crt
+type: file
+---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.key
+type: file
+---
 contents:
   task:
     Name: master
@@ -279,30 +299,6 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/service-account.pub
 type: file
 ---
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0644"
-path: /srv/kubernetes/kubelet-api.crt
-type: file
----
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0600"
-path: /srv/kubernetes/kubelet-api.key
-type: file
----
 contents: ""
 ifNotExists: true
 mode: "0400"

nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml

@@ -28,8 +28,8 @@ contents: |
       - --etcd-keyfile=/srv/kubernetes/kube-apiserver/etcd-client.key
       - --etcd-servers=https://127.0.0.1:4001
       - --insecure-port=0
-      - --kubelet-client-certificate=/srv/kubernetes/kubelet-api.crt
+      - --kubelet-client-certificate=/srv/kubernetes/kube-apiserver/kubelet-api.crt
-      - --kubelet-client-key=/srv/kubernetes/kubelet-api.key
+      - --kubelet-client-key=/srv/kubernetes/kube-apiserver/kubelet-api.key
       - --kubelet-preferred-address-types=InternalIP,Hostname,ExternalIP
       - --proxy-client-cert-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.crt
       - --proxy-client-key-file=/srv/kubernetes/kube-apiserver/apiserver-aggregator.key
@@ -156,10 +156,6 @@ path: /etc/kubernetes/manifests/kube-apiserver.manifest
 type: file
 ---
 mode: "0755"
-path: /srv/kubernetes
-type: directory
----
-mode: "0755"
 path: /srv/kubernetes/kube-apiserver
 type: directory
 ---
@@ -221,6 +217,30 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/etcd-client.key
 type: file
 ---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0644"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.crt
+type: file
+---
+contents:
+  task:
+    Name: kubelet-api
+    keypairID: "3"
+    signer: kubernetes-ca
+    subject:
+      CommonName: kubelet-api
+    type: client
+mode: "0600"
+path: /srv/kubernetes/kube-apiserver/kubelet-api.key
+type: file
+---
 contents:
   task:
     Name: master
@@ -278,30 +298,6 @@ mode: "0600"
 path: /srv/kubernetes/kube-apiserver/service-account.pub
 type: file
 ---
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0644"
-path: /srv/kubernetes/kubelet-api.crt
-type: file
----
-contents:
-  task:
-    Name: kubelet-api
-    keypairID: "3"
-    signer: kubernetes-ca
-    subject:
-      CommonName: kubelet-api
-    type: client
-mode: "0600"
-path: /srv/kubernetes/kubelet-api.key
-type: file
----
 contents: ""
 ifNotExists: true
 mode: "0400"