kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hack/update-expected.sh

This commit is contained in:
John Gardiner Myers 2023-01-03 11:53:55 -08:00
parent b5eef1c129
commit 7419620b80
343 changed files with 1013 additions and 1008 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/model/tests/data/bootstrapscript_0.txt
View File

@ -151,13 +151,6 @@ kubeAPIServer:
image: CoreOS image: CoreOS
kubeControllerManager: kubeControllerManager:
cloudProvider: aws cloudProvider: aws
kubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
kubeScheduler: kubeScheduler:
image: SomeImage image: SomeImage
kubelet: kubelet:
@ -171,7 +164,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws CloudProvider: aws
InstanceGroupName: testIG InstanceGroupName: testIG
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: PKuG4AB7XxOlW3ztoVupVlaCDfDULbVpj0nUv3Vnm0w= NodeupConfigHash: ahfTlkzwHLRcCExDwnjVTOcVgd5luL3DcQ1jwTFAxqw=
__EOF_KUBE_ENV __EOF_KUBE_ENV

9
pkg/model/tests/data/bootstrapscript_1.txt
View File

@ -151,13 +151,6 @@ kubeAPIServer:
image: CoreOS image: CoreOS
kubeControllerManager: kubeControllerManager:
cloudProvider: aws cloudProvider: aws
kubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
kubeScheduler: kubeScheduler:
image: SomeImage image: SomeImage
kubelet: kubelet:
@ -171,7 +164,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws CloudProvider: aws
InstanceGroupName: testIG InstanceGroupName: testIG
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: ZVYsS4+BT0OlT0c4tYSzNOS5cF2BmdCWOlbgLawANPE= NodeupConfigHash: p3vhw4ODkGahCo1FNww5n4ptGSE/KXwl16AFCp48UMo=
__EOF_KUBE_ENV __EOF_KUBE_ENV

9
pkg/model/tests/data/bootstrapscript_2.txt
View File

@ -151,13 +151,6 @@ kubeAPIServer:
image: CoreOS image: CoreOS
kubeControllerManager: kubeControllerManager:
cloudProvider: aws cloudProvider: aws
kubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
kubeScheduler: kubeScheduler:
image: SomeImage image: SomeImage
kubelet: kubelet:
@ -171,7 +164,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws CloudProvider: aws
InstanceGroupName: testIG InstanceGroupName: testIG
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: ZVYsS4+BT0OlT0c4tYSzNOS5cF2BmdCWOlbgLawANPE= NodeupConfigHash: p3vhw4ODkGahCo1FNww5n4ptGSE/KXwl16AFCp48UMo=
__EOF_KUBE_ENV __EOF_KUBE_ENV

9
pkg/model/tests/data/bootstrapscript_3.txt
View File

@ -140,13 +140,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: null cloudConfig: null
kubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
kubelet: kubelet:
kubeconfigPath: /etc/kubernetes/config.txt kubeconfigPath: /etc/kubernetes/config.txt
@ -156,7 +149,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws CloudProvider: aws
InstanceGroupName: testIG InstanceGroupName: testIG
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: ApI8of4o1v0oYuFEkLOEvHztTT+rLkxbtFfHyF3NVp8= NodeupConfigHash: 2B7kjr5B2CTl7AI1X0Rxt5Ob73GpNs90Agcut0TBJL0=
__EOF_KUBE_ENV __EOF_KUBE_ENV

9
pkg/model/tests/data/bootstrapscript_4.txt
View File

@ -140,13 +140,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: null cloudConfig: null
kubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
kubelet: kubelet:
kubeconfigPath: /etc/kubernetes/config.txt kubeconfigPath: /etc/kubernetes/config.txt
@ -156,7 +149,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws CloudProvider: aws
InstanceGroupName: testIG InstanceGroupName: testIG
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: LxsGYCB8Qxowvtmt2Ak2367hT1H5JU7SEkCVY3fD75U= NodeupConfigHash: lvPACrPx9FVg4gA8D1ajD/HwjIhhguZtjLNvHMvi678=
__EOF_KUBE_ENV __EOF_KUBE_ENV

9
pkg/model/tests/data/bootstrapscript_5.txt
View File

