From e63cb44bd06e4b5d079f53f164d526035d29f84e Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Tue, 7 Mar 2023 20:32:30 -0600 Subject: [PATCH] Update integration tests --- ...test-1a.masters.minimal.example.com_user_data | 13 ++++--------- ..._template_nodes.minimal.example.com_user_data | 3 +-- .../aws_s3_object_cluster-completed.spec_content | 15 +++++---------- ...object_nodeupconfig-master-us-test-1a_content | 16 +++++++--------- .../aws_s3_object_nodeupconfig-nodes_content | 13 ++++++------- .../update_cluster/minimal/in-v1alpha2.yaml | 2 +- .../update_cluster/minimal/kubernetes.tf | 4 ++-- 7 files changed, 26 insertions(+), 40 deletions(-) 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 dbc83b5b41..079727a08d 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 @@ -165,9 +165,8 @@ kubeAPIServer: etcdServersOverrides: - /events#https://127.0.0.1:4002 featureGates: - CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 + image: registry.k8s.io/kube-apiserver:v1.27.0-alpha.3 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -194,18 +193,16 @@ kubeControllerManager: clusterName: minimal.example.com configureCloudRoutes: false featureGates: - CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 + image: registry.k8s.io/kube-controller-manager:v1.27.0-alpha.3 leaderElection: leaderElect: true logLevel: 2 useServiceAccountCredentials: true kubeScheduler: featureGates: - CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 + image: registry.k8s.io/kube-scheduler:v1.27.0-alpha.3 leaderElection: leaderElect: true logLevel: 2 @@ -218,7 +215,6 @@ kubelet: 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 @@ -237,7 +233,6 @@ masterKubelet: 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 @@ -255,7 +250,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: ControlPlane -NodeupConfigHash: qs2Dqrv+n4jC1CyCgW7GHJb4vxxWX0kTclrpISNaXbM= +NodeupConfigHash: LK28jx4zFWr03Rl5sqhQ9qw6m5KA9oSUFPVQn8UO9sM= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data index 2b69583003..a6486c9113 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 @@ -134,7 +134,6 @@ kubelet: 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 @@ -175,7 +174,7 @@ ConfigServer: - https://kops-controller.internal.minimal.example.com:3988/ InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: CijA+/e4TyCQMOWKuG9cIDmsSObl7nI9mJ0UUs+pXkA= +NodeupConfigHash: hxKFNl0FmjKAp4JYI67LnZwYfLJn2iYMX87YsKLE+7I= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content index 3b23249ffe..f7bd9c6ab2 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_cluster-completed.spec_content @@ -87,9 +87,8 @@ spec: etcdServersOverrides: - /events#https://127.0.0.1:4002 featureGates: - CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 + image: registry.k8s.io/kube-apiserver:v1.27.0-alpha.3 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -116,9 +115,8 @@ spec: clusterName: minimal.example.com configureCloudRoutes: false featureGates: - CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-controller-manager:v1.26.0 + image: registry.k8s.io/kube-controller-manager:v1.27.0-alpha.3 leaderElection: leaderElect: true logLevel: 2 @@ -140,13 +138,12 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 + image: registry.k8s.io/kube-proxy:v1.27.0-alpha.3 logLevel: 2 kubeScheduler: featureGates: - CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-scheduler:v1.26.0 + image: registry.k8s.io/kube-scheduler:v1.27.0-alpha.3 leaderElection: leaderElect: true logLevel: 2 @@ -159,7 +156,6 @@ spec: 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 @@ -171,7 +167,7 @@ spec: shutdownGracePeriodCriticalPods: 10s kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.26.0 + kubernetesVersion: 1.27.0-alpha.3 masterKubelet: cgroupDriver: systemd cgroupRoot: / @@ -181,7 +177,6 @@ spec: 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 diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index c0d7fa8aa2..c71e2f97e4 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -23,9 +23,8 @@ APIServerConfig: etcdServersOverrides: - /events#https://127.0.0.1:4002 featureGates: - CSIMigrationAWS: "true" InTreePluginAWSUnregister: "true" - image: registry.k8s.io/kube-apiserver:v1.26.0 + image: registry.k8s.io/kube-apiserver:v1.27.0-alpha.3 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -55,16 +54,16 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/amd64/kubelet - - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/amd64/kubectl + - be5e79c70e926019e588c8c5c44d93efb1042f3be6f1db0de14e707141564d29@https://storage.googleapis.com/kubernetes-release/release/v1.27.0-alpha.3/bin/linux/amd64/kubelet + - 4d416a4bed7c1bb576e284fc6b0bb843f879c08fa8e4beb7e2376305d2dc8299@https://storage.googleapis.com/kubernetes-release/release/v1.27.0-alpha.3/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - c4e516376a2392520a87abea94baf2045cc3a67e9e0c90c75fb6ed038170561e@https://github.com/containerd/containerd/releases/download/v1.6.18/containerd-1.6.18-linux-amd64.tar.gz - db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64 - f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64 - 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64 arm64: - - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/arm64/kubelet - - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/arm64/kubectl + - 2a15e9c291dce3e07db5d9948d5c37a4e52c9884343f63287189e4f0d4c3df76@https://storage.googleapis.com/kubernetes-release/release/v1.27.0-alpha.3/bin/linux/arm64/kubelet + - c5fad9f96ab5fe04b8927ce83ceefc4db65b032303a23b35e353276479450d2a@https://storage.googleapis.com/kubernetes-release/release/v1.27.0-alpha.3/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - 56b83a0bc955edc5ebaa3bd0f788e654b63395be00fcb1bd03ff4bdfe4b5e1e7@https://github.com/containerd/containerd/releases/download/v1.6.18/containerd-1.6.18-linux-arm64.tar.gz - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 @@ -246,7 +245,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 + image: registry.k8s.io/kube-proxy:v1.27.0-alpha.3 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -257,7 +256,6 @@ KubeletConfig: 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 @@ -273,7 +271,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 10s taints: - node-role.kubernetes.io/control-plane=:NoSchedule -KubernetesVersion: 1.26.0 +KubernetesVersion: 1.27.0-alpha.3 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content index 506ba2de01..351fca81a5 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_object_nodeupconfig-nodes_content @@ -1,13 +1,13 @@ Assets: amd64: - - b64949fe696c77565edbe4100a315b6bf8f0e2325daeb762f7e865f16a6e54b5@https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/amd64/kubelet - - b6769d8ac6a0ed0f13b307d289dc092ad86180b08f5b5044af152808c04950ae@https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/amd64/kubectl + - be5e79c70e926019e588c8c5c44d93efb1042f3be6f1db0de14e707141564d29@https://storage.googleapis.com/kubernetes-release/release/v1.27.0-alpha.3/bin/linux/amd64/kubelet + - 4d416a4bed7c1bb576e284fc6b0bb843f879c08fa8e4beb7e2376305d2dc8299@https://storage.googleapis.com/kubernetes-release/release/v1.27.0-alpha.3/bin/linux/amd64/kubectl - 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz - c4e516376a2392520a87abea94baf2045cc3a67e9e0c90c75fb6ed038170561e@https://github.com/containerd/containerd/releases/download/v1.6.18/containerd-1.6.18-linux-amd64.tar.gz - db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64 arm64: - - fb033c1d079cac8babb04a25abecbc6cc1a2afb53f56ef1d73f8dc3b15b3c09e@https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/arm64/kubelet - - 79b14e4ddada9e81d2989f36a89faa9e56f8abe6e0246e7bdc305c93c3731ea4@https://storage.googleapis.com/kubernetes-release/release/v1.26.0/bin/linux/arm64/kubectl + - 2a15e9c291dce3e07db5d9948d5c37a4e52c9884343f63287189e4f0d4c3df76@https://storage.googleapis.com/kubernetes-release/release/v1.27.0-alpha.3/bin/linux/arm64/kubelet + - c5fad9f96ab5fe04b8927ce83ceefc4db65b032303a23b35e353276479450d2a@https://storage.googleapis.com/kubernetes-release/release/v1.27.0-alpha.3/bin/linux/arm64/kubectl - ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz - 56b83a0bc955edc5ebaa3bd0f788e654b63395be00fcb1bd03ff4bdfe4b5e1e7@https://github.com/containerd/containerd/releases/download/v1.6.18/containerd-1.6.18-linux-arm64.tar.gz - dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64 @@ -22,7 +22,7 @@ KeypairIDs: KubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: registry.k8s.io/kube-proxy:v1.26.0 + image: registry.k8s.io/kube-proxy:v1.27.0-alpha.3 logLevel: 2 KubeletConfig: cgroupDriver: systemd @@ -33,7 +33,6 @@ KubeletConfig: 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 @@ -45,7 +44,7 @@ KubeletConfig: registerSchedulable: true shutdownGracePeriod: 30s shutdownGracePeriodCriticalPods: 10s -KubernetesVersion: 1.26.0 +KubernetesVersion: 1.27.0-alpha.3 Networking: nonMasqueradeCIDR: 100.64.0.0/10 serviceClusterIPRange: 100.64.0.0/13 diff --git a/tests/integration/update_cluster/minimal/in-v1alpha2.yaml b/tests/integration/update_cluster/minimal/in-v1alpha2.yaml index 20efdf12e9..4dd745a856 100644 --- a/tests/integration/update_cluster/minimal/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/minimal/in-v1alpha2.yaml @@ -18,7 +18,7 @@ spec: - instanceGroup: master-us-test-1a name: us-test-1a name: events - kubernetesVersion: v1.26.0 + kubernetesVersion: v1.27.0-alpha.3 masterPublicName: api.minimal.example.com networkCIDR: 172.20.0.0/16 networking: diff --git a/tests/integration/update_cluster/minimal/kubernetes.tf b/tests/integration/update_cluster/minimal/kubernetes.tf index 235e16a6ea..2096b241c7 100644 --- a/tests/integration/update_cluster/minimal/kubernetes.tf +++ b/tests/integration/update_cluster/minimal/kubernetes.tf @@ -334,7 +334,7 @@ resource "aws_launch_template" "master-us-test-1a-masters-minimal-example-com" { http_endpoint = "enabled" http_protocol_ipv6 = "disabled" http_put_response_hop_limit = 1 - http_tokens = "optional" + http_tokens = "required" } monitoring { enabled = false @@ -413,7 +413,7 @@ resource "aws_launch_template" "nodes-minimal-example-com" { http_endpoint = "enabled" http_protocol_ipv6 = "disabled" http_put_response_hop_limit = 1 - http_tokens = "optional" + http_tokens = "required" } monitoring { enabled = false