diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index a237bbabbce12..3c9200430ad67 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -138,28 +138,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: null -encryptionConfig: null -etcdClusters: - events: - image: gcr.io/etcd-development/etcd:v3.1.11 - version: 3.1.11 - main: - version: 3.1.11 -kubeAPIServer: - image: CoreOS -kubeControllerManager: - cloudProvider: aws -kubeScheduler: - image: SomeImage -kubelet: - kubeconfigPath: /etc/kubernetes/config.txt -masterKubelet: - kubeconfigPath: /etc/kubernetes/config.cfg - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index 4193ea162d5f1..1df1be5e0a23e 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -138,28 +138,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: null -encryptionConfig: null -etcdClusters: - events: - image: gcr.io/etcd-development/etcd:v3.1.11 - version: 3.1.11 - main: - version: 3.1.11 -kubeAPIServer: - image: CoreOS -kubeControllerManager: - cloudProvider: aws -kubeScheduler: - image: SomeImage -kubelet: - kubeconfigPath: /etc/kubernetes/config.txt -masterKubelet: - kubeconfigPath: /etc/kubernetes/config.cfg - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index 4193ea162d5f1..1df1be5e0a23e 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -138,28 +138,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: null -encryptionConfig: null -etcdClusters: - events: - image: gcr.io/etcd-development/etcd:v3.1.11 - version: 3.1.11 - main: - version: 3.1.11 -kubeAPIServer: - image: CoreOS -kubeControllerManager: - cloudProvider: aws -kubeScheduler: - image: SomeImage -kubelet: - kubeconfigPath: /etc/kubernetes/config.txt -masterKubelet: - kubeconfigPath: /etc/kubernetes/config.cfg - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt index 6d8de67de708e..d855ef59731c6 100644 --- a/pkg/model/tests/data/bootstrapscript_3.txt +++ b/pkg/model/tests/data/bootstrapscript_3.txt @@ -138,13 +138,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: null -kubelet: - kubeconfigPath: /etc/kubernetes/config.txt - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt index 3c33e6b2ac350..79210b73018ff 100644 --- a/pkg/model/tests/data/bootstrapscript_4.txt +++ b/pkg/model/tests/data/bootstrapscript_4.txt @@ -138,13 +138,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: null -kubelet: - kubeconfigPath: /etc/kubernetes/config.txt - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt index 3c33e6b2ac350..79210b73018ff 100644 --- a/pkg/model/tests/data/bootstrapscript_5.txt +++ b/pkg/model/tests/data/bootstrapscript_5.txt @@ -138,13 +138,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: null -kubelet: - kubeconfigPath: /etc/kubernetes/config.txt - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws InstanceGroupName: testIG 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 ce78180fefb3e..96c804060385d 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 @@ -122,137 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: aws - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.23.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.additionalobjects.example.com - serviceAccountJWKSURI: https://api.internal.additionalobjects.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: aws - clusterCIDR: 100.96.0.0/11 - clusterName: additionalobjects.example.com - configureCloudRoutes: false - enableLeaderMigration: true - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.23.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.23.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: aws - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: aws - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: additionalobjects.example.com 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 c529ed6b1ca75..55d2219f98673 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 @@ -122,33 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: aws - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: additionalobjects.example.com 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 10683da8406aa..1a67c7d9490a3 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 @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 fba0ac3489986..d24eb03ead4c1 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 @@ -122,125 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 74303766aedde..cfce95e41d8e5 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 @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 69ec3e36a9f43..8a014d2797b06 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 ee16c0f7cd6ec..0837a1ec9fe6c 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 75b1e2c8c8fe5..53ba02111794e 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.bastionuserdata.example.com - serviceAccountJWKSURI: https://api.internal.bastionuserdata.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: bastionuserdata.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: bastionuserdata.example.com 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 fb04741173080..0647c13bc2086 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 @@ -131,32 +131,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: bastionuserdata.example.com diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data index aba6861251c36..f543a9183a6bf 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander-custom.example.com_user_data @@ -122,128 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.2 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.cas-priority-expander-custom.example.com - serviceAccountJWKSURI: https://api.internal.cas-priority-expander-custom.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: cas-priority-expander-custom.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.2 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.2 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: cas-priority-expander-custom.example.com diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data index 434ac8dfe4891..d59a9cf5d78cf 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-high-priority.cas-priority-expander-custom.example.com_user_data @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: cas-priority-expander-custom.example.com diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data index aca0123d2dd8f..f643fb04e948b 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes-low-priority.cas-priority-expander-custom.example.com_user_data @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: cas-priority-expander-custom.example.com diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data index ed497a591b534..7b159354bca47 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_launch_template_nodes.cas-priority-expander-custom.example.com_user_data @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: cas-priority-expander-custom.example.com diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data index 29a5b7c6a4955..c296466970973 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_master-us-test-1a.masters.cas-priority-expander.example.com_user_data @@ -122,128 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.2 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.cas-priority-expander.example.com - serviceAccountJWKSURI: https://api.internal.cas-priority-expander.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: cas-priority-expander.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.2 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.2 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: cas-priority-expander.example.com diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data index ab58b87ddf783..4294974600b4f 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-high-priority.cas-priority-expander.example.com_user_data @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: cas-priority-expander.example.com diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data index bfd4a7ccc1e91..5af51445441ba 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes-low-priority.cas-priority-expander.example.com_user_data @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: cas-priority-expander.example.com diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data index 28801e834852f..d675b3df3aa6c 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_launch_template_nodes.cas-priority-expander.example.com_user_data @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: cas-priority-expander.example.com 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 4f45144328cbb..b444445055277 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 @@ -131,136 +131,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - auditWebhookBatchThrottleQps: 3140m - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - cpuLimit: 500m - cpuRequest: 200m - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.24.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - memoryLimit: 1000Mi - memoryRequest: 800Mi - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.complex.example.com - serviceAccountJWKSURI: https://api.internal.complex.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - serviceNodePortRange: 28000-32767 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: complex.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.24.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.24.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: complex.example.com 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 a7e2653ab5d59..079fb22a471b4 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 @@ -131,32 +131,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: complex.example.com 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 0a06d23c0926a..cb7116fbce6c9 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,8 +131,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/+xWXW/bNhe+968g+qJ3tWQ1ad9V6I1nd43XOvPsZNktTR7LnClSOySVeL9+OKRkO1/DhmLFLooAsXS+eD6e81BC2yAn1mxUVQ4Yq7nhFay8RV7BRHPnwJXMY4ABGIH7xitrOnNmgtYD8EJOdHAe0FEEaMH4+NRHw/TC2JqLXWiW4MFQmCnfu5K9G0VtC+iUNSU7y95k72ImynxplF1Yw3gxWwG2yZ9rbW8XqFqloQLZVcYYN9bsaxvcOPhtyTZcuyhu1DhIBUZArGjIKCIa8OAy14pMwoYH7ZNpOmZig/ElK0gW/Nai+oNTnnMroWRjfcv3bkxpDBhbKyPHUiI4V7JRFv8GjMWZLNC2SgKWDO48oOGammv4WsNY1spRnQsdKmW61C55Da7hAj6rDYi90BDFn1Wt/JKbCjC+U5ZKwFgISjSKpqmK06mfyq+sBow1rEBYI5NyHjz3ylSHZG5gvbV2F5W/cK3k8+pLK2EJzqMSFDbKluBsQAE/B+s5leqFTB3t6tt637gyz4vX/4+dKsrz0ai4b/lTC4hK9tPKExj/96Tr6wFjG+A+IHzkHjrITlazuapSueObVcleEEReRN3MXCFAavr4ZnVtECpFwD+xUjWvoGRJg/ts953LlM0JN0PeKJeg2BbZ67dx1qTQ4BcIG0CEHg5X+6YvYmbS+GeL+HphnTe8TsP9cHei07b6DC3oklFpCL8HcH4LXAJGwIGMEElReVUhVNxbfGj74c4jv4iPlJW6611+HS6hth6G0WL40O8j2tAkv4cOUfXQ/tpR6jU87ULaAWMOREBYWPQlOz8/i5JT/M6cC9T/fsK8UZnqGpYJWzfUzAzueN1oIMGjCD/efFpdL2f/IERuGzBK5m2R/3a7c8eIHQ3OFnHdSlaMRtnbc0JcXsTU04J9z8UOjCwjcM8iSU2s8Wi1BpwfyY7ISnAPtC2T2XTpjnTlPRfbKdD/Je2kUBpWeyMWgMrKkhX1yP0lkYiUKoVNeb57m/IsjkpCS8meaaKId0BAmNAZSxtogw7E+XX3Shy6N+zviuOC6QRqDZFqUjInskNP729PcHCfKCcIki4crvsx0NErsQUZdJrX1y3aHY7+slo7AiqfvwVFRes7RUXMxdzeeajlQb601pcs/ztom16uTpaiGJ1obLzu+9eMgH+876awDlWlTHXBjdTEFX0h0KYb5IKjLFkNtcV9xluuNPm9L0ajuXplrISNuyd+2QsV/bofEOD9m5evYr8fmfbSe7b/yrxpFmmxFpwmkLccc63WeTek/GjwCLGNlTOzQU5UwpUBnD0NnoYHB+VZ/MZqrJxzozbgfHcgeJEfv3HyutMSmTRoPQj/iXS6+zQ4TqKvptsIat5B57bBS3trPiIX0FPUWWSoJ1QTVF4JrhdWOoKLG9ScIn/6BtRvQP1vA/VPAAAA//8BAAD///QUjT9NDQAA" | base64 -d | gzip -d > conf/cluster_spec.yaml - echo "H4sIAAAAAAAA/2zOwUrEMBDG8XueInfpVou72oAHm4OuLmHxIHockll3IcmETNJWn16kp4L3/4/v056qO2YaLw6zkjCx0L5ywWwgoJKWQsrIvMEZQvK4sRSEpni6fA3AqGTAcGLVtnZRq7D9V+8jF4gWnzLVtKwE+LNN5aYgl+YG1tEbeVRSUyyZ/NFDRGHIYU3LkWfgs5L9NX4cGK7cNHz3+8PP+/22uxvy/Ll77XZ9NPzoXm63Y3c29kH8AgAA//8BAAD//0CCL7r3AAAA" | base64 -d | gzip -d > conf/kube_env.yaml download-release 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 80bd91413914a..38985a7c7b3c7 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,8 +131,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -echo "H4sIAAAAAAAA/2yST2/bMAzF7/4URIHeCttZt2ETeikSrA22DMGyYWfGohWishhQkrd8+0Fu3D9YT4b4e8R70nPnJdulhJ6dqQAGDOhol0TR0dJjjBQNJM1UPeQ9eUpFhUHCaZAcb3M6GOjRR6oAOqeSjyvlkdRAPMVEg32a/xBJBppyLp5blZFtEdLfRBrQTyTHRLr6vjOwaNv64/u6rRftCyIDcjDzsfbSTYsUcO9pRfvsHAd3j8F60jk6AI3cJZZwj2oNDDSInmockX3Zu1m07Yavgljq46vx5Tzk8o1flOjmw+UVD+j+l87TV9oKoCdMWekOE8XyfADL3XrDTrFEuv29M3BRcl5MbB1+KtHWZ8eF/QpKjstlX6hKF91U2hZLA82I2njeN+eSmmdBBeDFfaORvIF3FcBR7Dr0iksJCTmQrktsA482eqofPsWapTlijmSu68+POxsM3FNMZ0NK3WSigRLFZjjTWMQqibr0tTC/oh6zT89NzLfZdQeyeXq8JxYPOVn5E+4UO9qSslgD1218Gy2VE3fot2Jj+V1i9Q8AAP//AQAA///Wu4yjzQIAAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml - echo "H4sIAAAAAAAA/6yUy46qWBiF5z4Fc3MKREUwOYN/c9cCuXNwhrhBkDvoVtMP3ymqk5NOVzqdTjFgsFb2N/jzZYllcztbfXPPz7jfUjEZZmJ5G0bcm3GFt1TSVG2Ph+ENP+KqLfFb0lQzsanTPHNxf8f9dkZRIoi4H/M0T+IRD1vqjxlFUdSPjw/Jqm5Soux4uqKL4MlTOvWGrqNTIYrg5BkQHUGmG0oLZock3nQlngXfNYBRRbdTXf20lGwZicQHA2UPpQB/gqDMDBAYnhSOi6gKnqcqYI6/jDFiZaJdEtMoZGK+YGlICTlIQMKP7PU7myBTUUBkOBFRIJIC25ZksujP4a5MqnV5VoPXe2heDIUQyY52++aoX+6JCbaMkA3SBHEJEBd2CExFX756xrvy134I+TspUqN97Q5laPPcgrury8iK2Q4yfROsmj1JA+apZ4sJUoxzjUtXFk2uFlie5aVOK+hPvtFkWSGMCEQGiE3RkIFIWSQFDmOBrdEIbAkyWf08LPAqLPyzTGREE1sxwECQ8kSzpwcHhCJZMdXlKyi85L3cEWnYrei9IAWbfXPx4S/IPy8PjAyIPzPLNGLJJty36YEVOp0V1u2NFVdJLEAeqIc2cxN+goyVPXRcnzzGpTfvT2tesILxxVSETvbe43DlMo0VRXH+1NInS37+/O2NbEpfW/N/rbpXbswcoIyqX/vvtcoz2K+t+ii+zSpD4ZRVfDy3mHH89vm8xqgNyVGsySlNL5F6IPN04Jzz+83vNrZoVruKlrvNBAnDwys3IinXBfeUlK005+x8x5hLuWvbwP9Gq971quXAKSwJNK6+6PMhCYNxaQun+l+tCuzgsTb88QY6xtbNEpr14jG2Hutyyj3N+d1KFx91+ammgDa+xN6GSxIo1hjj5l1Q0xsfR6v9DuGuy9ZNUa66yqm9S/FfrBqmJRs+puwHdRnHdtjS9LVphx9JU499U5a4f8vrEfd1XL59NYnbpcDz9EyvhzGuE6z2za39HNC6OePh74XTlHhLmc0Zzz5+t/ZzT7V4uGypIP01wp4cq9rp4CjQ9XF0WT58FZbPEKBRCIyl+b2p4eTn7E8AAAD//wEAAP//2o7CUb4FAAA=" | base64 -d | gzip -d > conf/kube_env.yaml download-release 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 a393aae861bba..c062514c05370 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.containerd.example.com - serviceAccountJWKSURI: https://api.internal.containerd.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: containerd.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: containerd.example.com 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 78035746aa995..1c338712fa03e 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: containerd.example.com 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 fe885c8e9e776..54c6e4a3e051c 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.containerd.example.com - serviceAccountJWKSURI: https://api.internal.containerd.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: containerd.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: containerd.example.com 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 c08e662472f45..a7751dc02a059 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: containerd.example.com 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 1c013a1cbce8c..87abeb4e1effe 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/123.example.com - serviceAccountJWKSURI: https://discovery.example.com/123.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: 123.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: 123.example.com 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 03e0464afc592..6f83a7714a637 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: 123.example.com 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 f3001a6f852b4..48ef856500956 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 @@ -122,133 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: aws - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.23.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.docker.example.com - serviceAccountJWKSURI: https://api.internal.docker.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: aws - clusterCIDR: 100.96.0.0/11 - clusterName: docker.example.com - configureCloudRoutes: false - enableLeaderMigration: true - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.23.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.23.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: aws - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: aws - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: docker.example.com 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 10e97802c548c..704a251a822ac 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 @@ -122,33 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: aws - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: docker.example.com 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 7bd2b9d932a0b..6fd033702dc23 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.existing-iam.example.com - serviceAccountJWKSURI: https://api.internal.existing-iam.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: existing-iam.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: existing-iam.example.com 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 9f6264c009160..f20557b6cd200 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.existing-iam.example.com - serviceAccountJWKSURI: https://api.internal.existing-iam.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: existing-iam.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: existing-iam.example.com 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 a7301fba7fda3..f8b240c507499 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.existing-iam.example.com - serviceAccountJWKSURI: https://api.internal.existing-iam.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: existing-iam.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: existing-iam.example.com 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 8a14b38880673..02702074888a6 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: existing-iam.example.com 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 ddb7890be78ce..c33cc22d5a11c 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.existingsg.example.com - serviceAccountJWKSURI: https://api.internal.existingsg.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: existingsg.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: existingsg.example.com 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 c380224166c1f..9aedfdcf1d780 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.existingsg.example.com - serviceAccountJWKSURI: https://api.internal.existingsg.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: existingsg.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: existingsg.example.com 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 057a2f159c44a..0fdbbad43c23b 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.existingsg.example.com - serviceAccountJWKSURI: https://api.internal.existingsg.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: existingsg.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: existingsg.example.com 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 2f3c39e616262..aee64f94ac847 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: existingsg.example.com 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 a1aca18f9a0e4..f7343d6c7cf33 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 ee16c0f7cd6ec..0837a1ec9fe6c 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 69ec3e36a9f43..8a014d2797b06 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 ee16c0f7cd6ec..0837a1ec9fe6c 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 404d25b3a5817..0498cbb9dd732 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.externallb.example.com - serviceAccountJWKSURI: https://api.internal.externallb.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: externallb.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: externallb.example.com 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 5a840fd3d45fa..d831212a0e7fd 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: externallb.example.com 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 04e81362bf477..a53a393a9b828 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 @@ -122,132 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - auditWebhookBatchThrottleQps: 3140m - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.externalpolicies.example.com - serviceAccountJWKSURI: https://api.internal.externalpolicies.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - serviceNodePortRange: 28000-32767 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: externalpolicies.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: externalpolicies.example.com 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 019b06dfd9511..ef9bb9452c70e 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: externalpolicies.example.com 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 42a45679de9a0..6ee3e574245ef 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.ha.example.com - serviceAccountJWKSURI: https://api.internal.ha.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: ha.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: ha.example.com 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 03ddb0420d66c..2233fbb439536 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.ha.example.com - serviceAccountJWKSURI: https://api.internal.ha.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: ha.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: ha.example.com 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 d33636b59b18c..75c60a7d6027a 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.ha.example.com - serviceAccountJWKSURI: https://api.internal.ha.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: ha.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: ha.example.com 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 8a2f15931848a..0e9937869d80e 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: ha.example.com diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data index e0473d9f975be..e997ea11abc2c 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.ha-gce.example.com - serviceAccountJWKSURI: https://api.internal.ha-gce.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: ha-gce.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: ha-gce.example.com diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data index bae12741b223e..a6bdcf550c33d 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.ha-gce.example.com - serviceAccountJWKSURI: https://api.internal.ha-gce.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: ha-gce.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: ha-gce.example.com diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data index 704478a6062d2..b2376df83dac1 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.ha-gce.example.com - serviceAccountJWKSURI: https://api.internal.ha-gce.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: ha-gce.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: ha-gce.example.com diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data index 0771d5db0fdd4..622008d869ea0 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data @@ -121,30 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: ha-gce.example.com 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 69ec3e36a9f43..8a014d2797b06 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 ee16c0f7cd6ec..0837a1ec9fe6c 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 d084ed53525e0..93f91be709c7c 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 a0796e816fc18..29477f5329ac2 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 46ed490013bb8..1e53d44f3a2a8 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 aa3ba8597056f..fcb134e844e99 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 2b97ba6aba703..39707e2a8cf39 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 @@ -122,131 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - enableAggregatorRouting: true - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 172.20.128.0/17 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 b20392bf4e668..21ac4a33298d8 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 0c7b61f3c4fd9..88b74e18b532c 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 @@ -122,133 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - enableAggregatorRouting: true - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.23.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 172.20.128.0/17 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.23.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.23.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 2653e7da1e872..de1e7ba9defa4 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 @@ -122,33 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 02c3d6cf8b99b..4454b3bc04c89 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 @@ -122,131 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - enableAggregatorRouting: true - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.24.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 172.20.128.0/17 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.24.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.24.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 6a40ef687e392..11a346d32936f 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 b14aef0d570b9..1cf85d19e1d59 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 @@ -122,131 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - enableAggregatorRouting: true - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0-rc.1 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 172.20.128.0/17 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0-rc.1 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0-rc.1 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 e2a649e9289dc..799e24562847d 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 97f01f06e2b5e..45f6e20acb225 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 @@ -122,131 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - enableAggregatorRouting: true - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 172.20.128.0/17 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 169.254.20.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 169.254.20.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 90bcf6d3ec066..92f230ea3adef 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 169.254.20.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 d9e72eb1a9494..20b3b9e065168 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 @@ -122,131 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - enableAggregatorRouting: true - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 172.20.128.0/17 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 b20392bf4e668..21ac4a33298d8 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data index 03b006db214a0..3b2e71a43f8a4 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data @@ -121,122 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - enableAggregatorRouting: true - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal.example.com diff --git a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data index aad7fdb84ef18..73f46bb4fab3a 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data +++ b/tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data @@ -121,30 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal.example.com 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 d9e72eb1a9494..20b3b9e065168 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 @@ -122,131 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - enableAggregatorRouting: true - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 172.20.0.0/19 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 172.20.128.0/17 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 b20392bf4e668..21ac4a33298d8 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 172.20.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 0s - shutdownGracePeriodCriticalPods: 0s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 76e8f266d80b1..12c6b27840f25 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 @@ -122,137 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: aws - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.23.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: aws - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - enableLeaderMigration: true - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.23.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.23.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: aws - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: aws - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 4f3ede79f7821..f80b02af83e3f 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 @@ -122,33 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: aws - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - networkPluginName: cni - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 bced2207596f1..c499bcf5c15b2 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 @@ -122,134 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.24.3 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.24.3 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.24.3 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 6af126464d4bf..058508faf6e13 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 a1928d67ea546..5d6583ee698b3 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 @@ -122,134 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0-rc.1 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0-rc.1 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0-rc.1 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 b84409d0b5172..09f8b14bb1b86 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 605bccc04c2b9..d04d1d5c0d6e2 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 @@ -122,134 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 cbd781d9dcd9b..38552205cc3d8 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 1528aa7afac4c..d95402905c63d 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -122,129 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.2 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.2 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.2 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data index 89deacb6fc358..0867c7fc67779 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 e2d379fa1493f..183b593510c00 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 @@ -122,134 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0-alpha.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0-alpha.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0-alpha.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 3fe45dd5c5bb7..3dd81cee32aae 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 663f2c52f6602..ebdb94ab3c6ba 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 @@ -122,142 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - etcdMembers: - - name: us-test-1a - volumeSize: 20 - manager: - backupRetentionDays: 30 - env: - - name: ETCD_MANAGER_HOURLY_BACKUPS_RETENTION - value: 1d - image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc - version: 3.5.9 - main: - etcdMembers: - - name: us-test-1a - volumeSize: 20 - manager: - backupRetentionDays: 90 - image: gcr.io/k8s-staging-etcdadm/etcd:v20210430-v0.1.3-739-g7da12acc - logLevel: 10 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-etcd.example.com - serviceAccountJWKSURI: https://api.internal.minimal-etcd.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal-etcd.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-etcd.example.com 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 394610256673f..b32446b8c5a04 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-etcd.example.com 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 ea13d3c3c1170..f7343d6c7cf33 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 @@ -122,136 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - etcdMembers: - - name: us-test-1a - volumeSize: 20 - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - etcdMembers: - - name: us-test-1a - volumeSize: 50 - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 ee16c0f7cd6ec..0837a1ec9fe6c 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 f79242ab95dbe..e0d9bc2de1c75 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 @@ -122,132 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: '::' - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-ipv6.example.com - serviceAccountJWKSURI: https://api.internal.minimal-ipv6.example.com/openid/v1/jwks - serviceClusterIPRange: fd00:5e4f:ce::/108 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: false - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterName: minimal-ipv6.example.com - configureCloudRoutes: false - controllers: - - '*' - - -nodeipam - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 d959362069630..6c5b7bf24d274 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 d6a37d4cf6d28..0e1b77fd9f82b 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 @@ -122,132 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: '::' - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-ipv6.example.com - serviceAccountJWKSURI: https://api.internal.minimal-ipv6.example.com/openid/v1/jwks - serviceClusterIPRange: fd00:5e4f:ce::/108 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: false - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterName: minimal-ipv6.example.com - configureCloudRoutes: false - controllers: - - '*' - - -nodeipam - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 3b2b2609a8b05..c1ed77764b3a5 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 583a8642e83c7..bdc58e03709e7 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 @@ -122,132 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: '::' - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-ipv6.example.com - serviceAccountJWKSURI: https://api.internal.minimal-ipv6.example.com/openid/v1/jwks - serviceClusterIPRange: fd00:5e4f:ce::/108 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: false - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterName: minimal-ipv6.example.com - configureCloudRoutes: false - controllers: - - '*' - - -nodeipam - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 bb953bd7aad9d..b4cab2da22803 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 583a8642e83c7..bdc58e03709e7 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 @@ -122,132 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: '::' - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-ipv6.example.com - serviceAccountJWKSURI: https://api.internal.minimal-ipv6.example.com/openid/v1/jwks - serviceClusterIPRange: fd00:5e4f:ce::/108 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: false - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterName: minimal-ipv6.example.com - configureCloudRoutes: false - controllers: - - '*' - - -nodeipam - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 bb953bd7aad9d..b4cab2da22803 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 10f5dc0df00bf..aa2e3b45c82fa 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 @@ -122,128 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com - serviceAccountJWKSURI: https://api.internal.this.is.truly.a.really.really.long.cluster-name.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com 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 380d07270290c..32758d62c8992 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 @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: this.is.truly.a.really.really.long.cluster-name.minimal.example.com 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 e5024fe03f3ed..dbc73bc1c7d2f 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-warmpool.example.com - serviceAccountJWKSURI: https://api.internal.minimal-warmpool.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal-warmpool.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-warmpool.example.com 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 eb096499c3e91..73eb9f9377cff 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-warmpool.example.com 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 049d1927f861a..0356c3ef3d6b8 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 @@ -122,123 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 29333f3f55d4e..e9663f8fa88b7 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 @@ -122,30 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data index e76f2d3d84477..8de53a003fd4e 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-gce.example.com - serviceAccountJWKSURI: https://api.internal.minimal-gce.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal-gce.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce.example.com diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data index b4f8f17ae842b..cef2a03e5ec2c 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data @@ -121,30 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce.example.com 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_user-data b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data index 27b1bd3e9255f..80470f72bc32f 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-gce.example.com - serviceAccountJWKSURI: https://api.internal.minimal-gce.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal-gce.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce.example.com diff --git a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data index abe28d68d31b8..af2a5c6a3c1b2 100644 --- a/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_dns-none/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data @@ -121,30 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce.example.com 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_user-data b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data index f259f3fa01555..8fffd7ea29574 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-ilb-example-com_metadata_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-gce-ilb.example.com - serviceAccountJWKSURI: https://api.internal.minimal-gce-ilb.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal-gce-ilb.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-ilb.example.com diff --git a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data index 80b139b3132c3..d5ec4509cd83f 100644 --- a/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_ilb/data/google_compute_instance_template_nodes-minimal-gce-ilb-example-com_metadata_user-data @@ -121,30 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-ilb.example.com 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_user-data 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_user-data index e21c597316052..6266b28a55253 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_user-data +++ 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_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com - serviceAccountJWKSURI: https://api.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com 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_user-data 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_user-data index 0cd2d482e3124..2cfbd55440f3d 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_user-data +++ 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_user-data @@ -121,30 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com 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_user-data 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_user-data index 684e1b206a682..dd4e11b113a88 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_user-data +++ 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_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com - serviceAccountJWKSURI: https://api.internal.minimal-gce-with-a-very-very-very-very-very-long-name.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com 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_user-data 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_user-data index 0cd2d482e3124..2cfbd55440f3d 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_user-data +++ 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_user-data @@ -121,30 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-with-a-very-very-very-very-very-long-name.example.com diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data index d9ec20f8ba4d0..d030fd0203401 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_master-us-test1-a-minimal-gce-plb-example-com_metadata_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-gce-plb.example.com - serviceAccountJWKSURI: https://api.internal.minimal-gce-plb.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal-gce-plb.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-plb.example.com diff --git a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data index d926c8dfca9a0..234b1b84e32d3 100644 --- a/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_plb/data/google_compute_instance_template_nodes-minimal-gce-plb-example-com_metadata_user-data @@ -121,30 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-plb.example.com 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_user-data b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data index 1e094e59aaf92..e33f1116f9033 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_user-data @@ -121,121 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-gce-private.example.com - serviceAccountJWKSURI: https://api.internal.minimal-gce-private.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal-gce-private.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-private.example.com diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data index 307fc1aab61fd..5a8933ce3858f 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_user-data @@ -121,30 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - hairpinMode: promiscuous-bridge - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: gce ClusterName: minimal-gce-private.example.com 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 bafd265e2c6e4..e2ca235b305d4 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.k8s.local - serviceAccountJWKSURI: https://api.internal.minimal.k8s.local/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.k8s.local - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.k8s.local 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 1e60d94310f28..809e34d91991e 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.k8s.local 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 90cbf988c03b0..3b29ddde2f527 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.k8s.local - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.k8s.local 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 1e60d94310f28..809e34d91991e 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.k8s.local 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 9c81a47adf586..75bd33597780c 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 @@ -122,119 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: hetzner ClusterName: minimal.example.com 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 589a4a3289420..66a48d0d4dd05 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 @@ -121,29 +121,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: hetzner ClusterName: minimal.example.com diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data index 069867d7be5a2..397cae3f3497e 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data +++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_control-plane-fr-par-1_user_data @@ -124,119 +124,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - cpuRequest: 100m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 - main: - cpuRequest: 200m - manager: - backupRetentionDays: 90 - memoryRequest: 100Mi - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: Node,RBAC - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - image: registry.k8s.io/kube-apiserver:v1.25.5 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.scw-minimal.k8s.local - serviceAccountJWKSURI: https://api.internal.scw-minimal.k8s.local/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: scw-minimal.k8s.local - configureCloudRoutes: false - image: registry.k8s.io/kube-controller-manager:v1.25.5 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - image: registry.k8s.io/kube-scheduler:v1.25.5 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: scaleway ClusterName: scw-minimal.k8s.local diff --git a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data index 5733aa7836df7..17798960fdf93 100644 --- a/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data +++ b/tests/integration/update_cluster/minimal_scaleway/data/scaleway_instance_server_nodes-fr-par-1_user_data @@ -124,29 +124,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: scaleway ClusterName: scw-minimal.k8s.local 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 d2c8719e2f8a4..476fd470a95ae 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.mixedinstances.example.com - serviceAccountJWKSURI: https://api.internal.mixedinstances.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: mixedinstances.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: mixedinstances.example.com 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 0c4532ebbbc53..955759b1f0d9e 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.mixedinstances.example.com - serviceAccountJWKSURI: https://api.internal.mixedinstances.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: mixedinstances.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: mixedinstances.example.com 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 9ad0c5fbc6e25..b9355bfb4b988 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.mixedinstances.example.com - serviceAccountJWKSURI: https://api.internal.mixedinstances.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: mixedinstances.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: mixedinstances.example.com 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 9fc9bd098d351..c5042afb55d7e 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: mixedinstances.example.com 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 d2c8719e2f8a4..476fd470a95ae 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.mixedinstances.example.com - serviceAccountJWKSURI: https://api.internal.mixedinstances.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: mixedinstances.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: mixedinstances.example.com 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 0c4532ebbbc53..955759b1f0d9e 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.mixedinstances.example.com - serviceAccountJWKSURI: https://api.internal.mixedinstances.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: mixedinstances.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: mixedinstances.example.com 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 9ad0c5fbc6e25..b9355bfb4b988 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 3 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.mixedinstances.example.com - serviceAccountJWKSURI: https://api.internal.mixedinstances.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: mixedinstances.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: mixedinstances.example.com 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 9fc9bd098d351..c5042afb55d7e 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: mixedinstances.example.com 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 a79abc0f0fe99..c7a458bd7d2d7 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: nthimdsprocessor.longclustername.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: nthimdsprocessor.longclustername.example.com 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 a956eaf48520d..a0dfd26b767e2 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: nthimdsprocessor.longclustername.example.com 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 a279100588a3f..b51d941155e0e 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.nthimdsprocessor.longclustername.example.com - serviceAccountJWKSURI: https://api.internal.nthimdsprocessor.longclustername.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: nthimdsprocessor.longclustername.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: nthimdsprocessor.longclustername.example.com 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 a956eaf48520d..a0dfd26b767e2 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: nthimdsprocessor.longclustername.example.com 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 1cfe57a0604cb..185a045c23603 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal.example.com - serviceAccountJWKSURI: https://api.internal.minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 a99b5a1c7823d..181cc602c3d90 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 b3a962998ca6c..03c22f9b64210 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.private-shared-ip.example.com - serviceAccountJWKSURI: https://api.internal.private-shared-ip.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: private-shared-ip.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: private-shared-ip.example.com 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 a4cc7f2c46f2b..fecf480ee69e1 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: private-shared-ip.example.com 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 09c48385a7d28..f262b262b2377 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.private-shared-subnet.example.com - serviceAccountJWKSURI: https://api.internal.private-shared-subnet.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: private-shared-subnet.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: private-shared-subnet.example.com 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 113078cbfbbfd..ec328ed3aaa3a 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: private-shared-subnet.example.com 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 c903dfb96487b..e53d5acaf4b76 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privatecalico.example.com - serviceAccountJWKSURI: https://api.internal.privatecalico.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privatecalico.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecalico.example.com 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 e19e26b989c8d..1a213b492800d 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecalico.example.com 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 139561e07d389..b8937002f9945 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privatecanal.example.com - serviceAccountJWKSURI: https://api.internal.privatecanal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privatecanal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecanal.example.com 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 df1b9dd5ee483..5629d6fc1b7c4 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecanal.example.com 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 1c42f82c7fa54..3f403688fb02e 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privatecilium.example.com - serviceAccountJWKSURI: https://api.internal.privatecilium.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privatecilium.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecilium.example.com 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 92b6115295a3a..24826be2bfeb1 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecilium.example.com 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 08f8f793721b1..3121dca42aea7 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privatecilium.example.com - serviceAccountJWKSURI: https://api.internal.privatecilium.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privatecilium.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecilium.example.com 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 b018869ca31ab..056c1654bb983 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecilium.example.com 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 50e58cc0abf49..4edbaa7f11682 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.24.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privatecilium.example.com - serviceAccountJWKSURI: https://api.internal.privatecilium.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privatecilium.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.24.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.24.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecilium.example.com 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 cb6f1c71776b6..3d6e0c27da918 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatecilium.example.com 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 3360b2ef070d0..268aa424c4e96 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 @@ -122,134 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - cilium: - manager: - backupRetentionDays: 90 - version: 3.5.9 - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privateciliumadvanced.example.com - serviceAccountJWKSURI: https://api.internal.privateciliumadvanced.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privateciliumadvanced.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privateciliumadvanced.example.com 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 c874eb03ee16b..04e38c57fdd23 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privateciliumadvanced.example.com 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 5dfe2e7037bce..124a940928fea 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 @@ -122,125 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.27.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privatedns1.example.com - serviceAccountJWKSURI: https://api.internal.privatedns1.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privatedns1.example.com - configureCloudRoutes: false - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.27.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.27.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatedns1.example.com 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 045974974bad9..15d4fe41a664a 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 @@ -122,31 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatedns1.example.com 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 860662c749a1f..8e326207d7d46 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privatedns2.example.com - serviceAccountJWKSURI: https://api.internal.privatedns2.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privatedns2.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatedns2.example.com 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 405823661bfd5..05bf62d57ceba 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatedns2.example.com 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 6726ded0dd225..cba30b1cebcb3 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privateflannel.example.com - serviceAccountJWKSURI: https://api.internal.privateflannel.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privateflannel.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privateflannel.example.com 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 d4e74a98c121c..b734dc2e07b37 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privateflannel.example.com 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 ac32b6b1abe74..5b869ba529a4d 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.privatekopeio.example.com - serviceAccountJWKSURI: https://api.internal.privatekopeio.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: privatekopeio.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatekopeio.example.com 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 a712f427aa1df..068083f98bad2 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: privatekopeio.example.com 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 e064ff06659e2..23b4223345663 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 @@ -122,131 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - ServiceAccountIssuerDiscovery: "true" - image: registry.k8s.io/kube-apiserver:v1.24.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.24.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.24.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 92118dcc1a1b7..59e438c80eae4 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 c2b1184d7fe23..66269010ce7d8 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.sharedsubnet.example.com - serviceAccountJWKSURI: https://api.internal.sharedsubnet.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: sharedsubnet.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: sharedsubnet.example.com 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 5eea83f1afceb..809d742e92d51 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: sharedsubnet.example.com 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 d265e83533469..24ece8b11ca43 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.sharedvpc.example.com - serviceAccountJWKSURI: https://api.internal.sharedvpc.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: sharedvpc.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: sharedvpc.example.com 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 b8266ddc43dac..86d572f47cd8b 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: sharedvpc.example.com 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 583a8642e83c7..bdc58e03709e7 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 @@ -122,132 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: '::' - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.25.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.minimal-ipv6.example.com - serviceAccountJWKSURI: https://api.internal.minimal-ipv6.example.com/openid/v1/jwks - serviceClusterIPRange: fd00:5e4f:ce::/108 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: false - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterName: minimal-ipv6.example.com - configureCloudRoutes: false - controllers: - - '*' - - -nodeipam - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.25.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 bb953bd7aad9d..b4cab2da22803 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: fd00:5e4f:ce::a - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal-ipv6.example.com 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 9294cd55573b7..78bed8a3837aa 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://api.internal.unmanaged.example.com - serviceAccountJWKSURI: https://api.internal.unmanaged.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: unmanaged.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: unmanaged.example.com 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 aeb5137d5ad57..20248ed2cad4b 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: unmanaged.example.com 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 69ec3e36a9f43..8a014d2797b06 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 @@ -122,130 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -encryptionConfig: null -etcdClusters: - events: - manager: - backupRetentionDays: 90 - version: 3.5.9 - main: - manager: - backupRetentionDays: 90 - version: 3.5.9 -kubeAPIServer: - allowPrivileged: true - anonymousAuth: false - apiAudiences: - - kubernetes.svc.default - apiServerCount: 1 - authorizationMode: AlwaysAllow - bindAddress: 0.0.0.0 - cloudProvider: external - enableAdmissionPlugins: - - NamespaceLifecycle - - LimitRanger - - ServiceAccount - - DefaultStorageClass - - DefaultTolerationSeconds - - MutatingAdmissionWebhook - - ValidatingAdmissionWebhook - - NodeRestriction - - ResourceQuota - etcdServers: - - https://127.0.0.1:4001 - etcdServersOverrides: - - /events#https://127.0.0.1:4002 - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 - kubeletPreferredAddressTypes: - - InternalIP - - Hostname - - ExternalIP - logLevel: 2 - requestheaderAllowedNames: - - aggregator - requestheaderExtraHeaderPrefixes: - - X-Remote-Extra- - requestheaderGroupHeaders: - - X-Remote-Group - requestheaderUsernameHeaders: - - X-Remote-User - securePort: 443 - serviceAccountIssuer: https://discovery.example.com/minimal.example.com - serviceAccountJWKSURI: https://discovery.example.com/minimal.example.com/openid/v1/jwks - serviceClusterIPRange: 100.64.0.0/13 - storageBackend: etcd3 -kubeControllerManager: - allocateNodeCIDRs: true - attachDetachReconcileSyncPeriod: 1m0s - cloudProvider: external - clusterCIDR: 100.96.0.0/11 - clusterName: minimal.example.com - configureCloudRoutes: false - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 - useServiceAccountCredentials: true -kubeScheduler: - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 - leaderElection: - leaderElect: true - logLevel: 2 -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s -masterKubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com 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 ee16c0f7cd6ec..0837a1ec9fe6c 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 @@ -122,32 +122,6 @@ function download-release() { echo "== nodeup node config starting ==" ensure-install-dir -cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' -cloudConfig: - manageStorageClasses: true -kubelet: - anonymousAuth: false - cgroupDriver: systemd - cgroupRoot: / - cloudProvider: external - clusterDNS: 100.64.0.10 - clusterDomain: cluster.local - enableDebuggingHandlers: true - evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% - featureGates: - CSIMigrationAWS: "true" - InTreePluginAWSUnregister: "true" - kubeconfigPath: /var/lib/kubelet/kubeconfig - logLevel: 2 - podInfraContainerImage: registry.k8s.io/pause:3.9 - podManifestPath: /etc/kubernetes/manifests - protectKernelDefaults: true - registerSchedulable: true - shutdownGracePeriod: 30s - shutdownGracePeriodCriticalPods: 10s - -__EOF_CLUSTER_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' CloudProvider: aws ClusterName: minimal.example.com