@ -140,13 +140,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: null cloudConfig: null
kubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
kubelet: kubelet:
kubeconfigPath: /etc/kubernetes/config.txt kubeconfigPath: /etc/kubernetes/config.txt
@ -156,7 +149,7 @@ cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
CloudProvider: aws CloudProvider: aws
InstanceGroupName: testIG InstanceGroupName: testIG
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: LxsGYCB8Qxowvtmt2Ak2367hT1H5JU7SEkCVY3fD75U= NodeupConfigHash: lvPACrPx9FVg4gA8D1ajD/HwjIhhguZtjLNvHMvi678=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
pkg/model/tests/data/nodeupconfig_0.txt
View File

@ -15,6 +15,13 @@ Hooks:
name: apply-to-all.service name: apply-to-all.service
- null - null
KeypairIDs: {} KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
KubeletConfig: KubeletConfig:
kubeconfigPath: /etc/kubernetes/igconfig.txt kubeconfigPath: /etc/kubernetes/igconfig.txt
UpdatePolicy: automatic UpdatePolicy: automatic

7
pkg/model/tests/data/nodeupconfig_1.txt
View File

@ -33,6 +33,13 @@ Hooks:
- apt-get update - apt-get update
image: busybox image: busybox
KeypairIDs: {} KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
KubeletConfig: KubeletConfig:
kubeconfigPath: /etc/kubernetes/igconfig.txt kubeconfigPath: /etc/kubernetes/igconfig.txt
UpdatePolicy: automatic UpdatePolicy: automatic

7
pkg/model/tests/data/nodeupconfig_2.txt
View File

@ -33,6 +33,13 @@ Hooks:
- apt-get update - apt-get update
image: busybox image: busybox
KeypairIDs: {} KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
KubeletConfig: KubeletConfig:
kubeconfigPath: /etc/kubernetes/igconfig.txt kubeconfigPath: /etc/kubernetes/igconfig.txt
UpdatePolicy: automatic UpdatePolicy: automatic

7
pkg/model/tests/data/nodeupconfig_3.txt
View File

@ -11,6 +11,13 @@ Hooks:
name: apply-to-all.service name: apply-to-all.service
- null - null
KeypairIDs: {} KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
KubeletConfig: KubeletConfig:
kubeconfigPath: /etc/kubernetes/igconfig.txt kubeconfigPath: /etc/kubernetes/igconfig.txt
UpdatePolicy: automatic UpdatePolicy: automatic

7
pkg/model/tests/data/nodeupconfig_4.txt
View File

@ -29,6 +29,13 @@ Hooks:
- apt-get update - apt-get update
image: busybox image: busybox
KeypairIDs: {} KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
KubeletConfig: KubeletConfig:
kubeconfigPath: /etc/kubernetes/igconfig.txt kubeconfigPath: /etc/kubernetes/igconfig.txt
UpdatePolicy: automatic UpdatePolicy: automatic

7
pkg/model/tests/data/nodeupconfig_5.txt
View File

@ -29,6 +29,13 @@ Hooks:
- apt-get update - apt-get update
image: busybox image: busybox
KeypairIDs: {} KeypairIDs: {}
KubeProxy:
cpuLimit: 30m
cpuRequest: 30m
featureGates:
AdvancedAuditing: "true"
memoryLimit: 30Mi
memoryRequest: 30Mi
KubeletConfig: KubeletConfig:
kubeconfigPath: /etc/kubernetes/igconfig.txt kubeconfigPath: /etc/kubernetes/igconfig.txt
UpdatePolicy: automatic UpdatePolicy: automatic

7
tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
View File

