hack/update-expected.sh

kubernetes · Jan 2, 2023 · cad26dd · cad26dd
1 parent 94f33ac
commit cad26dd
Show file tree

Hide file tree

Showing 343 changed files with 547 additions and 541 deletions.
diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt
@@ -140,8 +140,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig: null
-docker:
-  logLevel: INFO
 encryptionConfig: null
 etcdClusters:
   events:
@@ -173,7 +171,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: vkWrsA+Xx2Lye+Nl+tXWfFXzZ+IKRDVC7kPPiCQYCic=
+NodeupConfigHash: PKuG4AB7XxOlW3ztoVupVlaCDfDULbVpj0nUv3Vnm0w=
 
 __EOF_KUBE_ENV
 

diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt
@@ -140,8 +140,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig: null
-docker:
-  logLevel: INFO
 encryptionConfig: null
 etcdClusters:
   events:
@@ -173,7 +171,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: zXULrdjHoqwnFb2Z6Hr5VPYchOvJpEM3ubFfp/iHmTU=
+NodeupConfigHash: ZVYsS4+BT0OlT0c4tYSzNOS5cF2BmdCWOlbgLawANPE=
 
 __EOF_KUBE_ENV
 

diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt
@@ -140,8 +140,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig: null
-docker:
-  logLevel: INFO
 encryptionConfig: null
 etcdClusters:
   events:
@@ -173,7 +171,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: zXULrdjHoqwnFb2Z6Hr5VPYchOvJpEM3ubFfp/iHmTU=
+NodeupConfigHash: ZVYsS4+BT0OlT0c4tYSzNOS5cF2BmdCWOlbgLawANPE=
 
 __EOF_KUBE_ENV
 

diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt
@@ -140,8 +140,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig: null
-docker:
-  logLevel: INFO
 kubeProxy:
   cpuLimit: 30m
   cpuRequest: 30m
@@ -158,7 +156,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Node
-NodeupConfigHash: gV7SLkK9Fo3OvE6UrADmYnbFBE0dVQw4H6LloJ0T5CA=
+NodeupConfigHash: ApI8of4o1v0oYuFEkLOEvHztTT+rLkxbtFfHyF3NVp8=
 
 __EOF_KUBE_ENV
 

diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt
@@ -140,8 +140,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig: null
-docker:
-  logLevel: INFO
 kubeProxy:
   cpuLimit: 30m
   cpuRequest: 30m
@@ -158,7 +156,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Node
-NodeupConfigHash: HnS7FZVihse0lpXlDBtVWIzDjnuZf+qnyjzE05colKg=
+NodeupConfigHash: LxsGYCB8Qxowvtmt2Ak2367hT1H5JU7SEkCVY3fD75U=
 
 __EOF_KUBE_ENV
 

diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt
@@ -140,8 +140,6 @@ ensure-install-dir
 
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig: null
-docker:
-  logLevel: INFO
 kubeProxy:
   cpuLimit: 30m
   cpuRequest: 30m
@@ -158,7 +156,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 CloudProvider: aws
 InstanceGroupName: testIG
 InstanceGroupRole: Node
-NodeupConfigHash: HnS7FZVihse0lpXlDBtVWIzDjnuZf+qnyjzE05colKg=
+NodeupConfigHash: LxsGYCB8Qxowvtmt2Ak2367hT1H5JU7SEkCVY3fD75U=
 
 __EOF_KUBE_ENV
 

diff --git a/pkg/model/tests/data/nodeupconfig_0.txt b/pkg/model/tests/data/nodeupconfig_0.txt
@@ -20,3 +20,5 @@ KubeletConfig:
 UpdatePolicy: automatic
 containerdConfig:
   logLevel: info
+docker:
+  logLevel: INFO
diff --git a/pkg/model/tests/data/nodeupconfig_1.txt b/pkg/model/tests/data/nodeupconfig_1.txt
@@ -38,3 +38,5 @@ KubeletConfig:
 UpdatePolicy: automatic
 containerdConfig:
   logLevel: info
+docker:
+  logLevel: INFO
diff --git a/pkg/model/tests/data/nodeupconfig_2.txt b/pkg/model/tests/data/nodeupconfig_2.txt
@@ -38,3 +38,5 @@ KubeletConfig:
 UpdatePolicy: automatic
 containerdConfig:
   logLevel: info
+docker:
+  logLevel: INFO
diff --git a/pkg/model/tests/data/nodeupconfig_3.txt b/pkg/model/tests/data/nodeupconfig_3.txt
@@ -16,3 +16,5 @@ KubeletConfig:
 UpdatePolicy: automatic
 containerdConfig:
   logLevel: info
