hack/update-expected.sh

pkg/model/tests/data/auxconfig_0.txt

@@ -1,3 +1,7 @@
+FileAssets:
+- content: user,token
+  name: tokens
+  path: /kube/tokens.csv
 Hooks:
 - - manifest: |-
       Type=oneshot

pkg/model/tests/data/auxconfig_1.txt

@@ -1,3 +1,13 @@
+FileAssets:
+- content: blah blah
+  name: iptables-restore
+  path: /var/lib/iptables/rules-save
+- content: user,token
+  name: tokens
+  path: /kube/tokens.csv
+- content: blah blah
+  name: iptables-restore
+  path: /var/lib/iptables/rules-save
 Hooks:
 - - before:
     - update-engine.service

pkg/model/tests/data/auxconfig_2.txt

@@ -1,3 +1,13 @@
+FileAssets:
+- content: blah blah
+  name: iptables-restore
+  path: /var/lib/iptables/rules-save
+- content: user,token
+  name: tokens
+  path: /kube/tokens.csv
+- content: blah blah
+  name: iptables-restore
+  path: /var/lib/iptables/rules-save
 Hooks:
 - - before:
     - update-engine.service

pkg/model/tests/data/auxconfig_3.txt

@@ -1,3 +1,7 @@
+FileAssets:
+- content: user,token
+  name: tokens
+  path: /kube/tokens.csv
 Hooks:
 - - manifest: |-
       Type=oneshot

pkg/model/tests/data/auxconfig_4.txt

@@ -1,3 +1,13 @@
+FileAssets:
+- content: blah blah
+  name: iptables-restore
+  path: /var/lib/iptables/rules-save
+- content: user,token
+  name: tokens
+  path: /kube/tokens.csv
+- content: blah blah
+  name: iptables-restore
+  path: /var/lib/iptables/rules-save
 Hooks:
 - - before:
     - update-engine.service

pkg/model/tests/data/auxconfig_5.txt

@@ -1,3 +1,13 @@
+FileAssets:
+- content: blah blah
+  name: iptables-restore
+  path: /var/lib/iptables/rules-save
+- content: user,token
+  name: tokens
+  path: /kube/tokens.csv
+- content: blah blah
+  name: iptables-restore
+  path: /var/lib/iptables/rules-save
 Hooks:
 - - before:
     - update-engine.service

pkg/model/tests/data/bootstrapscript_0.txt

@@ -171,15 +171,12 @@ masterKubelet:
 __EOF_CLUSTER_SPEC
 
 cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-fileAssets:
+{}
-- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint)
-  name: tokens
-  path: /kube/tokens.csv
 
 __EOF_IG_SPEC
 
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
-AuxConfigHash: CwOuIQfG6Wm8bMLEpxx4k1LQX3VBp/3JiAlu3QuthF4=
+AuxConfigHash: /0fgYG0lsuxVGuNdtGBZA0RYxOfvLD/xOFg1eJwyfcw=
 InstanceGroupRole: Master
 KubeletConfig:
   kubeconfigPath: /etc/kubernetes/igconfig.txt

pkg/model/tests/data/bootstrapscript_1.txt

@@ -150,10 +150,6 @@ etcdClusters:
     version: 3.1.11
   main:
     version: 3.1.11
-fileAssets:
-- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint)
-  name: iptables-restore
-  path: /var/lib/iptables/rules-save
 kubeAPIServer:
   image: CoreOS
 kubeControllerManager:
@@ -175,18 +171,12 @@ masterKubelet:
 __EOF_CLUSTER_SPEC
 
 cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-fileAssets:
+{}
-- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint)
-  name: iptables-restore
-  path: /var/lib/iptables/rules-save
-- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint)
-  name: tokens
-  path: /kube/tokens.csv
 
 __EOF_IG_SPEC
 
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
-AuxConfigHash: 1HFOTkRXC3NVHayHo3Vgpm2hTbewfO3QJEJhhc6tEsk=
+AuxConfigHash: F6TisBT9tDbuqBlzMVgEkEvAa7tdDahjQ9pW4X5S49M=
 InstanceGroupRole: Master
 KubeletConfig:
   kubeconfigPath: /etc/kubernetes/igconfig.txt

