diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index 2171f4c8a3..bb15e375ab 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -151,13 +151,6 @@ kubeAPIServer: image: CoreOS kubeControllerManager: cloudProvider: aws -kubeProxy: - cpuLimit: 30m - cpuRequest: 30m - featureGates: - AdvancedAuditing: "true" - memoryLimit: 30Mi - memoryRequest: 30Mi kubeScheduler: image: SomeImage kubelet: @@ -171,7 +164,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: ControlPlane -NodeupConfigHash: PKuG4AB7XxOlW3ztoVupVlaCDfDULbVpj0nUv3Vnm0w= +NodeupConfigHash: ahfTlkzwHLRcCExDwnjVTOcVgd5luL3DcQ1jwTFAxqw= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index 53d6dba902..2cc0e7a138 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -151,13 +151,6 @@ kubeAPIServer: image: CoreOS kubeControllerManager: cloudProvider: aws -kubeProxy: - cpuLimit: 30m - cpuRequest: 30m - featureGates: - AdvancedAuditing: "true" - memoryLimit: 30Mi - memoryRequest: 30Mi kubeScheduler: image: SomeImage kubelet: @@ -171,7 +164,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: ControlPlane -NodeupConfigHash: ZVYsS4+BT0OlT0c4tYSzNOS5cF2BmdCWOlbgLawANPE= +NodeupConfigHash: p3vhw4ODkGahCo1FNww5n4ptGSE/KXwl16AFCp48UMo= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index 53d6dba902..2cc0e7a138 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -151,13 +151,6 @@ kubeAPIServer: image: CoreOS kubeControllerManager: cloudProvider: aws -kubeProxy: - cpuLimit: 30m - cpuRequest: 30m - featureGates: - AdvancedAuditing: "true" - memoryLimit: 30Mi - memoryRequest: 30Mi kubeScheduler: image: SomeImage kubelet: @@ -171,7 +164,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: ControlPlane -NodeupConfigHash: ZVYsS4+BT0OlT0c4tYSzNOS5cF2BmdCWOlbgLawANPE= +NodeupConfigHash: p3vhw4ODkGahCo1FNww5n4ptGSE/KXwl16AFCp48UMo= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt index abb8a26f76..d957554056 100644 --- a/pkg/model/tests/data/bootstrapscript_3.txt +++ b/pkg/model/tests/data/bootstrapscript_3.txt @@ -140,13 +140,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null -kubeProxy: - cpuLimit: 30m - cpuRequest: 30m - featureGates: - AdvancedAuditing: "true" - memoryLimit: 30Mi - memoryRequest: 30Mi kubelet: kubeconfigPath: /etc/kubernetes/config.txt @@ -156,7 +149,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Node -NodeupConfigHash: ApI8of4o1v0oYuFEkLOEvHztTT+rLkxbtFfHyF3NVp8= +NodeupConfigHash: 2B7kjr5B2CTl7AI1X0Rxt5Ob73GpNs90Agcut0TBJL0= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt index f2fa2a5b86..b177a562fe 100644 --- a/pkg/model/tests/data/bootstrapscript_4.txt +++ b/pkg/model/tests/data/bootstrapscript_4.txt @@ -140,13 +140,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null -kubeProxy: - cpuLimit: 30m - cpuRequest: 30m - featureGates: - AdvancedAuditing: "true" - memoryLimit: 30Mi - memoryRequest: 30Mi kubelet: kubeconfigPath: /etc/kubernetes/config.txt @@ -156,7 +149,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Node -NodeupConfigHash: LxsGYCB8Qxowvtmt2Ak2367hT1H5JU7SEkCVY3fD75U= +NodeupConfigHash: lvPACrPx9FVg4gA8D1ajD/HwjIhhguZtjLNvHMvi678= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt index f2fa2a5b86..b177a562fe 100644 --- a/pkg/model/tests/data/bootstrapscript_5.txt +++ b/pkg/model/tests/data/bootstrapscript_5.txt @@ -140,13 +140,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: null -kubeProxy: - cpuLimit: 30m - cpuRequest: 30m - featureGates: - AdvancedAuditing: "true" - memoryLimit: 30Mi - memoryRequest: 30Mi kubelet: kubeconfigPath: /etc/kubernetes/config.txt @@ -156,7 +149,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG InstanceGroupRole: Node -NodeupConfigHash: LxsGYCB8Qxowvtmt2Ak2367hT1H5JU7SEkCVY3fD75U= +NodeupConfigHash: lvPACrPx9FVg4gA8D1ajD/HwjIhhguZtjLNvHMvi678= __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/nodeupconfig_0.txt b/pkg/model/tests/data/nodeupconfig_0.txt index 85d335f2f7..be126ce356 100644 --- a/pkg/model/tests/data/nodeupconfig_0.txt +++ b/pkg/model/tests/data/nodeupconfig_0.txt @@ -15,6 +15,13 @@ Hooks: name: apply-to-all.service - null KeypairIDs: {} +KubeProxy: + cpuLimit: 30m + cpuRequest: 30m + featureGates: + AdvancedAuditing: "true" + memoryLimit: 30Mi + memoryRequest: 30Mi KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt UpdatePolicy: automatic diff --git a/pkg/model/tests/data/nodeupconfig_1.txt b/pkg/model/tests/data/nodeupconfig_1.txt index 4f1732109d..670e0bb803 100644 --- a/pkg/model/tests/data/nodeupconfig_1.txt +++ b/pkg/model/tests/data/nodeupconfig_1.txt @@ -33,6 +33,13 @@ Hooks: - apt-get update image: busybox KeypairIDs: {} +KubeProxy: + cpuLimit: 30m + cpuRequest: 30m + featureGates: + AdvancedAuditing: "true" + memoryLimit: 30Mi + memoryRequest: 30Mi KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt UpdatePolicy: automatic diff --git a/pkg/model/tests/data/nodeupconfig_2.txt b/pkg/model/tests/data/nodeupconfig_2.txt index 4f1732109d..670e0bb803 100644 --- a/pkg/model/tests/data/nodeupconfig_2.txt +++ b/pkg/model/tests/data/nodeupconfig_2.txt @@ -33,6 +33,13 @@ Hooks: - apt-get update image: busybox KeypairIDs: {} +KubeProxy: + cpuLimit: 30m + cpuRequest: 30m + featureGates: + AdvancedAuditing: "true" + memoryLimit: 30Mi + memoryRequest: 30Mi KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt UpdatePolicy: automatic diff --git a/pkg/model/tests/data/nodeupconfig_3.txt b/pkg/model/tests/data/nodeupconfig_3.txt index 52cd91fad5..24749ca466 100644 --- a/pkg/model/tests/data/nodeupconfig_3.txt +++ b/pkg/model/tests/data/nodeupconfig_3.txt @@ -11,6 +11,13 @@ Hooks: name: apply-to-all.service - null KeypairIDs: {} +KubeProxy: + cpuLimit: 30m + cpuRequest: 30m + featureGates: + AdvancedAuditing: "true" + memoryLimit: 30Mi + memoryRequest: 30Mi KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt UpdatePolicy: automatic diff --git a/pkg/model/tests/data/nodeupconfig_4.txt b/pkg/model/tests/data/nodeupconfig_4.txt index cf939b813c..991efb8393 100644 --- a/pkg/model/tests/data/nodeupconfig_4.txt +++ b/pkg/model/tests/data/nodeupconfig_4.txt @@ -29,6 +29,13 @@ Hooks: - apt-get update image: busybox KeypairIDs: {} +KubeProxy: + cpuLimit: 30m + cpuRequest: 30m + featureGates: + AdvancedAuditing: "true" + memoryLimit: 30Mi + memoryRequest: 30Mi KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt UpdatePolicy: automatic diff --git a/pkg/model/tests/data/nodeupconfig_5.txt b/pkg/model/tests/data/nodeupconfig_5.txt index cf939b813c..991efb8393 100644 --- a/pkg/model/tests/data/nodeupconfig_5.txt +++ b/pkg/model/tests/data/nodeupconfig_5.txt @@ -29,6 +29,13 @@ Hooks: - apt-get update image: busybox KeypairIDs: {} +KubeProxy: + cpuLimit: 30m + cpuRequest: 30m + featureGates: + AdvancedAuditing: "true" + memoryLimit: 30Mi + memoryRequest: 30Mi KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt UpdatePolicy: automatic diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data index f9cd00def5..8f5c9bb382 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data @@ -196,11 +196,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.23.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -259,7 +254,7 @@ CloudProvider: aws ConfigBase: memfs://tests/additionalobjects.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: QInbwR5tUN33Q96tgWuDBwj51NWiUfZUIUU0yEFV6Mc= +NodeupConfigHash: zOTqRY3ycviNEJ/CEbZvEmQQi9trWwiRUqH7CO+B3Cs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data index 047233a9d8..44e664dc8b 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data +++ b/tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.23.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -181,7 +176,7 @@ ConfigServer: server: https://kops-controller.internal.additionalobjects.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: sSuHwQvZ6+lX/JnKse3XKRQ9lNJKBqc/G6uTyv29Dtc= +NodeupConfigHash: rSvrNDy/CmQ4zB44KYRN5Y/9CIaTYHsz0T4eu6tPgIQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 75b5f88400..e6d9e258a3 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -245,6 +245,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.23.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content index 56e34c7404..a6e25788f2 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.23.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data index e325588d34..12505cade7 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.22.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -159,7 +154,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver InstanceGroupRole: APIServer -NodeupConfigHash: vYbskPDI3k2nU17RtTF/2uq4sfcxZX3NyHl7wJ4db0Y= +NodeupConfigHash: YCG6VABFo9H8QQVAzHvc/QqaOE82N1VIWmhC0mCyUcY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2d2ead6d36..78fa8671b8 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.22.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -254,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: lnIwb5HEvPCa1OQzHTQKkEi3FUQbivijCQF37W48OxU= +NodeupConfigHash: 02N/lAQYlDYZzxbfRPbKBSkCjScLacP6q2n7oOcRBVQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data index bece267652..638a25addf 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.22.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -181,7 +176,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: fUL6Sh6hpLgZiRi91fxuT57dePgGg2XdySENA7uWC2I= +NodeupConfigHash: PgRYX/n6giex5NiT4evBOAGMsN5GulvPatlrAIw6CMM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content index 72409ce3f1..19cfcb0186 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content @@ -147,6 +147,11 @@ KeypairIDs: etcd-clients-ca: "6979622252718071085282986282" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.22.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 846bdb7704..5ce3bee18d 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -241,6 +241,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.22.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content index 6031cd978d..6068341732 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content @@ -17,6 +17,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.22.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 0eb659a9f6..dfa219ee5b 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: SHXJXEAp+oybG75l+UHgyijWBnJ1kD3p1i7X+U5HAp0= +NodeupConfigHash: 8kWRHXZ3IJDCBzckpZUlA+RUwIOXiJ2coLv/mu1wVws= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data index cad69268fa..9c985c53af 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw= +NodeupConfigHash: 8orZlvUktLEgVBvcuNr1eeVs6yD1VvA4+dOpp3eXQTs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 59d47e402a..8b30dd5326 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content index 484980d1af..456e4b389c 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index 8d566e5f3b..4c0e6e1374 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: UfjoqopF3EX6Cu0bMdNGNOEbL8ALczYtlOUVLBhgxIM= +NodeupConfigHash: Ak5coHcHI8Pp2/KUxysMI+pi3yHnyqoPVw13UWx5HjY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data index 6937e4630d..501eb20635 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data @@ -134,11 +134,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -189,7 +184,7 @@ ConfigServer: server: https://kops-controller.internal.bastionuserdata.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: CMfse0AqP6wp4b8hoAIHoF+04qb3GcknbFIO90ukERM= +NodeupConfigHash: XNrJKgEQSlMk/6+Za6diXuDgzeRq6Y79sOuopJy6uvY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content index 290d6817bf..d2a2b7cdd4 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content @@ -18,6 +18,11 @@ Hooks: - null - null KeypairIDs: {} +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index b79d13dd51..a3e5f3f765 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content index a7778ad0f8..c149cea2e2 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index 6a727709e8..35d7e108be 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data @@ -206,11 +206,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -267,7 +262,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: vLcDsmlRydUGsPtc/90JGOkLQKNkIVIYxpT7xYS8AYI= +NodeupConfigHash: +u0TAInMBsYMa1dXPMfK9WuWufc0Jt2BUToT2G3G7TI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data index 7d47791277..9054f05da4 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data @@ -134,11 +134,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -189,7 +184,7 @@ ConfigServer: server: https://kops-controller.internal.complex.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: JdUAH+JtAreCwUuIEbErmmuGrQbvsBFR1felSaNW9cQ= +NodeupConfigHash: 6wKBMz5/UD9rTc4z9pkly+wYMfAh9c34tY6Vgv7nYGU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8db292594f..973dca4710 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -249,6 +249,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content index b9cb2164a9..a7b24a54a8 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index f5f495b980..7f123e3ae3 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -131,9 +131,9 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/+xWQXPbNhO961dg8k1uESnGjr+Wk4sqpbGaKGWlpO4VAlYUahBgFwAt9dd3FiAl2XGadjrN9JDJTCzuLha7b98+Umgb5MyararLEWMNN7yGtbfIa5hp7hy4knkMMAIj8NB6ZU0fzkzQegReyJkOzgM6ygAdGB9/MdYBOmVNyS6yF9lVTK/Mo67bsIFptVgDdoAUwbW2dxWqTmmoQfY1MMaNNYfGBjcNfleyLdcumls1DVKBERDvHjPKiAY8uMx1IpOw5UH7FJqumdlgfMkKsgW/s6h+59Te0koo2VTf8YObUhkjxjbKyKmUCM6VbJLFfyPGInoV2k5JwJLB3gMargkGwzcaprJRjvqsdKiV6Ut7xxtwLRfwVm1BHISGaH6rGuVX3NSA8ZmqVAKmQlCh0TRPXZzP59z+3mrA2MMahDUyOZfBc69MfSzmBjY7a2+j82eulfy0+52VsALnUQlKG20rcDaggJ+C9Zxa9UImRPv+dt63rszz4vn/I1JFeTmZFPcjf+wAUclhWnmizf8ePfp8xNgWuA8Ir7mHnlyz9WKp6tTu9GZdsidEkSfRtzDvESCBPr1ZfzAItSKKnkWphtdQsuTBQ3b7jcuUzYk3Y94ql6jYFdnzqzhrcmjwFcIWEGGgw/tDOzSxMGn8iyo+XlvnDW/ScF/tz3za1m+hA10yag3htwDO74BLwEg4kJEiKSuva4Sae4sPY1/tPfLr+JOqUvvhyC/jFTTWwzhGjB+ee402tOncwwPR9TD+g6PSG3j8CHlHjDkQAaGy6Et2eXkRLef8XTgXCP9hwrxVmeoBy4RtWgIzgz1vWg1k+CjDDzdv1h9Wi7+RIrctGCXzrsh/vbt1p4y9YC2quG4lKyaT7OqSGJcXsfS0YN9xcQtGlpG4F1GkZtZ4tFoDLqNUHsVKcA+0LbPFfOVOcuU9F7s50P8r2kmhNKwPRlSAysqSFc3E/amQiFQqpU11fnuV6ixOTmJLyT4BoohqHRBmdMfKBtqgo3B+2b0SR/TGTQ/facF0IrWGKDWpmDPbEdP72xMc3BfKGYIE4xXXwxjo6grt/lB+Fs82rBLzo6/5TDttTHrWwVllFLAWO5BBJ5J8WaTd8ep/BnCveuWnX72iJs2YoyK5ZO7gPDTyaF9Z60uW/xWKz9+tzzaxmJx5bPxwGB4z2rbTS3YOm1DXytTX3EhNAjU0Al16bV1zlCVroLF4yHjHlaZzL4vJZKmeGSth6+6Znw5GRX/d9wjw8sXTZxHvj0IH673Yf2XeNIu0zRWnCeQdx1yrTd4PKT8FfLQmrZULs0VO+sWVAVw8Tp6WBwflRfxaa61ccqO24Hx/IXiRnz6s8qb3koK1aD0I/4Z8uv8eOU1i6KbfCALv6HO74KW9M6+RCxh08SLK4iOuGSqvBNeVlY7o4kYNp8xvvhL1K1H/20T9AwAA//8BAAD//4b6ih9sDQAA" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/+xWTXPbNhO+61dg8k5uESnGjt+Wk4sqpbFqy1Ulu+4VAlYUahBgFwBt9dd3FiAl+avTTqeZHjKZicV9Fov9ePYhhbZBTqzZqKocMFZzwytYeYu8gonmzoErmccAAzACd41X1nTuzAStB+CFnOjgPKCjCNCC8fEXYy2gU9aU7CT7kJ3F8Mq8CN2FNYwXsxVgC0geXGt7v0DVKg0VyC4HxrixZlfb4MbBb0u24dpFc6PGQSowAuLdQ0YR0YAHl7lWZBI2PGifXNM1ExuML1lBtuC3FtXvnMqbWwklG+t7vnNjSmPA2FoZOZYSwbmSjbL4b8BY7N4CbaskYMngwQMarqkNhq81jGWtHNW50KFSpkvtitfgGi7gUm1A7ISGaL5UtfJLbirA+ExZKgFjISjRaJqmKo7nc2y/thow1rACYY1M4Dx47pWp9sncwnpr7V0Ef+ZaydfhKythCc6jEhQ22pbgbEABPwXrOZXqhUwd7erbet+4Ms+L9/+PnSrK09GoeOz5YwuISvbTyhNt/vfi0fcDxjbAfUD4zD105JqsZnNVpXLHt6uSvSGKvInYzFwjQGr6+HZ1YxAqRRQ98lI1r6BkCcFddveNy5TNiTdD3iiXqNgW2fuzOGsCNPgFwgYQoafD9a7pi5iZNP7ZIj6eW+cNr9NwPz0cYdpWl9CCLhmVhvBbAOe3wCVgJBzISJEUlVcVQsW9xae+nx488vP4k7JSD/2RX4ZLqK2HYfQYPj33GW1o0rmnByL01P/GUeo1vHyE0AFjDkRAWFj0JTs9PYmWY/7OnAvU/37CvFGZ6hqWCVs31MwMHnjdaCDDswg/3F6sbpazvxEitw0YJfO2yH+9v3OHiJ1gzRZx3UpWjEbZ2SkxLi9i6mnBvuPiDowsI3FPokhNrPFotQacR6nci5XgHmhbJrPp0h3kynsutlOg/5e0k0JpWO2MWAAqK0tW1CP3p0IiUqoUNuX57VnKsziAxJaSvdJEEdU6IEzojqUNtEF74fyyeyX23RvWXfsOC6YTqTVEqUnJHNn2PX28PcHBY6GcIEgwXnHdj4GuXoktyKDTvL5s0W5/9T+rtROg8vW3oKhofaeoSLmY2zkPtdzbl9b6kuV/hW3Tq9XRUhSjI8TGd3j/mBHxD++7KaxDVSlTnXMjNWlFXwi06Q1yzlGWrIba4i7jLVeazn0sRqO5emeshI17ZH7bGxX9dd8jwMcPb9/Ffj9z7a2PfP+VedMs0mItOE0gbznmWq3zbkj5weEZYxsrZ2aDnKSEKwM4e5k8DQ8OypP44dRYOedGbcD57kLwIj984+R1h5KYNGg9CH9BmO4+DQ6T6KvpNoKat8fcNnhp781n5AJ6iTqJCvUCNEHlleB6YaUjurhBzSnyxVeifiXqf5uofwAAAP//AQAA//+LPOjh9wwAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/1SOP0/DMBBH93yK7Cg1bGCJpUFQBqJChfizHfY1rXTnc+/sEL49qjpl/en3nl5PUuNWZTpGVN/CrzW9pP1xXIOhbxl5b965QNUKqq1wBs6EqyDsgnBWtMXYPCcrkAI+qdQ8AJ8lcGa7al1BK90NLE9vQujbXlJRoS1BwmaQiDVfQjZgB9++DK9ymj/i9Yl+Ml+N7nY3TO93OrppoySP/LebD+tvePj8um/+AQAA//8BAAD//4MMNevVAAAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/1SO3UrEMBBG7/MUeYFuFUTYgDdb1x/QZZFWwbshmWp1JhMyiZU+vRSvevvxncPpSGo4Z/mZAmZnYVbTSRynjwMoOsvIo7q29VS1YNYd/gInwp0Xbr1wyqib0TxGLRA93mep6QS8SmBlm6pNQS3NJWxPL0LobCexZKEzQURzkoA1/Yc8gH46mxmejvt9oKueb4dDP6QxfOv1ssBbovdX+JpDveMjPvPFjfkDAAD//wEAAP//4rgBBdUAAAA=" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data index cabedd7c9c..8670df62ab 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data @@ -131,9 +131,9 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/2xSwW7bMAy95yuIAr11st1uwSb0UjhYG2wdjGbDzoxFq0JlMaMkr/n7QW7TrFtPhvke9cj32HvOpuUwOKsXACMGtLRJLGip9RgjRQ1JMi0e8pY64cd94fU+x0TSrld3Gpq6Vp+WqlZ11TQF3OU7+pUpphkbFwBuREsahKyLSfbq4WNUjqvy5rvd/OjUqPOlqhcAnu1XmshrOJ9FPaUiiYHDfuQcr3K61zCgj1TErHDercRNJBriPiYazUv9jjlpqOaJOZtOeHKmEOkxkQT0x11W3zZPqyzfq1o19V8Ij+iCPvwqz/3cSAG3nla0zda6YG8wGE9y8AuAJtcnx+EGxWgYaWTZK5zQ+dJ32dT1rTsLbGiIr8qnh6Ir3/hZiC4/nJ7NHv5HPVRfcRcAA2HKQteYKBb7ANrN+tZZwTLS1c+NhpMy58mMrcN3Iep8tq5gP8JTUsWpF1bJop8vpcOSQDWhVN5tq+eQqiPhnxQBdmzWYRBsOSR0gWT99kHsMEfSF2r51HOLwQ0U07MgpX4WkUCJYjU+o7GQhRP16UvB/IoGzD4dkzhss+nvyeTZvBcs3udk+He4FuypI3FsNFzU8W2oFZdcj75jE8u5xMUfAAAA//8BAAD//3/lMtFCAwAA" | base64 -d | gzip -d > conf/cluster_spec.yaml +echo "H4sIAAAAAAAA/2yST2/bMAzF7/4URIHeCttZt2IQeikSrA22DMGyYWfGohWishhQkrd8+0Fu3D9YT4b4e8R70nPnJdulhJ6dqQAGDOhol0TR0dJjjBQNJM1UPeY9eUpFhUHCaZAc73I6GOjRR6oAOqeSjyvlkdRAPMVEg32e/xBJBppyLp5blZFtEdLfRBrQTyTHRLr6vjOwaNv65mPd1ov2FZEBOZj5WHvppkUKuPe0on12joN7wGA96RwdgEbuEkt4QLUGBhpETzWOyL7s3S7adsNXQSz18c34ch5y+cYvSnT76fKKB3T/S+fpG20F0BOmrHSPiWJ5PoDlbr1hp1gi3f3eGbgoOS8mtg4/lWjrs+PCfgUlx+Wyr1Sli24qbYulgWZEbTzvm3NJzYugAvDivtFI3sCHCuAodh16xaWEhBxI1yW2gScbPdWPn2PN0hwxRzLX9c3TzgYD9xTT2ZBSN5looESxGc40FrFKoi59LcyvqMfs00sT82123YFsnh7vmcVDTlb+hHvFjrakLNbAdRvfR0vlxB36rdhYfpdY/QMAAP//AQAA//+ifSCJzQIAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/6yUS4+qSBTH934K9uZeERXBpBeHp4XNSxCa3iEWCPIoHlpq5sNPpCe5mczNZDLpWtTi/8/5LU5+OXLZXE9O19zyE+42TEz7idzUaZ55uLvhbjNhGBlk3A15mifxgPsN88eEYRjmx+tJqo4sRlb3PtKQDL46pmNvIiQdC1mGfZ4BRRJkyNQIWK2kCJanCBwcPBNYXfZa3UPHheKqkkwPYErZXSvgMEKkzAokMH0lHOZRFTyOVcB+fphDxKl0e04ss1Cp9YSFqSTUVoCGr+z5KxshY1FAZO4jqkGkBK6rqHTenUKjTKpVedKD53tonU2NUsWNjF3zic63xAJXlSQXlBHiUaAeGBJYGlo8O9a/CJeuD4UbLVKTPA27DF2Bn/M3fRE5MddChtbBstnRNGAfKJuPkGKYbvl06czoxQHHd/x0T0T0EJqtqmqUlYGqALElmypQJYuUYM864G5nErgKZKr+tVgQdJgfTipVpRl1NRNMCVKBbt1xwJakSNUsffEMCj95Lw2q9MZythOVYL1rzgf4C/LPzQOrgiSc2EUacXQd7khqc2KLOHFFrpy8TGIR8kC3SeYlwggZKrdv+S65Dwt/2h1XgugEw5Ot6CzZ+Xf7wmdbTpbl6WObPjj69vbLG9VSfm/N/7XqVnkxa0MZVR+777XKN7nfW/Uqvs0qU+O1Zfx5IpjdH8jjcYklEtJPuabHND1Huk2nac/vT+/XQ7t2ZasyqpnarkdIGNrP3IyUHIneMSmJMuXd3GCthdoSEhy+0ap3VBEe9oWjwJavz2jaJ2EwLFzxWP+rVYEb3FfmYbgCwti5OmKzmt8H4nMer93SXDCWSL7X5ZeaorQ+KNy1PyeB5gwxbt5FPb0KcbTcGRJu22zVFOWyrfa1fy7+i1X91yVjzsNA+s1sdmlI/yNp6qFryhJ3P/N6wF0dlz+TpiId7vuf+B5XpMSvYLMQBWE2QXU/xHWC9a65Eiuu8IapmxPu/17smxJvGKs54cnru5KvU7qN+/OGYc3ysXq4pR3r9pYahVNe1ke+qoIkQI724d4Ly09n16Fa9m+TPwEAAP//AQAA///e5MYTlwUAAA==" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/6yUTY+qSBSG9/4K9ua2iIpg0otD8WFhgyAIl94hFAjyDVpq5sdPpCe5mczNZDLpWtTifXOexcmTg4r6Gltdfcti0m2YkPYTVFdJljqku5FuM2EYBIh0Q5ZkUTiQfsP8MWEYhvnxepKiYZNBysHFKkbgKmM69gbG0ilHCA5ZChRLkGJDbcBsJVkwHVng4OgYwGrIaTUHnxayrUiIHsGQ0ruaw3GESKnpSWC4sj/Mg9J7nEqP/fxpDAGn0O05Mo1coeYTFoYc0b0M1H9lz1/ZCBmLHALjEFAVAtmzbVmh8y729SIqV0Wsec8P3zwbKqWyHei7+hOfb5EJtiJJNsgjxKFAHdAlMFW8eHasexEuXe8LN5onRvPU94VvC/ycv2mLwAq5FlK89pb1jiYe+8DpfITkw3TLJ0trRi8WWK7lJodGxA+h3iqKSlkEVAEITWQoQOU0kL0Da4G9nUlgy5Aq2tdiQdBgfowVqkgzaqsGGBIkAt3a48BekgJFNbXF08vd6KPQqdzry9lOlL31rj4f4S/IPzcPrAKSELOLJODo2t81yZ4TW8yJq+bKoWUUipB52r5JnUgYIUNp9y3fRfdh4U6700oQLW94siWdRTv3vr/w6ZZDCE0f2+TB0ff3X94opvx7a/6vVbfSCdk9FEH5c/e9VrkG93urXsW3WWWovLoMP+OGsIdj83hcQqnx6Seq6ClJzoG2p9Ok5w/xx/XYrm1klno5U9r1CPH9/TMzAjnDonOKikae8nams+ZCaZvGO36jVR+4bHg45JYMW74642kf+d6wsMVT9a9WebZ3XxnH4QqYEOtqifVqfh8al3N49ZZkgr7E6F4VX2qK0vooc9f+HHmqNYSk/hC15CqEwXKnS6Rt01WdF8u2PFTuOf8vVvVfl4w5D0PTb2azS930P6K6Grq6KEj3llUD6aqweIvqsulI37+Re1g2BXkFm4UoCLMJrvohrCKidfW1McOSbJiqjkn/9+JQF2TDmHVMJq/v2nyd0m3YnzdMbZpqEiMdo8t+Oc21p3e6C6cLuQkYbXGRPx7B/ZEGaRjS98mfAAAA//8BAAD//2Jcmb+XBQAA" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 319f1d5f7f..c347c9f199 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content index 8eec1cb0b6..94b10f9016 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index b35e90482e..e53fd8365e 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: sRhLO8JVcuxWTPQncOKxAEP7nM32LKxwPRbYLIX7/so= +NodeupConfigHash: kVAU4YS67KeoP2B3KGGiK/sZLFRqwHPR/K1mXpJNS3c= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data index 4968d794f3..f86ada84a1 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: QsSdFMWwMNJz7QrrzNEWZpxLQTbDi8eZiIZcPwAidvg= +NodeupConfigHash: wEf9fiLnaII9smDXRfdhuKoN2ULU5qNnB2mkCz5f+1A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 62fe7a064b..2b2b4590b9 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content index f3f7f6b982..49bf356545 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data index 9aac19dab4..6dc41ee18e 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: eYIJsocPFvc0HSLt4CRNQ3+vRKdbu3s4bqCoroAwUGU= +NodeupConfigHash: ly0/fKrApEXAkzY/Q/BbGC7SfJm+LYS0Q8wKBT5+naM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data index 81565c4ef4..5bfe95946d 100644 --- a/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data +++ b/tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.containerd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: yu9vudyJYyvpwp4EeIwu5MEoU42KYkPNOI1H0uksvS4= +NodeupConfigHash: Npb42ZSd/MHV8FUzIxmUAs381QlgrgfRbT2pcRtOlZk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 01fb907638..d67f15c189 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content index 82980f1a52..51550ad7c5 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data index f489e13abc..af925cfb80 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/123.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: d1Who+57JCzsCm8hGMFJhbvSzkCaMO7rf7trfhjON3I= +NodeupConfigHash: J4nTjLSZEJBXugYtDB81/dZTyPX8b2KAgawBHd1dLGA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data index 4018169e18..af71b321f7 100644 --- a/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data +++ b/tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.123.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 4aUxVBjTuovp1BN6J0sek08k+JWcgbs9zT/XM7eKR2o= +NodeupConfigHash: k39juydPsGJNcgomZxOwrlbNTE8tacZmauutXoFzRkg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index bed3348a39..1279ef70aa 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content index 90c30845de..eac1c6bccc 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data index 3ce1779e20..dc8cde55bf 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data +++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data @@ -192,11 +192,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.23.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -255,7 +250,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 9IlH0T1gXHuFA1mhGkCcTNYkXjoPd94rBfmOzizVOjI= +NodeupConfigHash: tOwLUTtknWs7qZRL/NRsGYMDDh60sMK4bnCRtTA9eFw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data index 03ff571911..49c6827acb 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data +++ b/tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.23.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -181,7 +176,7 @@ ConfigServer: server: https://kops-controller.internal.docker.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: h8rTwvxpl/fAtFBdygR5JGWg2EsMR1alWnfjQ8QK9Bg= +NodeupConfigHash: Fo0vqTQ5HXUVTWdZZNAaKi2IryH1OmDiueBp2LIZ0Ek= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a9113ed2e9..5400dab235 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -241,6 +241,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.23.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content index 957e7c10e2..0054c6680f 100644 --- a/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content @@ -17,6 +17,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.23.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index 7c007b9814..f2b6d51ac8 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: PG6aa0CkyLApMK+lx+30wFquds9I/2AJXLcc+gwzYVE= +NodeupConfigHash: +PpfO/TOX3R47FAIE3VbHXIoFovVgZ3GBu4AfUoTjGE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index 7485a87686..3d384cb129 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: s3Be7w2Ej2f5mQqzXCHfUAUvuntLqMictAEbO1XKN58= +NodeupConfigHash: gC9pi4xdl8LLToPGi12TyeXxhopn4Mr01HO6NqkrMns= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index c6644ab1ee..a50cd3c936 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: 9wwCKVaf2vilWRhL25z4U2mpd/NlhIR4b83ax0ox2xM= +NodeupConfigHash: K2oYQEIC/5U029JU5o6yKrBw7IqRjaJQhW2vMH2vwMQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data index d4c7c9174b..9360f110b6 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.existing-iam.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: QKSqEBio/946HPwiGTA8a5QVke01J0zz/mV7qY+7kJU= +NodeupConfigHash: ohCIVtugnnxcefaaF45rSwHBMCaWyNzwQ5B2byn4NRg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8efdeef7cc..5d07a32144 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index a7d8576d11..6ace040ea3 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 7cac26c821..ba9e36f2b3 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content index d61d53c475..c9baf2e84b 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index 9ff7700f3d..3dc2022807 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: uzBTMWX/FZfuruK4fIBd2mBJkmAaCcpbWtJ77rNHOeE= +NodeupConfigHash: Y4K/80DwmRR0EikE/d3dPnvoOrtjdMVJWYX546qdVWA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index 7372a2f4a3..cc00af7d2b 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: g4kqXBT89ndNkr6KjZyU/PHdqDfHBpvMbDjw2m2wD8k= +NodeupConfigHash: Xx4qqKSzF5eiSKqhMK5bS5WOEYs1aUEXdgNOgrDwW3g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index 2ad1799ee5..07bf6b0184 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: HqoUDuwMtzL//jBswcKAJqHrmnaYEf13m8MJXjiLHu8= +NodeupConfigHash: 634y+1AdTey4FaLGSxBozaP3cWzoig4iX/fODJFDuUI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data index a9170477ab..1dda73328e 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.existingsg.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: yFHft0TxL4xU6wCsERBXrQWDOIyplVuf8kirajQHk7Y= +NodeupConfigHash: 8FK4E5hVKuIPgEJ1qq9p19lhSlhZVCa5Muf/pZYlBzw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 26517d507a..0604af9ad3 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index ac1d608704..ba5cad5195 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 544075b374..5ae09488c2 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content index 2cc45eac8a..ec3b0e0697 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index b064129596..b79cef63fa 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oeI3b60MD0lkkS8VGS5XE1/p470uGoAX46e7Ajfi1A8= +NodeupConfigHash: Jv47o0qq9/GiPXVTMZjRBuUQ7I+scTjNGD7DSFT1oQM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data index cad69268fa..9c985c53af 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw= +NodeupConfigHash: 8orZlvUktLEgVBvcuNr1eeVs6yD1VvA4+dOpp3eXQTs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 6447dafa93..1d543dcc56 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content index 484980d1af..456e4b389c 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 0eb659a9f6..dfa219ee5b 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: SHXJXEAp+oybG75l+UHgyijWBnJ1kD3p1i7X+U5HAp0= +NodeupConfigHash: 8kWRHXZ3IJDCBzckpZUlA+RUwIOXiJ2coLv/mu1wVws= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index cad69268fa..9c985c53af 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw= +NodeupConfigHash: 8orZlvUktLEgVBvcuNr1eeVs6yD1VvA4+dOpp3eXQTs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 59d47e402a..8b30dd5326 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content index 484980d1af..456e4b389c 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index 25fee2c23f..92b7474d80 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: DQ7shOZn6Ke3Khu7+ty1Spy9mZ5IiCRhLI54uLHgW/I= +NodeupConfigHash: iTj5zPhCNJttPz4Oqn947n3+nlOuXhgyCMx0R0EHJ9M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data index 3dc99bdbbd..e3f8797cdf 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.externallb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: WNvnoyq6BNhIYmpRID+rjKv3XvT8zMziP8hy6oSZMgE= +NodeupConfigHash: Cl/tdNSq3nCtScooMU524MiYmgzI/raWmzQhh6/VxrA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 1adfe19d0e..6427eaad59 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content index db3b6b2630..6bc7ec9b84 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index b30870fc51..90766460f3 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -193,11 +193,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -254,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: DRtvNhEVKaVOmf3+IwATDPGqdkmL4hseqscrrtWmJxM= +NodeupConfigHash: 8n432Ez6BsSchCB9tbv/DsxuOTzS8QJUW39Dcbe63IA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data index dda843f54e..aad50da4d9 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.externalpolicies.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 3kDdkKlwduDczih78K1Z2d1WiGQEqs9uUvjM2jbXZaI= +NodeupConfigHash: EgZ1NRxNiugZHcgNf/cXOQtIIYbCFgsPyBD8dLDABkM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2caefe5738..a7ee6512b1 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -245,6 +245,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content index f36d239c6d..50758dea1c 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index 7b3aef550f..d0aa52de19 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: OUyYhVig24bI0gZEg4YKv00ZoZDy6iEpP/rPp3y/zRI= +NodeupConfigHash: PJsqG2+iErTUAAfXHbnv4Gl5tCZKH8dsMhmsn8DwRFI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index 14916bccfe..7ebe2b3b2a 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: ioaAcHZ5VhUSXYXVUeK2G3nTeBmkaMjVG2wFq1O6S+0= +NodeupConfigHash: R9BVpcgiSIXU2JwyqB+eSM5EPoC8xA2RO9FlmBEoDX8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index b6fa109b7c..203d4a3673 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: 6t6ABSvjzPwR9UZFYff/pQwDI3ESTs0TLWQoNmq78oI= +NodeupConfigHash: bbKPPn/QdVweG5EAQSXFrqj/DXezsPyxpZqkhsWtzUI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data index 0b6cd16726..d5e311c9f3 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.ha.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: InDqbg/HawE1hABHD21fJWJmVQE+Bih7SkpKzuSACHM= +NodeupConfigHash: CkOWnZdRNIbjN4JFcDDQwpLQHpAb4W5M6aJFUJ6wrMw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 64533baf55..3971fad2af 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index 79d7cb9330..9274e54c12 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 0be8eed46b..183d8143a3 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content index bb2173a0d6..44db581d52 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index f93ebcdfa1..bdd43925c8 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -242,6 +242,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content index a4eabf1e74..02e65676a5 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content @@ -242,6 +242,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content index 945175ff66..51d983344f 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content @@ -242,6 +242,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content index ae635b8957..012b5e716a 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -21,6 +21,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script index bd4f998cb8..0a8a295c59 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script @@ -188,11 +188,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -242,7 +237,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: 4MfAaUpjwAa1xo16C4gu+JMAyqxaQaE4hONdvruCEJg= +NodeupConfigHash: CYBU+41kT9ejHTRSAncjYUc+StoMIbg2CtHq84Qxds4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script index 5b5ca92a5b..af2e23e9d9 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script @@ -188,11 +188,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -242,7 +237,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b InstanceGroupRole: ControlPlane -NodeupConfigHash: eFse+PYK9BfMDxULf/go5dNiPyD0mfeTdX/qXunS+/c= +NodeupConfigHash: Dtk2s8o5HYDJouzlKYOaSCWLEMOTXg12PjYBy8lBCHo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script index 963032d29d..2615cb939d 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script @@ -188,11 +188,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -242,7 +237,7 @@ CloudProvider: gce ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c InstanceGroupRole: ControlPlane -NodeupConfigHash: NmlJ7IZ7KjySk4xxKrnSo8es/b0u66GSFW6lOpRvML0= +NodeupConfigHash: UP6DzOKzf1+bmK+HOdyke61j8jWO/P33TToFvPQqVyc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script index aa0a48965f..4d960f6d5a 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script @@ -124,11 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -177,7 +172,7 @@ ConfigServer: server: https://kops-controller.internal.ha-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: NhoqhTmtulzl0svyvFgR9SSmTihR6rEFk+7sdtbSwrk= +NodeupConfigHash: oVWNZ2TZqSsXiUZsCDQYwMo0tGX0nfcheZqr/HLrOfY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 0eb659a9f6..dfa219ee5b 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: SHXJXEAp+oybG75l+UHgyijWBnJ1kD3p1i7X+U5HAp0= +NodeupConfigHash: 8kWRHXZ3IJDCBzckpZUlA+RUwIOXiJ2coLv/mu1wVws= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index cad69268fa..9c985c53af 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw= +NodeupConfigHash: 8orZlvUktLEgVBvcuNr1eeVs6yD1VvA4+dOpp3eXQTs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 59d47e402a..8b30dd5326 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content index 484980d1af..456e4b389c 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data index 8b82fa14f8..4db0b1deba 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-default InstanceGroupRole: Node -NodeupConfigHash: a5lplCYwI/+kEIV+Sh2XG0jyrdfMeHWZpeuj5vt8d3A= +NodeupConfigHash: fqCBKSwCJ6TFHlSEjnuPULti2gq2MciIOyqBTPzGLxw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data index 8c82b1ba21..a860fc03fc 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: karpenter-nodes-single-machinetype InstanceGroupRole: Node -NodeupConfigHash: aQ7mlBX/Hckb9RLsPOgvADJHFm7kX3miel3vaMTCNdc= +NodeupConfigHash: gOKqLfWsJkNQa8aEH0MtQ+b6g+JB4buMRkb2vfcVcf0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index c19003dc6f..8f3a9319c9 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: z85ay7BxyfY+RUJOvRfljA5UDkfCfT7RYgNb54Qd2+M= +NodeupConfigHash: gnKC05/II9xUY8rNAF19WWyQAzZHHbuOi+gUQgEmqDI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data index f5ab8fce37..ea29ee077b 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 7/wXbbw78MHoaRuTYR5wsYUR0tznXSsmfMSuigs5MpQ= +NodeupConfigHash: +Uh3y7UwaxIOH97Ej8OfVs+Bu4xPTP/kEJMGk3LjlFc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content index dd6b59b274..391fb3c923 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content index 2a272fc840..327d89a830 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index dea7af984f..7130bcef89 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content index f7615faac0..25d26460b2 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 7fd5a7eada..a7ece6bc34 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -192,10 +192,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: z3bqc2OexoWNf+1ykZFghpANtAT35lILY/L1zChBTjk= +NodeupConfigHash: f7f0LXnTAS60VKPHA33XDTlBs6mUQtFmYaEUpVZSTT0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 754530335a..b79af98b47 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: tYhLoG7Z4LtM9i6DVA42Kzmp4Eb18GpVcieX10jexEw= +NodeupConfigHash: PLBvoCT7qbXIL6uXJ9hiJoB2qHp9fTi40LKazEFjkRk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 084315c4d8..0c3d00d512 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -245,6 +245,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content index 11e22d284f..3055f1efc4 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 05fd48254a..a9e3967428 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -192,10 +192,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.23.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -254,7 +250,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 3zmMDpFbeEssF5gsAXiFvwGmUKXWjRBAJGPIjsT51GY= +NodeupConfigHash: MWTxhMiGzjaZMUk9hnsQRhO1VMJT9BB/KKS9rpNQ7BI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data index b0439b38f5..45f6030ed8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.23.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +176,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: iLz0IIRK1WsbJtFDAgQvPS8mWUfBYpzFRBXHgIzDGVU= +NodeupConfigHash: +pj5ZFsyFDgIhb0L8FGM8eBtpwapDAsi3xVFq6e+NfE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a0d78f9e82..e3b67ea7d7 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -245,6 +245,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.23.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content index 23f6c9b70c..04ffc9fa4c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.23.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 93f18db691..d71e450a1c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -192,10 +192,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ubjGncf6lksEMQGSJd2kzX6lSuxvECTojeUSiyJtHZM= +NodeupConfigHash: fPWLqni1J1afFX0lV2RnBBxkZeWHTuiIoUt7RQNu0sA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data index a3b6651eb4..7e482a7e23 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 3wu6jeD0LlRQVa9ZJTiAqjUGWzSuGKPlYdk+uPduDHE= +NodeupConfigHash: whKgyMQcdcPAMAV+vfOoLKeqaX7goM5eR94ZGI70eCw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e309fa18ad..13535ca1ea 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -245,6 +245,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content index d6cc5a6799..2ed0b623e3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 8f93186ddb..954260595c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -192,10 +192,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: KJY+EjaeXQwTNPbWrMrLRh5XvW3wuJqkpQpvN6hyVdM= +NodeupConfigHash: iBDAuUQoKxtgRtWTyO0wGIz50iqrHZH20FU/TpDd5fA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data index 506333b9ad..2c1c6410f3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Qm7ebGuff03LQ13x8bCFxX9Gpk6KonncEFhlc5E7Ytg= +NodeupConfigHash: xOPUWfQUkgUxlZc8NV3wrDhLHVqI908/2Oa0NRlE1kU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 88b440ab20..7fbd003ff3 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -245,6 +245,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content index 34b8bea2d8..7283894ec6 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index dd8fd06ff0..aad6d1c85c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -192,10 +192,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: R7UzqRzhd9DswQU+LIySUTfTrZc6z7nSeE/rW7dtyCA= +NodeupConfigHash: jqPe2xG2G6eZRZM+6h0t/zzO7eSFBcbGYVDXBbXu9/Y= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data index 05be92087f..8451276cb9 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: fKWDlDbyxpNYmVNEBBXeq4rb3jo8/V3/XVj1QBT8p1M= +NodeupConfigHash: YAYJDmhVGqWMMjUjoRGoloxadMERCblAmGlLD1WmVI4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 4f373e27b1..a32194dbc2 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -245,6 +245,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content index 2692b50aae..c1811584d1 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5e1bfd56e7..4fc85e4886 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -192,10 +192,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: WAthfRbjhPxulBAdu7A54Go5C/4BR72ZXA+TGZh3y4w= +NodeupConfigHash: wyP1X1jV1P8KutrGP9xC5fNC3bZpdrOQdlcRtK3dXCU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data index 754530335a..b79af98b47 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: tYhLoG7Z4LtM9i6DVA42Kzmp4Eb18GpVcieX10jexEw= +NodeupConfigHash: PLBvoCT7qbXIL6uXJ9hiJoB2qHp9fTi40LKazEFjkRk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 61c5235071..d7a47c39cd 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -245,6 +245,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content index 11e22d284f..3055f1efc4 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 6b28bd7a81..0c1d7d8256 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content index e2530ba512..40e6dd6dc4 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -21,6 +21,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script index 8ba5a75cf5..f68013712f 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_startup-script @@ -189,11 +189,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -243,7 +238,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: 8CQDlk4SOOt8KApUaJsnwXYsE9zTXYmfP6gZ0J0c6GY= +NodeupConfigHash: 9Koeyq9GalCNNNcGcHoORGHwrSiN4xsgzQVR54x2yeo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script index 063e60bfe2..a64a087767 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_startup-script @@ -124,11 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -177,7 +172,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: OzDLeT9z6hsthP23oMlNDSupV9TUcYDHkZg7Js8yLKI= +NodeupConfigHash: 897DPhVkZnjaKlvRoveASEzyUj8jInXQ/+8+AF1a/J8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5e1bfd56e7..4fc85e4886 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -192,10 +192,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: WAthfRbjhPxulBAdu7A54Go5C/4BR72ZXA+TGZh3y4w= +NodeupConfigHash: wyP1X1jV1P8KutrGP9xC5fNC3bZpdrOQdlcRtK3dXCU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data index 754530335a..b79af98b47 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/many-addons/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: tYhLoG7Z4LtM9i6DVA42Kzmp4Eb18GpVcieX10jexEw= +NodeupConfigHash: PLBvoCT7qbXIL6uXJ9hiJoB2qHp9fTi40LKazEFjkRk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 61c5235071..d7a47c39cd 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -245,6 +245,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content index 11e22d284f..3055f1efc4 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index e1a3be4208..9e9b5d5e9b 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -196,11 +196,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.23.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -259,7 +254,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: PX2fIwxWU1RhurUbQ+ivWl+yLi/bXrq+5x7uKAzL6Pg= +NodeupConfigHash: nT11FRoptTJSah2ATcFbjXVtlbtINwOZ/bHdJjUytVY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data index f4f1decf0c..233eb919d1 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.23.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -181,7 +176,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: wTc9w/H+tFg6mjxZ4BDlvxJkNasxZMEVdHvj5Vk5ITA= +NodeupConfigHash: uobBCGKxTAotJ2OVLQVQLRLEjdeK3ItWPUTyIql4npQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a993e68e02..5068a58e25 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.23.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content index 728adaa7b4..4ab448e986 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.23.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index e860ea519d..d6987efe27 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -195,11 +195,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.3 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -256,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: EIUZ6fGwIEVGVjPeSUuTJa/ZxqY5FfVOVrVxfX6ONKs= +NodeupConfigHash: m+R51XXjvqBo43GnXUtwrM/myM3SQMYlEhPkCdgUMD8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data index 0c60836b36..f10a8680a7 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.3 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: VxsID3pRQDiMmTnKLBC9dkSWWz24gW/KgB3Ycc9vCeI= +NodeupConfigHash: Lrow1B3uhFlCseP0rTNllF39M9wyvAtZmTcAwol2jSI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index fecc50afbf..a36cd01ac2 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.3 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content index 2b86fa22f9..82978b40c0 100644 --- a/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.24/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.3 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 5fa78478f5..9f56d0ca47 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -195,11 +195,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -256,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: dACS3iESB6aNKFwWbI/y/xLhwomA8l7FRURBy19c8FM= +NodeupConfigHash: j/wLOUkDYsJECt44hJjb1bm4mEkmQRsgW+6287YiLBw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data index ac2054e004..b61e1e55f1 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: A65q3dUOCELuICMvevptrYzjMt7lCEb7a3MYuqUo+/I= +NodeupConfigHash: SjRVc6vXB8ztTZ0ndSYzCjrZj2g/6tYaGA57uxKBhuU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c86656c935..4be8e7cc06 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content index 75660fa35d..cb28df9701 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0-rc.1 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 109302431f..36d5cc9f20 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -195,11 +195,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -256,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: FUvvfbzAzJiA7/MxmRYaK7sH2Hud2HVVG7kInydhK+k= +NodeupConfigHash: tpch0DqcAKhYVBwqgy/YHo1MqpXZrLxk8H37lq23aag= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data index 2be0c44600..35ae20cf3c 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 01TMx2440WkyAh/QhVYEy39MTLTpotnTngaeBJkdQvg= +NodeupConfigHash: j1XttURt7mRn7VkhBUQyUd7e9xM6GiE4O0/scoSg0UA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c9095089c5..affae92068 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content index 2eee3f8e16..38e7f90533 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 109302431f..36d5cc9f20 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -195,11 +195,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -256,7 +251,7 @@ CloudProvider: aws ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: FUvvfbzAzJiA7/MxmRYaK7sH2Hud2HVVG7kInydhK+k= +NodeupConfigHash: tpch0DqcAKhYVBwqgy/YHo1MqpXZrLxk8H37lq23aag= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data index 2a26b7ebbe..be9bd4aacf 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 01TMx2440WkyAh/QhVYEy39MTLTpotnTngaeBJkdQvg= +NodeupConfigHash: j1XttURt7mRn7VkhBUQyUd7e9xM6GiE4O0/scoSg0UA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c9095089c5..affae92068 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content index 2eee3f8e16..38e7f90533 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0-alpha.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data index fee83099f6..45887c0eb8 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_master-us-test-1a.masters.minimal-etcd.example.com_user_data @@ -207,11 +207,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -268,7 +263,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Hi4qqpt8bz83vMP7tCHEgC8h+atZ8nus4jd+k3xFrRU= +NodeupConfigHash: PpbZh2lCsWE9RXcHL9ilDYno/Tm57XOeo69/ReUwAYA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data index c0101028e8..e9e25b566a 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_launch_template_nodes.minimal-etcd.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-etcd.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 7atWxJBo0Ge4gVF4Xia6KbDvl0x4l8+Kjo0sib99seg= +NodeupConfigHash: A5wbwrwRy2W0+aztKZCy1TiHbSP3mMNFTTkLTVL6CLM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 65d9606a13..a282489d32 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content index e6be8bacef..2f03e8f3cb 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 23f286ef2f..9db942db97 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -197,11 +197,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -258,7 +253,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oeI3b60MD0lkkS8VGS5XE1/p470uGoAX46e7Ajfi1A8= +NodeupConfigHash: Jv47o0qq9/GiPXVTMZjRBuUQ7I+scTjNGD7DSFT1oQM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data index cad69268fa..9c985c53af 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw= +NodeupConfigHash: 8orZlvUktLEgVBvcuNr1eeVs6yD1VvA4+dOpp3eXQTs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 6447dafa93..1d543dcc56 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content index 484980d1af..456e4b389c 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 74e05a42a5..6812788ae4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -193,10 +193,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -253,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Cay42r0urBotryGdHDE2xE4vZ0qZrnpLTeovN7kqjvc= +NodeupConfigHash: wp7JG7ibSbqae1/V65DxG+x5FbAIN4PUL4nGD6ZINLc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2377dc179a..6cea8c9d9c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PvMouc0PwBGCEXBaklQva471IR4abu3iQrxi76ptJT8= +NodeupConfigHash: FN9UQ2dQ9d55H6kh0B9sdQm7daPXYMamNzAnTu5kz4s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8270469150..6def9908c2 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content index a9ab87ed37..1d791638c4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 74e05a42a5..6812788ae4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -193,10 +193,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -253,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Cay42r0urBotryGdHDE2xE4vZ0qZrnpLTeovN7kqjvc= +NodeupConfigHash: wp7JG7ibSbqae1/V65DxG+x5FbAIN4PUL4nGD6ZINLc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2377dc179a..6cea8c9d9c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PvMouc0PwBGCEXBaklQva471IR4abu3iQrxi76ptJT8= +NodeupConfigHash: FN9UQ2dQ9d55H6kh0B9sdQm7daPXYMamNzAnTu5kz4s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8270469150..6def9908c2 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content index a9ab87ed37..1d791638c4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 74e05a42a5..6812788ae4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -193,10 +193,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -253,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Cay42r0urBotryGdHDE2xE4vZ0qZrnpLTeovN7kqjvc= +NodeupConfigHash: wp7JG7ibSbqae1/V65DxG+x5FbAIN4PUL4nGD6ZINLc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2377dc179a..6cea8c9d9c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PvMouc0PwBGCEXBaklQva471IR4abu3iQrxi76ptJT8= +NodeupConfigHash: FN9UQ2dQ9d55H6kh0B9sdQm7daPXYMamNzAnTu5kz4s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8270469150..6def9908c2 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content index a9ab87ed37..1d791638c4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 74e05a42a5..6812788ae4 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -193,10 +193,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -253,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Cay42r0urBotryGdHDE2xE4vZ0qZrnpLTeovN7kqjvc= +NodeupConfigHash: wp7JG7ibSbqae1/V65DxG+x5FbAIN4PUL4nGD6ZINLc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2377dc179a..6cea8c9d9c 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PvMouc0PwBGCEXBaklQva471IR4abu3iQrxi76ptJT8= +NodeupConfigHash: FN9UQ2dQ9d55H6kh0B9sdQm7daPXYMamNzAnTu5kz4s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8270469150..6def9908c2 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content index a9ab87ed37..1d791638c4 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 3eb7d9d730..c9cc3a7624 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_master-us-test-1a.masters.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -250,7 +245,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: LFPw6ByrnkMzF8T7ardJwgx7eSVQnyNi6TTPlqHqFUo= +NodeupConfigHash: 1Mk+n9qQZa6JEuUaF1qkr6m1hpfSTB7fNTMxIu8D1+Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data index 92beca9987..3e1147ac60 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_launch_template_nodes.this.is.truly.a.really.really.long.cluster-name.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: cgroupDriver: systemd cgroupRoot: / @@ -179,7 +174,7 @@ ConfigServer: server: https://kops-controller.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: um+8+Rya8MsiVrNK3ldGQNP7yLzHKDONtn2U2XHHw5k= +NodeupConfigHash: B3liV5If7Ws3PyZQD1WnBbgDClgq4+8UKRaII6Oj+ik= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index b195bebfb5..369a50153e 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: cgroupDriver: systemd cgroupRoot: / diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content index b9faf70c98..09b7c8a62b 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: cgroupDriver: systemd cgroupRoot: / diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data index 1cf9f9f919..84004096b3 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_master-us-test-1a.masters.minimal-warmpool.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-warmpool.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: NSGb0mHd01oIQylq6PAG8a5IhDXS20WD6aOEdJvP3O8= +NodeupConfigHash: hQLib/Af7nN0ZwDRQLVgOL+wEUWQpZMkWbfmOJGggPA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data index 9e0894d148..03ce2cf76a 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_launch_template_nodes.minimal-warmpool.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-warmpool.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: WdMwUN1II3J2F545vNVA6FcJEOBIEQ6Dthud+9Gj23Y= +NodeupConfigHash: ybsDpnGRXH1TDPysSNY5mNuS1ydUIE5CZxJ3fk5qCIA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e3048c01d2..eeb12e1503 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content index 8d3a5a3f8f..652e3efd0e 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_nodeupconfig-nodes_content @@ -20,6 +20,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index b3ad8f71ca..40ff246a21 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -250,7 +245,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: VVWx9sj1MDpxJyUvDryZBEvOZA3Q+MdxQpkJ+gZGcA4= +NodeupConfigHash: mUNoxbq2j/HK+IYumX3qc3KeqsLuTITfaWEcHYYHWIg= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data index 4b92571b33..739dc899d9 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: cgroupDriver: systemd cgroupRoot: / @@ -179,7 +174,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: mWmC8UbpdyijvWix0JxYYc2h2UXn55sM5uV5RD5hfDA= +NodeupConfigHash: WVaLDtwLYRb1ZRXbyZYErlMkC5My/0stnDlFaw6liVs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 237a03ceb0..73d3e7102b 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: cgroupDriver: systemd cgroupRoot: / diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content index ccc3fe62a8..28c9fd6b80 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: cgroupDriver: systemd cgroupRoot: / diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index f8a16df38a..3c9b522a81 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -242,6 +242,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content index 7de2b49f10..c874b07f37 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_object_nodeupconfig-nodes_content @@ -21,6 +21,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index 27e8793204..a0fef68ebb 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -188,11 +188,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -242,7 +237,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: v6KtvdRkDNCrLVzoHZZZqgHyzw01Og1TyVi8icV5K/o= +NodeupConfigHash: CfVn1LxOvz5EQHeqyJ6REZAeTPpXF8i10UohKkdeYC4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index fdb7f5195d..47676b7476 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -124,11 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -177,7 +172,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: rbW+MrZ+vnkbmxihstTEO7pZ5iuSX7BPN7bCiRErTzs= +NodeupConfigHash: cerQeKr2y87Yah8UrFa4NN1ZbHTyYmEkbWBzR35VC3c= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index f8a16df38a..3c9b522a81 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -242,6 +242,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content index 7de2b49f10..c874b07f37 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/aws_s3_object_nodeupconfig-nodes_content @@ -21,6 +21,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index 27e8793204..a0fef68ebb 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -188,11 +188,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -242,7 +237,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: v6KtvdRkDNCrLVzoHZZZqgHyzw01Og1TyVi8icV5K/o= +NodeupConfigHash: CfVn1LxOvz5EQHeqyJ6REZAeTPpXF8i10UohKkdeYC4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index 3e3046f45a..01042581a0 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -124,11 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -177,7 +172,7 @@ ConfigServer: server: https://:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: rbW+MrZ+vnkbmxihstTEO7pZ5iuSX7BPN7bCiRErTzs= +NodeupConfigHash: cerQeKr2y87Yah8UrFa4NN1ZbHTyYmEkbWBzR35VC3c= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 1d336a5753..872ae09943 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -242,6 +242,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content index 905736c796..8ea2dd76fd 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/aws_s3_object_nodeupconfig-nodes_content @@ -21,6 +21,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script index 346beb23cb..1778eb07af 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_startup-script @@ -188,11 +188,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -242,7 +237,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-ilb.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: 6VvAAOLmf7C9pej3AzP1zOzw5HUflaDFTwU5O0iNSdg= +NodeupConfigHash: WZrWx0nq++DUr1WH01s0SFMKPIAsNw3vu2zyHJwojb4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script index 7761206562..1edc3ead5f 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_startup-script @@ -124,11 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -177,7 +172,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce-ilb.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: uwsa0z1PA15oCEHPX228lBiQXFF4m+CxoWu/OZsypKI= +NodeupConfigHash: 3IRPmmjfsPMh4jwphJOw6UT2FjoX5F6vlg/lrWJeuWs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 6b0ca4eae2..59bfd70d30 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -242,6 +242,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content index 7ed4cc2eb6..e0d8fdff52 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -21,6 +21,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index f4a4111f79..0ac9c7be41 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -188,11 +188,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -242,7 +237,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: Q/6+xKxpcDy8a6muuC4GoTpHn0t+QpMLOPQlB3qHPOw= +NodeupConfigHash: Ji4UcBzY5wh257V7eKi+yZ51BHpBKkGDTPj5XE+6jO8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index dab91b2e2f..eee755be20 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_ilb_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -124,11 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -177,7 +172,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2cRYDdCiPbOQ1xZSt2bPZtvZY8e9TOgtDjPZDlJyBCs= +NodeupConfigHash: aCEBc2v2B1S+zadOcdlZovtOAcWg+KufMbBKYRFbcSE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 6b0ca4eae2..59bfd70d30 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -242,6 +242,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content index 7ed4cc2eb6..e0d8fdff52 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/aws_s3_object_nodeupconfig-nodes_content @@ -21,6 +21,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index f4a4111f79..0ac9c7be41 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_master-us-test1-a-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -188,11 +188,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -242,7 +237,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-with-a-very-very-very-very-very-long-name.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: Q/6+xKxpcDy8a6muuC4GoTpHn0t+QpMLOPQlB3qHPOw= +NodeupConfigHash: Ji4UcBzY5wh257V7eKi+yZ51BHpBKkGDTPj5XE+6jO8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script index dab91b2e2f..eee755be20 100644 --- a/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_longclustername/data/google_compute_instance_template_nodes-minimal-gce-with-a-very-very-very-very-very-long-name-example-com_metadata_startup-script @@ -124,11 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -177,7 +172,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 2cRYDdCiPbOQ1xZSt2bPZtvZY8e9TOgtDjPZDlJyBCs= +NodeupConfigHash: aCEBc2v2B1S+zadOcdlZovtOAcWg+KufMbBKYRFbcSE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content index 0c5c54c8b7..bf9016c8ca 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-master-us-test1-a_content @@ -242,6 +242,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content index a6fe742eb2..f535d3a723 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_object_nodeupconfig-nodes_content @@ -21,6 +21,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script index c7cf55dc42..20a0825d7a 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script @@ -188,11 +188,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.26.0 leaderElection: @@ -242,7 +237,7 @@ CloudProvider: gce ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a InstanceGroupRole: ControlPlane -NodeupConfigHash: yACN2PZfRYMHJT6fsUBMk1Tekpwvba1Nmzhz/ycuo0U= +NodeupConfigHash: 1uSCjpomyiBF/YVZbe+AJrQQfexNPNiTbJ4lfCWiWIM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script index 5500222038..6edf824245 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script @@ -124,11 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -177,7 +172,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-gce-private.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: KSkfJfibLnNo/J0O95s2sy+jCoYsrdgB0/VuT1RqL2E= +NodeupConfigHash: hj5jSto+Qy/9Bx1wG9TIDQJ8OE4kCO/87NoFWdBvqmQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index e3289ab878..76bb0a9cbb 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 6NJWmzQZOSRwV15rvQ3IAi7RmXgxkAzCVECpdGYTkY8= +NodeupConfigHash: wJvLQFDYCwQwyaBQ+nhgFpE4lEMh79hRQaNT2O9EC4A= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data index b973ec5e0b..be2beef73a 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.k8s.local:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: UCBW6mcffc2h0wbU+p8PFaWIz4uoCX+zOiXTqoHap2U= +NodeupConfigHash: /0gsCggscPZM8z/wx7orMehR/M6R29pBS/5GyP2MVGA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 4de78d13af..08d69bbc13 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content index 9ae4ec37cb..3e56e8824c 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_nodeupconfig-nodes_content @@ -23,6 +23,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 04b1967d17..065fa62a83 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 3xFW8oCpjkkHrG1HKx5No2bp++5zsp9iyMi8iLFsoTU= +NodeupConfigHash: KlbpTcKEJdIiTEZwObN/E5B57uPHCHEwNk+nQJ4xx/k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data index b973ec5e0b..be2beef73a 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.k8s.local:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: UCBW6mcffc2h0wbU+p8PFaWIz4uoCX+zOiXTqoHap2U= +NodeupConfigHash: /0gsCggscPZM8z/wx7orMehR/M6R29pBS/5GyP2MVGA= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d16546cb6d..d10c2d6b70 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content index 9ae4ec37cb..3e56e8824c 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -23,6 +23,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content index bd27b0990c..88ce9659d6 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-master-fsn1_content @@ -240,6 +240,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content index 9db4b7e8fd..6953b47cdb 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content +++ b/tests/integration/update_cluster/minimal_hetzner/data/aws_s3_object_nodeupconfig-nodes-fsn1_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data index bcf91a84b6..c1a3ef412d 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_master-fsn1_user_data @@ -189,11 +189,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: image: registry.k8s.io/kube-scheduler:v1.25.0 leaderElection: @@ -241,7 +236,7 @@ CloudProvider: hetzner ConfigBase: memfs://tests/minimal.example.com InstanceGroupName: master-fsn1 InstanceGroupRole: ControlPlane -NodeupConfigHash: OVam6HUoF0GjyUrQUFAj5jLhVQK+Uv/eFrUEqyfHOIw= +NodeupConfigHash: ck8Jg4ndgMoRHwNzlKeM26CZpDQwuk1EDUlEMG1B9PU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data index acc58592b9..d305e1fb67 100644 --- a/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data +++ b/tests/integration/update_cluster/minimal_hetzner/data/hcloud_server_nodes-fsn1_user_data @@ -124,11 +124,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -176,7 +171,7 @@ ConfigServer: server: https://:3988/ InstanceGroupName: nodes-fsn1 InstanceGroupRole: Node -NodeupConfigHash: 2ujZ+YQBQC0MkOfGTySQHAmTiVRi77T2HDaKoj0pITE= +NodeupConfigHash: 9ojxiNY6auu2n9so68lPlJb8naOS6QUQP8JPwrtotio= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index ba93354f19..8d936941e1 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: zEm6USUNGkxSjpaxnuUU2ln6c23b9wVE1F2UH2dkM7w= +NodeupConfigHash: PQz76b8JWKjd2PK6MD8JdLtHqa5Zu+9MEgq4eGYYGdk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index f492af7a0b..d8e98c5965 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: J139FENpmf9jlfY0bhWtep7+1ug10qOtgQWHree26Jw= +NodeupConfigHash: rONzOgmL0yFIdeWCWVS4byaAu+klqFh0NqcGExaQj+M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 58814cec34..65a9a99664 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: wQ72tYZcY2mgnnTbZq8kKMJ13svADG1BoJj5iaNNP3g= +NodeupConfigHash: 98xPEJ+AN0NVKbslzVlP9kdt5RZ5Jni+xacHLBEGNsY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 84a40260b3..bb0e0cf4c0 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: w1FXVxp0uSlWKU1NuQSujfUb+f393Uwy8I1Y882a8zU= +NodeupConfigHash: SuBIrre4nI39iRzgrteIHdFFQ0VJVEVhw2qD4Gs7y/o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2ac4334542..a9fac0b93b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index ddfd9ae311..30f6b06f38 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 347cde4c2b..a5111f2660 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content index 0d4f76626f..7e4f8b183c 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index ba93354f19..8d936941e1 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: zEm6USUNGkxSjpaxnuUU2ln6c23b9wVE1F2UH2dkM7w= +NodeupConfigHash: PQz76b8JWKjd2PK6MD8JdLtHqa5Zu+9MEgq4eGYYGdk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index f492af7a0b..d8e98c5965 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b InstanceGroupRole: ControlPlane -NodeupConfigHash: J139FENpmf9jlfY0bhWtep7+1ug10qOtgQWHree26Jw= +NodeupConfigHash: rONzOgmL0yFIdeWCWVS4byaAu+klqFh0NqcGExaQj+M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index 58814cec34..65a9a99664 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c InstanceGroupRole: ControlPlane -NodeupConfigHash: wQ72tYZcY2mgnnTbZq8kKMJ13svADG1BoJj5iaNNP3g= +NodeupConfigHash: 98xPEJ+AN0NVKbslzVlP9kdt5RZ5Jni+xacHLBEGNsY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index 84a40260b3..bb0e0cf4c0 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.mixedinstances.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: w1FXVxp0uSlWKU1NuQSujfUb+f393Uwy8I1Y882a8zU= +NodeupConfigHash: SuBIrre4nI39iRzgrteIHdFFQ0VJVEVhw2qD4Gs7y/o= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2ac4334542..a9fac0b93b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content index ddfd9ae311..30f6b06f38 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1b_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content index 347cde4c2b..a5111f2660 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-master-us-test-1c_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content index 0d4f76626f..7e4f8b183c 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index 8868354c41..643f41c6e5 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 8Io08jf4R2mFBsgE7vL0OwBQxGdO3S0qU4xIKy5gjUA= +NodeupConfigHash: W4BJrPlOFJApnCeVknaiZLTlj1vDtkCXMKkCype6VF0= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index 5ad139a53a..aaf08c95ce 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 0FV3f68/gm4CkB4UGfaoZBMZStEwPHv41EqF0AhaGyE= +NodeupConfigHash: oAMYlyTuxmqymaDcZuc8JY21D9hwjVGIRY/Yb/la+0Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index cb5c84e7d6..6e412fb44f 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content index acc5797203..3db9afe68d 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data index 616ded7f1e..71a2c8e2e1 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_master-us-test-1a.masters.nthimdsprocessor.longclustername.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: WqEtF2Lhu0LQfvuRgOYxkhhSA2177ZE5v4opfZJj7CI= +NodeupConfigHash: V0KM5a05VN7+TdAeg/800W9lXMNPi3/Rb0SD1YaKIIo= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data index 5ad139a53a..aaf08c95ce 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_launch_template_nodes.nthimdsprocessor.longclustername.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.nthimdsprocessor.longclustername.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 0FV3f68/gm4CkB4UGfaoZBMZStEwPHv41EqF0AhaGyE= +NodeupConfigHash: oAMYlyTuxmqymaDcZuc8JY21D9hwjVGIRY/Yb/la+0Q= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c1f9373fda..60906fb21e 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content index acc5797203..3db9afe68d 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 7dac75d32c..5768813e09 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: U0LXXiPMG5Gif2XOJIo/dmyGzELXVRTCmZsA00gqBRc= +NodeupConfigHash: /vRGMbasSuwejx/xDd1R6pEL8RfxHT6PZ5VWqjiQxKc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data index 2d1014228e..5b88f913ed 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: i97WJFaTV4kpdo8ABgpADv7ZEVDpHiF+CSMx30kbMQ4= +NodeupConfigHash: bwpn3Xt7wHQYftZvEcdf7wboA+Dw6YDHhV21anGOp3U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 6fb9f33a0e..94cfff1564 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content index f0a46d8b9e..1f9cd45ee2 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index 691f408187..7614d45278 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: jUuBekxuTwD0NJt5FoGDmEqgG8JVg1ju8k1D3HRsnaE= +NodeupConfigHash: sACOSAYMleGxQWxpYv++gdsSDNgeNESpJlO3lhHTHhE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data index cb193bc7a5..dab881c820 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.private-shared-ip.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: dFuWuaZpbXUgoZ/ak+Dx/2YmTtb25m3kKkE4qxqPvr8= +NodeupConfigHash: jCLqi7/ej8jSqoPB4NUSTIBzowB1jOKEdKW7vG7v8oE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e679d5fe15..ae034df91c 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content index 4fcf4158df..9e8ac577a3 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index 8b0c98e3f6..d01c997635 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: jzk4dGPlm0ofR/AJFU7ujYwWW6NWAvhrYbKuhU1pCfc= +NodeupConfigHash: nUOVAYGZ5Z7DwbScxFNlQq0MFdTHG6FpO6oL6uRkE80= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data index ba18a9aaa9..0ae9c35d6e 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.private-shared-subnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: MawpCERQteaGpm5NVuq0TSRc4dCeOCJf8xbRqaiTF34= +NodeupConfigHash: sl3iTrcbn1TyOWez5qQQDv2s9Q6UpObpL1cY4ItSogk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 2381658ed2..47bc213df8 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content index d94ceb61e2..42692de1ed 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index 03eb7d0018..40aba38bd6 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 7B+ckV9AUrHfaEQXycX/7oMwYLb7g66I3M64kyzMwxw= +NodeupConfigHash: kZUpnvfanE/W7Tcwr98VBhrmdR9hM4O/Wr9smfIA5ks= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data index 1300a01c32..4f175e851b 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.privatecalico.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Sy/YBchtFRH9vjz5ZIVB7X6+3CC0fcAGgFCMtkuLh3Q= +NodeupConfigHash: DuVbxs5ozp8NAf4I43Rb0iCZr3IGyduFEn6Ou01ClfE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9ebcd4a97c..dd8ed39571 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content index dba49d687f..be90e68995 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data index de28f4576f..49ad33f544 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: VYv8yls88+AyB8p4v4vUlUdqN5XxnXcZ9TCeeLxafV8= +NodeupConfigHash: yM5iQbVwbNviJHSxfKwc0OGZrGgTmnXVY6zwIckruHk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data index 6c1c1daebc..24ef8575a2 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.privatecanal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: Ct8GWmyApooMJFUh0bCbctvd0L6y1SmrheJ+ZWMUMvg= +NodeupConfigHash: 60Ufli7tEI0nXEGo26+O6e+YFmgll6ZvBQz8nZ1e8nQ= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5e62e218b6..cd123c3682 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content index de76329142..2165823d33 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index d08d15936f..88be0d27d4 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: BuSk7eJALai0H/owWc6aLmLlVfVNSslnAmPAs9fuM2c= +NodeupConfigHash: K5LXAYx+AgDgRZ9edOmfMgCaalbzffrWdlLQ28RiMsk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 810d0948dc..f14c21e3e6 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: hGcKvc2NaXQK5vs/pou6PXyrEvlOPoyL/2Yhu82Ac7Y= +NodeupConfigHash: OJEFlc8D++bgn5UvX5M/oVK/cRoeQ+Yd8JjjzGazMkk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5ec8996f2c..65f7a9dbe8 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content index 2d8e68d6aa..02b89fcb1f 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index d08d15936f..88be0d27d4 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: BuSk7eJALai0H/owWc6aLmLlVfVNSslnAmPAs9fuM2c= +NodeupConfigHash: K5LXAYx+AgDgRZ9edOmfMgCaalbzffrWdlLQ28RiMsk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data index 810d0948dc..f14c21e3e6 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: hGcKvc2NaXQK5vs/pou6PXyrEvlOPoyL/2Yhu82Ac7Y= +NodeupConfigHash: OJEFlc8D++bgn5UvX5M/oVK/cRoeQ+Yd8JjjzGazMkk= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 5ec8996f2c..65f7a9dbe8 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content index 2d8e68d6aa..02b89fcb1f 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 910406be3d..10a73da1fd 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: qiBgX8Q9cbumO/83S9e7LgJSC8xL0BlOKgf8HVBJvpM= +NodeupConfigHash: M/sXqM4LObMICIgR+JRXeX1pxz77CGRM+XefWcXHgtI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data index d0556b5528..9e767c8db9 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.privatecilium.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: qy9uhJOmU19r3i+GGxRYbbD01OaUAk+YUKoOkebAzoM= +NodeupConfigHash: UyEa11k2U063XWGj/7aJG2jan9zCjm37+U+FXZV56KI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 59637e8b8a..e84b40983e 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content index 8eae34a0eb..baf4b4decb 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index 4d670deb31..516502bc04 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -193,12 +193,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - enabled: false - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -255,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: ucAimPjCwIG5pcACW8Qr9amxHiPdpA7yYasYXoDfSls= +NodeupConfigHash: WXmbxNifOGrE2gu3UAXYe+bTECVVTkbuxf8ecbBcVW8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data index 3c292b7b73..e65d03a2d0 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data @@ -125,12 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - enabled: false - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -181,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.privateciliumadvanced.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: D/fgS2WdS6sQWS7h3Rhklk3FuKfAsTjeO1NZb5RXK1A= +NodeupConfigHash: mqISaHAglgZ1FhMAYaKgo4oTwdXfAhM4oV46eh4fk7k= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 6854654709..1296c916e3 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -313,6 +313,7 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: null KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content index b7ba012438..11f4d984d0 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_nodeupconfig-nodes_content @@ -43,6 +43,7 @@ Hooks: KeypairIDs: etcd-clients-ca-cilium: "6977087239278090025924899436" kubernetes-ca: "6982820025135291416230495506" +KubeProxy: null KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index a7e314c4e1..66d61327d9 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.22.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -254,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: R10Yh+m5aV2oOS2+OBADRxKLQ21KlAevEF/7dL6Z1Gc= +NodeupConfigHash: ybcSyqL/peUO35gwt8SjpxNVk3/lmx8rvguSwZGE6GE= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data index 1982d03faf..a5497d3006 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.22.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -181,7 +176,7 @@ ConfigServer: server: https://kops-controller.internal.privatedns1.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: uj7cJRo5NdENX4d4vy/EW/FMAsH8zks6z5vZQBpEs5g= +NodeupConfigHash: vHnEWz9Di9OP1jV33vG53g/gO2kGPfrpEA64bHgYohs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 4f8fdf780d..a5e38ecea6 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -241,6 +241,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.22.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content index 98c03925b8..7f2f855421 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_nodeupconfig-nodes_content @@ -17,6 +17,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.22.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index 035fbf96ad..6820932149 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: k0+9J5OndLuvqCvKykdNU1aEnMejZH6D0CbxEVnSOLA= +NodeupConfigHash: F0zNf8rOVwBaYcwsBfwE28ctAPz/4/kO/5A2blHi0JU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data index facc84778e..4101b3721d 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.privatedns2.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 3J1UKGbk0pGEWcaybi7mBKYuOhtcWk9OH/lMviDE3p8= +NodeupConfigHash: BFX457E9AY6ek8LlWw0xCvMYnFQaA6vlnI4gCV+aZoI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index d370fd7024..5964ad4e22 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content index 5fd51dc5ff..a37253018b 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index 68a311dba0..89f654d39c 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: a76R6J5OxOxGZG75eVi8FIXVheG+ceM63/mym/m+Rbg= +NodeupConfigHash: srTRsh0gbofctRJWw9WtcFFev2Ky95ZBkVFyU0uF41s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data index 1daca3b92e..bc94e0e98a 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.privateflannel.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: dKKVjPpEMVB5FxC2fMmtqnxL7KaVrbCGyjXhK7cFipU= +NodeupConfigHash: lmPCWCnXHONmW2+23VfE/Ce0eNtXB7Vn46qOLZWL1Q4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 092bf9c44d..cfdd0fc74b 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content index ccc43d82af..d4197f8a80 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index 6efdbdb3cf..563b589b48 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: bT4sMbdwHBzxLk2ysWTvJCaos34V7HM/CYN0cnLVoSo= +NodeupConfigHash: SBe7fXsVS91bWJitmMbqp++P8QGxgS/xKmHMz3SPb4M= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data index fb2910c106..bbd7b8be66 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.privatekopeio.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 6dUsTs0e8/Fdr5716Q84qdtNflzufMXNVwergcMP8q0= +NodeupConfigHash: KJQ+EXkaSPjeHZnVREIOlDwY7U/klfc+S3vmkflY70g= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index a98a3500fe..88f43a0a23 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content index 6909214062..5cf119365a 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data index a3093b8c76..9f6144d93c 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.22.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -254,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 2HgzTBeUBHWzFk3Oc7TOi2vMP2iYHkgKEEz1Rb4ZRFA= +NodeupConfigHash: 9WFQH1p+Mnr3H+R/aYmOwT4Dxysx/8YUtWKrWDE82O4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data index e082ad0bfd..fd977f38df 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.22.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -181,7 +176,7 @@ ConfigServer: server: https://kops-controller.internal.privateweave.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PyY+6aQHrqUtGMknvQsCNk54T3mLsra5sdhtVxrmkuA= +NodeupConfigHash: UjshG26b2YDyu5BiEFpHPV/e5IbMgfTBm4YTbWpWwbU= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 9ce0cc41ce..6dc3f1becd 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -241,6 +241,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.22.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content index 65a3b53ff5..d27037cb42 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_object_nodeupconfig-nodes_content @@ -17,6 +17,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.22.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 228d048ddf..bff0c2f043 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -192,11 +192,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -253,7 +248,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: EcOVGJnpcLZqXgqdgZF+twKp/GWwrCgm6Ram897Ct/o= +NodeupConfigHash: QbTaj6Xax5H6zSsb+RUDY2hiQnGImFh4wrQOBvd2Kj4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data index f1fbada97a..0c7edeeb24 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.24.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: 7rvht8nTzSbDjoC+JxvGpE5siHkZ6+NYco2MXSg6Qog= +NodeupConfigHash: VizNJ6PwrQBwyXWq9gJemdv/NIANBahNqV19bDOpYYI= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 3a3eca2f55..8e25ff1c0a 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -244,6 +244,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content index 010987e3ce..e7ed00b99b 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.24.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index 027925c680..66f422dcfd 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: oFTgCJAIrLlRgaigksO4Tckbv9KzGMrcoPrlx4ccnlY= +NodeupConfigHash: /Mmq73slZO0QgoTyTgxWOHdyHbcvupwYwZpMuiAxt48= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data index 317ca71190..630ff7467d 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.sharedsubnet.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: HpdJaHe0h+eMtYrwssGeL5w8IKaOmLmxalVQmV1pBm8= +NodeupConfigHash: 68Q39YJWH3l0fdDEeFNdJWrb0WW62KwsIoI68kyFcr4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index e3de59abaa..b5936f67b3 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content index 19657c48de..271aeea26e 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index c7d4e005ed..3bca50d69b 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: OjRHWdwveOyR/Gqra8S0SSh8vIkWqPJnZ3jI43b0pnI= +NodeupConfigHash: +sdxjIzLrTwLKR+6RUqeGjtzECs50i+hxQKiL+oU404= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data index a1f5527466..f65de78020 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.sharedvpc.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: pNNvH9MaswvXP0aKMHa//SE6f4p3DtC2ruP24YlvdxY= +NodeupConfigHash: VRSDfONmbT/ezBiJeRLOSGqWytqq8nQ/XPzOp4Odva4= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 06574ff71c..59060d920f 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content index 8e84616cee..ad5a65c4d5 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index 74e05a42a5..6812788ae4 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -193,10 +193,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -253,7 +249,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: Cay42r0urBotryGdHDE2xE4vZ0qZrnpLTeovN7kqjvc= +NodeupConfigHash: wp7JG7ibSbqae1/V65DxG+x5FbAIN4PUL4nGD6ZINLc= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index 2377dc179a..6cea8c9d9c 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -125,10 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.25.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -179,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal-ipv6.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: PvMouc0PwBGCEXBaklQva471IR4abu3iQrxi76ptJT8= +NodeupConfigHash: FN9UQ2dQ9d55H6kh0B9sdQm7daPXYMamNzAnTu5kz4s= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 8270469150..6def9908c2 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,10 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content index a9ab87ed37..1d791638c4 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,10 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.25.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index a49b270349..b1a2244cde 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: 8pDdgitkeN11+h0OrA91TWBX42ZZPhMIvUrQ1Ih3u7g= +NodeupConfigHash: ocKGNS5i82PHnHPtiQhnr1Eqgdd8/7awdsoo34qp90U= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data index efb2b84653..e12ede24f9 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.unmanaged.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: MLvEEQLhKe8vQUVY5iN5sLdmb4YaRb5hmxpfp53vqLg= +NodeupConfigHash: Nvu6QlKoyT8RBkfAQ2LW39FqZmJNUsjtOGYF7P8Sejs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index af2c640c24..b9322ad06f 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content index 17ed75bc2a..8bbcdbc921 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 0eb659a9f6..dfa219ee5b 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -191,11 +191,6 @@ kubeControllerManager: leaderElect: true logLevel: 2 useServiceAccountCredentials: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubeScheduler: featureGates: CSIMigrationAWS: "true" @@ -252,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: SHXJXEAp+oybG75l+UHgyijWBnJ1kD3p1i7X+U5HAp0= +NodeupConfigHash: 8kWRHXZ3IJDCBzckpZUlA+RUwIOXiJ2coLv/mu1wVws= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data index cad69268fa..9c985c53af 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -125,11 +125,6 @@ ensure-install-dir cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cloudConfig: manageStorageClasses: true -kubeProxy: - clusterCIDR: 100.96.0.0/11 - cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 - logLevel: 2 kubelet: anonymousAuth: false cgroupDriver: systemd @@ -180,7 +175,7 @@ ConfigServer: server: https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw= +NodeupConfigHash: 8orZlvUktLEgVBvcuNr1eeVs6yD1VvA4+dOpp3eXQTs= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 59d47e402a..8b30dd5326 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -243,6 +243,11 @@ KeypairIDs: etcd-peers-ca-main: "6982279353998887468930183660" kubernetes-ca: "6982820025135291416230495506" service-account: "2" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content index 484980d1af..456e4b389c 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_nodeupconfig-nodes_content @@ -19,6 +19,11 @@ Hooks: - null KeypairIDs: kubernetes-ca: "6982820025135291416230495506" +KubeProxy: + clusterCIDR: 100.96.0.0/11 + cpuRequest: 100m + image: registry.k8s.io/kube-proxy:v1.26.0 + logLevel: 2 KubeletConfig: anonymousAuth: false cgroupDriver: systemd