+docker:
+  logLevel: INFO
diff --git a/pkg/model/tests/data/nodeupconfig_4.txt b/pkg/model/tests/data/nodeupconfig_4.txt
@@ -34,3 +34,5 @@ KubeletConfig:
 UpdatePolicy: automatic
 containerdConfig:
   logLevel: info
+docker:
+  logLevel: INFO
diff --git a/pkg/model/tests/data/nodeupconfig_5.txt b/pkg/model/tests/data/nodeupconfig_5.txt
@@ -34,3 +34,5 @@ KubeletConfig:
 UpdatePolicy: automatic
 containerdConfig:
   logLevel: info
+docker:
+  logLevel: INFO
diff --git a/...ata/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/...ata/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
@@ -125,8 +125,6 @@ ensure-install-dir
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
   manageStorageClasses: true
-docker:
-  skipInstall: true
 encryptionConfig: null
 etcdClusters:
   events:
@@ -261,7 +259,7 @@ CloudProvider: aws
 ConfigBase: memfs://tests/additionalobjects.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: h0BunyGu9OkI0rtjDr/K+z7SiZ4Xv/76UoDZhtzvihE=
+NodeupConfigHash: QInbwR5tUN33Q96tgWuDBwj51NWiUfZUIUU0yEFV6Mc=
 
 __EOF_KUBE_ENV
 

diff --git a/.../additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data b/.../additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
@@ -125,8 +125,6 @@ ensure-install-dir
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
   manageStorageClasses: true
-docker:
-  skipInstall: true
 kubeProxy:
   clusterCIDR: 100.96.0.0/11
   cpuRequest: 100m
@@ -183,7 +181,7 @@ ConfigServer:
   server: https://kops-controller.internal.additionalobjects.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: xy6vM/UBskzo5J2wYiqXaqyJmSTHuj4hFfiCErM/HzU=
+NodeupConfigHash: sSuHwQvZ6+lX/JnKse3XKRQ9lNJKBqc/G6uTyv29Dtc=
 
 __EOF_KUBE_ENV
 

diff --git a/...pdate_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -283,6 +283,8 @@ containerdConfig:
   runc:
     version: 1.1.4
   version: 1.6.14
+docker:
+  skipInstall: true
 etcdManifests:
 - memfs://tests/additionalobjects.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://tests/additionalobjects.example.com/manifests/etcd/events-master-us-test-1a.yaml

diff --git a/...ntegration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content b/...ntegration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
@@ -52,3 +52,5 @@ containerdConfig:
   runc:
     version: 1.1.4
   version: 1.6.14
+docker:
+  skipInstall: true
diff --git a/...piservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data b/...piservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
@@ -125,8 +125,6 @@ ensure-install-dir
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
   manageStorageClasses: true
-docker:
-  skipInstall: true
 kubeProxy:
   clusterCIDR: 100.96.0.0/11
   cpuRequest: 100m
@@ -161,7 +159,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: apiserver
 InstanceGroupRole: APIServer
-NodeupConfigHash: gouzgmaZZLVcikzMdZQd95zyHRfnLi0LcJFOumNkFFs=
+NodeupConfigHash: vYbskPDI3k2nU17RtTF/2uq4sfcxZX3NyHl7wJ4db0Y=
 
 __EOF_KUBE_ENV
 

diff --git a/...vernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...vernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -125,8 +125,6 @@ ensure-install-dir
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
   manageStorageClasses: true
-docker:
-  skipInstall: true
 encryptionConfig: null
 etcdClusters:
   events:
@@ -256,7 +254,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: AWUu6EmchBvXxCSdVoStlAHel5DQzNIdE0hKzbt6uQI=
+NodeupConfigHash: lnIwb5HEvPCa1OQzHTQKkEi3FUQbivijCQF37W48OxU=
 
 __EOF_KUBE_ENV
 

diff --git a/...pdate_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data b/...pdate_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -125,8 +125,6 @@ ensure-install-dir
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
   manageStorageClasses: true
-docker:
-  skipInstall: true
 kubeProxy:
   clusterCIDR: 100.96.0.0/11
   cpuRequest: 100m
@@ -183,7 +181,7 @@ ConfigServer:
   server: https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: +y00CPn+YVJ6IK/PcD4OK/T6EZxvFWg+wu8PlbCJbo4=
+NodeupConfigHash: fUL6Sh6hpLgZiRi91fxuT57dePgGg2XdySENA7uWC2I=
 
 __EOF_KUBE_ENV
 