pkg/model/tests/data/bootstrapscript_2.txt

@@ -150,10 +150,6 @@ etcdClusters:
     version: 3.1.11
   main:
     version: 3.1.11
-fileAssets:
-- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint)
-  name: iptables-restore
-  path: /var/lib/iptables/rules-save
 kubeAPIServer:
   image: CoreOS
 kubeControllerManager:
@@ -175,18 +171,12 @@ masterKubelet:
 __EOF_CLUSTER_SPEC
 
 cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-fileAssets:
+{}
-- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint)
-  name: iptables-restore
-  path: /var/lib/iptables/rules-save
-- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint)
-  name: tokens
-  path: /kube/tokens.csv
 
 __EOF_IG_SPEC
 
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
-AuxConfigHash: 1HFOTkRXC3NVHayHo3Vgpm2hTbewfO3QJEJhhc6tEsk=
+AuxConfigHash: F6TisBT9tDbuqBlzMVgEkEvAa7tdDahjQ9pW4X5S49M=
 InstanceGroupRole: Master
 KubeletConfig:
   kubeconfigPath: /etc/kubernetes/igconfig.txt

pkg/model/tests/data/bootstrapscript_3.txt

@@ -156,15 +156,12 @@ kubelet:
 __EOF_CLUSTER_SPEC
 
 cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-fileAssets:
+{}
-- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint)
-  name: tokens
-  path: /kube/tokens.csv
 
 __EOF_IG_SPEC
 
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
-AuxConfigHash: CwOuIQfG6Wm8bMLEpxx4k1LQX3VBp/3JiAlu3QuthF4=
+AuxConfigHash: /0fgYG0lsuxVGuNdtGBZA0RYxOfvLD/xOFg1eJwyfcw=
 InstanceGroupRole: Node
 KubeletConfig:
   kubeconfigPath: /etc/kubernetes/igconfig.txt

pkg/model/tests/data/bootstrapscript_4.txt

@@ -143,10 +143,6 @@ containerd:
   logLevel: info
 docker:
   logLevel: INFO
-fileAssets:
-- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint)
-  name: iptables-restore
-  path: /var/lib/iptables/rules-save
 kubeProxy:
   cpuLimit: 30m
   cpuRequest: 30m
@@ -160,18 +156,12 @@ kubelet:
 __EOF_CLUSTER_SPEC
 
 cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-fileAssets:
+{}
-- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint)
-  name: iptables-restore
-  path: /var/lib/iptables/rules-save
-- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint)
-  name: tokens
-  path: /kube/tokens.csv
 
 __EOF_IG_SPEC
 
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
-AuxConfigHash: 1HFOTkRXC3NVHayHo3Vgpm2hTbewfO3QJEJhhc6tEsk=
+AuxConfigHash: F6TisBT9tDbuqBlzMVgEkEvAa7tdDahjQ9pW4X5S49M=
 InstanceGroupRole: Node
 KubeletConfig:
   kubeconfigPath: /etc/kubernetes/igconfig.txt

pkg/model/tests/data/bootstrapscript_5.txt

@@ -143,10 +143,6 @@ containerd:
   logLevel: info
 docker:
   logLevel: INFO
-fileAssets:
-- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint)
-  name: iptables-restore
-  path: /var/lib/iptables/rules-save
 kubeProxy:
   cpuLimit: 30m
   cpuRequest: 30m
@@ -160,18 +156,12 @@ kubelet:
 __EOF_CLUSTER_SPEC
 
 cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-fileAssets:
+{}
-- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint)
-  name: iptables-restore
-  path: /var/lib/iptables/rules-save
-- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint)
-  name: tokens
-  path: /kube/tokens.csv
 
 __EOF_IG_SPEC
 
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
-AuxConfigHash: 1HFOTkRXC3NVHayHo3Vgpm2hTbewfO3QJEJhhc6tEsk=
+AuxConfigHash: F6TisBT9tDbuqBlzMVgEkEvAa7tdDahjQ9pW4X5S49M=
 InstanceGroupRole: Node
 KubeletConfig:
   kubeconfigPath: /etc/kubernetes/igconfig.txt