@ -196,11 +196,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.23.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -259,7 +254,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/additionalobjects.example.com ConfigBase: memfs://tests/additionalobjects.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: QInbwR5tUN33Q96tgWuDBwj51NWiUfZUIUU0yEFV6Mc= NodeupConfigHash: zOTqRY3ycviNEJ/CEbZvEmQQi9trWwiRUqH7CO+B3Cs=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.23.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -181,7 +176,7 @@ ConfigServer:
server: https://kops-controller.internal.additionalobjects.example.com:3988/ server: https://kops-controller.internal.additionalobjects.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: sSuHwQvZ6+lX/JnKse3XKRQ9lNJKBqc/G6uTyv29Dtc= NodeupConfigHash: rSvrNDy/CmQ4zB44KYRN5Y/9CIaTYHsz0T4eu6tPgIQ=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -245,6 +245,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.23.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.23.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.22.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -159,7 +154,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: apiserver InstanceGroupName: apiserver
InstanceGroupRole: APIServer InstanceGroupRole: APIServer
NodeupConfigHash: vYbskPDI3k2nU17RtTF/2uq4sfcxZX3NyHl7wJ4db0Y= NodeupConfigHash: YCG6VABFo9H8QQVAzHvc/QqaOE82N1VIWmhC0mCyUcY=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/apiservernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.22.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -254,7 +249,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: lnIwb5HEvPCa1OQzHTQKkEi3FUQbivijCQF37W48OxU= NodeupConfigHash: 02N/lAQYlDYZzxbfRPbKBSkCjScLacP6q2n7oOcRBVQ=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.22.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -181,7 +176,7 @@ ConfigServer:
server: https://kops-controller.internal.minimal.example.com:3988/ server: https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: fUL6Sh6hpLgZiRi91fxuT57dePgGg2XdySENA7uWC2I= NodeupConfigHash: PgRYX/n6giex5NiT4evBOAGMsN5GulvPatlrAIw6CMM=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content
View File

@ -147,6 +147,11 @@ KeypairIDs:
etcd-clients-ca: "6979622252718071085282986282" etcd-clients-ca: "6979622252718071085282986282"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.22.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -241,6 +241,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.22.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -17,6 +17,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.22.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: SHXJXEAp+oybG75l+UHgyijWBnJ1kD3p1i7X+U5HAp0= NodeupConfigHash: 8kWRHXZ3IJDCBzckpZUlA+RUwIOXiJ2coLv/mu1wVws=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.minimal.example.com:3988/ server: https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw= NodeupConfigHash: 8orZlvUktLEgVBvcuNr1eeVs6yD1VvA4+dOpp3eXQTs=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: UfjoqopF3EX6Cu0bMdNGNOEbL8ALczYtlOUVLBhgxIM= NodeupConfigHash: Ak5coHcHI8Pp2/KUxysMI+pi3yHnyqoPVw13UWx5HjY=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
View File

@ -134,11 +134,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -189,7 +184,7 @@ ConfigServer:
server: https://kops-controller.internal.bastionuserdata.example.com:3988/ server: https://kops-controller.internal.bastionuserdata.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: CMfse0AqP6wp4b8hoAIHoF+04qb3GcknbFIO90ukERM= NodeupConfigHash: XNrJKgEQSlMk/6+Za6diXuDgzeRq6Y79sOuopJy6uvY=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content
View File

@ -18,6 +18,11 @@ Hooks:
- null - null
- null - null
KeypairIDs: {} KeypairIDs: {}
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
View File

@ -206,11 +206,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.24.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -267,7 +262,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/complex.example.com ConfigBase: memfs://clusters.example.com/complex.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: vLcDsmlRydUGsPtc/90JGOkLQKNkIVIYxpT7xYS8AYI= NodeupConfigHash: +u0TAInMBsYMa1dXPMfK9WuWufc0Jt2BUToT2G3G7TI=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
View File

@ -134,11 +134,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.24.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -189,7 +184,7 @@ ConfigServer:
server: https://kops-controller.internal.complex.example.com:3988/ server: https://kops-controller.internal.complex.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: JdUAH+JtAreCwUuIEbErmmuGrQbvsBFR1felSaNW9cQ= NodeupConfigHash: 6wKBMz5/UD9rTc4z9pkly+wYMfAh9c34tY6Vgv7nYGU=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -249,6 +249,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.24.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.24.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

4
tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
View File