diff --git a/...tegration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content b/...tegration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content
@@ -179,6 +179,8 @@ channels:
 containerdConfig:
   logLevel: info
   version: 1.4.13
+docker:
+  skipInstall: true
 staticManifests:
 - key: kube-apiserver-healthcheck
   path: manifests/static/kube-apiserver-healthcheck.yaml
diff --git a/...n/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...n/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -277,6 +277,8 @@ channels:
 containerdConfig:
   logLevel: info
   version: 1.4.13
+docker:
+  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml

diff --git a/...s/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content b/...s/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content
@@ -47,3 +47,5 @@ channels:
 containerdConfig:
   logLevel: info
   version: 1.4.13
+docker:
+  skipInstall: true
diff --git a/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
@@ -125,8 +125,6 @@ ensure-install-dir
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
   manageStorageClasses: true
-docker:
-  skipInstall: true
 encryptionConfig: null
 etcdClusters:
   events:
@@ -254,7 +252,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/minimal.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: nNtMxjPThhsud1bMFio8XGBi8WwN7W/Xc/mOhDlf+KI=
+NodeupConfigHash: SHXJXEAp+oybG75l+UHgyijWBnJ1kD3p1i7X+U5HAp0=
 
 __EOF_KUBE_ENV
 

diff --git a/...te_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/...te_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
@@ -125,8 +125,6 @@ ensure-install-dir
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
   manageStorageClasses: true
-docker:
-  skipInstall: true
 kubeProxy:
   clusterCIDR: 100.96.0.0/11
   cpuRequest: 100m
@@ -182,7 +180,7 @@ ConfigServer:
   server: https://kops-controller.internal.minimal.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: z8VB/G1H4+VqW7eiejN5ovoP/L9F/z71+9P/4RlTCXw=
+NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw=
 
 __EOF_KUBE_ENV
 

diff --git a/...pdate_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...pdate_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -277,6 +277,8 @@ containerdConfig:
   runc:
     version: 1.1.4
   version: 1.6.14
+docker:
+  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml

diff --git a/...ntegration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content b/...ntegration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content
@@ -49,4 +49,6 @@ containerdConfig:
   runc:
     version: 1.1.4
   version: 1.6.14
+docker:
+  skipInstall: true
 useInstanceIDForNodeName: true
diff --git a/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -125,8 +125,6 @@ ensure-install-dir
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
   manageStorageClasses: true
-docker:
-  skipInstall: true
 encryptionConfig: null
 etcdClusters:
   events:
@@ -254,7 +252,7 @@ CloudProvider: aws
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: master-us-test-1a
 InstanceGroupRole: ControlPlane
-NodeupConfigHash: VcCRrtjWyDm3XNBQNFvr7dAYN7Q3AI2DtVgQvZYcxdM=
+NodeupConfigHash: UfjoqopF3EX6Cu0bMdNGNOEbL8ALczYtlOUVLBhgxIM=
 
 __EOF_KUBE_ENV
 

diff --git a/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
@@ -134,8 +134,6 @@ ensure-install-dir
 cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
 cloudConfig:
   manageStorageClasses: true
-docker:
-  skipInstall: true
 kubeProxy:
   clusterCIDR: 100.96.0.0/11
   cpuRequest: 100m
@@ -191,7 +189,7 @@ ConfigServer:
   server: https://kops-controller.internal.bastionuserdata.example.com:3988/
 InstanceGroupName: nodes
 InstanceGroupRole: Node
-NodeupConfigHash: Pu0yc8yQwWr+aaiFn11egpa14ulacYG/Erc9f6mpR70=
+NodeupConfigHash: CMfse0AqP6wp4b8hoAIHoF+04qb3GcknbFIO90ukERM=
 
 __EOF_KUBE_ENV
 

diff --git a/...pdate_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content b/...pdate_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content
@@ -48,4 +48,6 @@ containerdConfig:
   runc:
     version: 1.1.4
   version: 1.6.14
+docker:
+  skipInstall: true
 useInstanceIDForNodeName: true
diff --git a/...ter/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/...ter/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
@@ -277,6 +277,8 @@ containerdConfig:
   runc:
     version: 1.1.4
   version: 1.6.14
+docker:
+  skipInstall: true
 etcdManifests:
 - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/main-master-us-test-1a.yaml
 - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/events-master-us-test-1a.yaml

diff --git a/.../update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content b/.../update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content
@@ -49,4 +49,6 @@ containerdConfig:
   runc:
     version: 1.1.4
   version: 1.6.14
+docker:
+  skipInstall: true
 useInstanceIDForNodeName: true