@ -131,9 +131,9 @@ function download-release() {
echo "== nodeup node config starting ==" echo "== nodeup node config starting =="
ensure-install-dir 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 download-release
echo "== nodeup node config done ==" echo "== nodeup node config done =="

4
tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
View File

@ -131,9 +131,9 @@ function download-release() {
echo "== nodeup node config starting ==" echo "== nodeup node config starting =="
ensure-install-dir 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 download-release
echo "== nodeup node config done ==" echo "== nodeup node config done =="

5
tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/compress/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/containerd-custom/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: sRhLO8JVcuxWTPQncOKxAEP7nM32LKxwPRbYLIX7/so= NodeupConfigHash: kVAU4YS67KeoP2B3KGGiK/sZLFRqwHPR/K1mXpJNS3c=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/containerd-custom/data/aws_launch_template_nodes.containerd.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.containerd.example.com:3988/ server: https://kops-controller.internal.containerd.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: QsSdFMWwMNJz7QrrzNEWZpxLQTbDi8eZiIZcPwAidvg= NodeupConfigHash: wEf9fiLnaII9smDXRfdhuKoN2ULU5qNnB2mkCz5f+1A=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/containerd-custom/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/containerd/data/aws_launch_template_master-us-test-1a.masters.containerd.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: eYIJsocPFvc0HSLt4CRNQ3+vRKdbu3s4bqCoroAwUGU= NodeupConfigHash: ly0/fKrApEXAkzY/Q/BbGC7SfJm+LYS0Q8wKBT5+naM=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/containerd/data/aws_launch_template_nodes.containerd.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.containerd.example.com:3988/ server: https://kops-controller.internal.containerd.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: yu9vudyJYyvpwp4EeIwu5MEoU42KYkPNOI1H0uksvS4= NodeupConfigHash: Npb42ZSd/MHV8FUzIxmUAs381QlgrgfRbT2pcRtOlZk=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/containerd/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/digit/data/aws_launch_template_master-us-test-1a.masters.123.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/123.example.com ConfigBase: memfs://clusters.example.com/123.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: d1Who+57JCzsCm8hGMFJhbvSzkCaMO7rf7trfhjON3I= NodeupConfigHash: J4nTjLSZEJBXugYtDB81/dZTyPX8b2KAgawBHd1dLGA=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/digit/data/aws_launch_template_nodes.123.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.123.example.com:3988/ server: https://kops-controller.internal.123.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: 4aUxVBjTuovp1BN6J0sek08k+JWcgbs9zT/XM7eKR2o= NodeupConfigHash: k39juydPsGJNcgomZxOwrlbNTE8tacZmauutXoFzRkg=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/digit/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/docker-custom/data/aws_launch_template_master-us-test-1a.masters.docker.example.com_user_data
View File

@ -192,11 +192,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.23.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -255,7 +250,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/docker.example.com ConfigBase: memfs://clusters.example.com/docker.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: 9IlH0T1gXHuFA1mhGkCcTNYkXjoPd94rBfmOzizVOjI= NodeupConfigHash: tOwLUTtknWs7qZRL/NRsGYMDDh60sMK4bnCRtTA9eFw=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/docker-custom/data/aws_launch_template_nodes.docker.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.23.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -181,7 +176,7 @@ ConfigServer:
server: https://kops-controller.internal.docker.example.com:3988/ server: https://kops-controller.internal.docker.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: h8rTwvxpl/fAtFBdygR5JGWg2EsMR1alWnfjQ8QK9Bg= NodeupConfigHash: Fo0vqTQ5HXUVTWdZZNAaKi2IryH1OmDiueBp2LIZ0Ek=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -241,6 +241,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.23.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/docker-custom/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -17,6 +17,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.23.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: PG6aa0CkyLApMK+lx+30wFquds9I/2AJXLcc+gwzYVE= NodeupConfigHash: +PpfO/TOX3R47FAIE3VbHXIoFovVgZ3GBu4AfUoTjGE=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com
InstanceGroupName: master-us-test-1b InstanceGroupName: master-us-test-1b
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: s3Be7w2Ej2f5mQqzXCHfUAUvuntLqMictAEbO1XKN58= NodeupConfigHash: gC9pi4xdl8LLToPGi12TyeXxhopn4Mr01HO6NqkrMns=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com
InstanceGroupName: master-us-test-1c InstanceGroupName: master-us-test-1c
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: 9wwCKVaf2vilWRhL25z4U2mpd/NlhIR4b83ax0ox2xM= NodeupConfigHash: K2oYQEIC/5U029JU5o6yKrBw7IqRjaJQhW2vMH2vwMQ=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.existing-iam.example.com:3988/ server: https://kops-controller.internal.existing-iam.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: QKSqEBio/946HPwiGTA8a5QVke01J0zz/mV7qY+7kJU= NodeupConfigHash: ohCIVtugnnxcefaaF45rSwHBMCaWyNzwQ5B2byn4NRg=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/existing_iam/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: uzBTMWX/FZfuruK4fIBd2mBJkmAaCcpbWtJ77rNHOeE= NodeupConfigHash: Y4K/80DwmRR0EikE/d3dPnvoOrtjdMVJWYX546qdVWA=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com
InstanceGroupName: master-us-test-1b InstanceGroupName: master-us-test-1b
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: g4kqXBT89ndNkr6KjZyU/PHdqDfHBpvMbDjw2m2wD8k= NodeupConfigHash: Xx4qqKSzF5eiSKqhMK5bS5WOEYs1aUEXdgNOgrDwW3g=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com
InstanceGroupName: master-us-test-1c InstanceGroupName: master-us-test-1c
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: HqoUDuwMtzL//jBswcKAJqHrmnaYEf13m8MJXjiLHu8= NodeupConfigHash: 634y+1AdTey4FaLGSxBozaP3cWzoig4iX/fODJFDuUI=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.existingsg.example.com:3988/ server: https://kops-controller.internal.existingsg.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: yFHft0TxL4xU6wCsERBXrQWDOIyplVuf8kirajQHk7Y= NodeupConfigHash: 8FK4E5hVKuIPgEJ1qq9p19lhSlhZVCa5Muf/pZYlBzw=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/existing_sg/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/external_dns/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: oeI3b60MD0lkkS8VGS5XE1/p470uGoAX46e7Ajfi1A8= NodeupConfigHash: Jv47o0qq9/GiPXVTMZjRBuUQ7I+scTjNGD7DSFT1oQM=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/external_dns/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.minimal.example.com:3988/ server: https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw= NodeupConfigHash: 8orZlvUktLEgVBvcuNr1eeVs6yD1VvA4+dOpp3eXQTs=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/external_dns/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: SHXJXEAp+oybG75l+UHgyijWBnJ1kD3p1i7X+U5HAp0= NodeupConfigHash: 8kWRHXZ3IJDCBzckpZUlA+RUwIOXiJ2coLv/mu1wVws=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/external_dns_irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.minimal.example.com:3988/ server: https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: SiNRJl83AIX8QZ8szCIhAV+dvYW8K2fjiB96uK5CIXw= NodeupConfigHash: 8orZlvUktLEgVBvcuNr1eeVs6yD1VvA4+dOpp3eXQTs=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/externallb.example.com ConfigBase: memfs://clusters.example.com/externallb.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: DQ7shOZn6Ke3Khu7+ty1Spy9mZ5IiCRhLI54uLHgW/I= NodeupConfigHash: iTj5zPhCNJttPz4Oqn947n3+nlOuXhgyCMx0R0EHJ9M=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.externallb.example.com:3988/ server: https://kops-controller.internal.externallb.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: WNvnoyq6BNhIYmpRID+rjKv3XvT8zMziP8hy6oSZMgE= NodeupConfigHash: Cl/tdNSq3nCtScooMU524MiYmgzI/raWmzQhh6/VxrA=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/externallb/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
View File

@ -193,11 +193,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -254,7 +249,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/externalpolicies.example.com ConfigBase: memfs://clusters.example.com/externalpolicies.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: DRtvNhEVKaVOmf3+IwATDPGqdkmL4hseqscrrtWmJxM= NodeupConfigHash: 8n432Ez6BsSchCB9tbv/DsxuOTzS8QJUW39Dcbe63IA=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.externalpolicies.example.com:3988/ server: https://kops-controller.internal.externalpolicies.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: 3kDdkKlwduDczih78K1Z2d1WiGQEqs9uUvjM2jbXZaI= NodeupConfigHash: EgZ1NRxNiugZHcgNf/cXOQtIIYbCFgsPyBD8dLDABkM=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -245,6 +245,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/externalpolicies/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/ha.example.com ConfigBase: memfs://tests/ha.example.com
InstanceGroupName: master-us-test-1a InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: OUyYhVig24bI0gZEg4YKv00ZoZDy6iEpP/rPp3y/zRI= NodeupConfigHash: PJsqG2+iErTUAAfXHbnv4Gl5tCZKH8dsMhmsn8DwRFI=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/ha.example.com ConfigBase: memfs://tests/ha.example.com
InstanceGroupName: master-us-test-1b InstanceGroupName: master-us-test-1b
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: ioaAcHZ5VhUSXYXVUeK2G3nTeBmkaMjVG2wFq1O6S+0= NodeupConfigHash: R9BVpcgiSIXU2JwyqB+eSM5EPoC8xA2RO9FlmBEoDX8=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
View File

@ -191,11 +191,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
featureGates: featureGates:
CSIMigrationAWS: "true" CSIMigrationAWS: "true"
@ -252,7 +247,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/ha.example.com ConfigBase: memfs://tests/ha.example.com
InstanceGroupName: master-us-test-1c InstanceGroupName: master-us-test-1c
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: 6t6ABSvjzPwR9UZFYff/pQwDI3ESTs0TLWQoNmq78oI= NodeupConfigHash: bbKPPn/QdVweG5EAQSXFrqj/DXezsPyxpZqkhsWtzUI=
__EOF_KUBE_ENV __EOF_KUBE_ENV

7
tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
View File

@ -125,11 +125,6 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: cloudConfig:
manageStorageClasses: true manageStorageClasses: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubelet: kubelet:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd
@ -180,7 +175,7 @@ ConfigServer:
server: https://kops-controller.internal.ha.example.com:3988/ server: https://kops-controller.internal.ha.example.com:3988/
InstanceGroupName: nodes InstanceGroupName: nodes
InstanceGroupRole: Node InstanceGroupRole: Node
NodeupConfigHash: InDqbg/HawE1hABHD21fJWJmVQE+Bih7SkpKzuSACHM= NodeupConfigHash: CkOWnZdRNIbjN4JFcDDQwpLQHpAb4W5M6aJFUJ6wrMw=
__EOF_KUBE_ENV __EOF_KUBE_ENV

5
tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1b_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-master-us-test-1c_content
View File

@ -243,6 +243,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/ha/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -19,6 +19,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-a_content
View File

@ -242,6 +242,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-b_content
View File

@ -242,6 +242,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-master-us-test1-c_content
View File

@ -242,6 +242,11 @@ KeypairIDs:
etcd-peers-ca-main: "6982279353998887468930183660" etcd-peers-ca-main: "6982279353998887468930183660"
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
service-account: "2" service-account: "2"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

5
tests/integration/update_cluster/ha_gce/data/aws_s3_object_nodeupconfig-nodes_content
View File

@ -21,6 +21,11 @@ Hooks:
- null - null
KeypairIDs: KeypairIDs:
kubernetes-ca: "6982820025135291416230495506" kubernetes-ca: "6982820025135291416230495506"
KubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
KubeletConfig: KubeletConfig:
anonymousAuth: false anonymousAuth: false
cgroupDriver: systemd cgroupDriver: systemd

7
tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
View File

@ -188,11 +188,6 @@ kubeControllerManager:
leaderElect: true leaderElect: true
logLevel: 2 logLevel: 2
useServiceAccountCredentials: true useServiceAccountCredentials: true
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m
image: registry.k8s.io/kube-proxy:v1.26.0
logLevel: 2
kubeScheduler: kubeScheduler:
image: registry.k8s.io/kube-scheduler:v1.26.0 image: registry.k8s.io/kube-scheduler:v1.26.0
leaderElection: leaderElection:
@ -242,7 +237,7 @@ CloudProvider: gce
ConfigBase: memfs://tests/ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com
InstanceGroupName: master-us-test1-a InstanceGroupName: master-us-test1-a
InstanceGroupRole: ControlPlane InstanceGroupRole: ControlPlane
NodeupConfigHash: 4MfAaUpjwAa1xo16C4gu+JMAyqxaQaE4hONdvruCEJg= NodeupConfigHash: CYBU+41kT9ejHTRSAncjYUc+StoMIbg2CtHq84Qxds4=
__EOF_KUBE_ENV __EOF_KUBE_ENV

Some files were not shown because too many files have changed in this diff Show More