diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go index eb347e790b..f6da86400e 100644 --- a/cmd/kops/integration_test.go +++ b/cmd/kops/integration_test.go @@ -401,7 +401,7 @@ func TestPrivateCilium(t *testing.T) { func TestPrivateCilium2(t *testing.T) { newIntegrationTest("privatecilium.example.com", "privatecilium2"). withPrivate(). - withAddons("networking.cilium.io-k8s-1.12", "rbac.addons.k8s.io-k8s-1.8", dnsControllerAddon). + withAddons("networking.cilium.io-k8s-1.12", dnsControllerAddon). withKubeDNS(). runTestTerraformAWS(t) newIntegrationTest("privatecilium.example.com", "privatecilium2"). diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json b/tests/integration/update_cluster/privatecilium2/cloudformation.json index 766898dfce..3ceefdfb27 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json @@ -1874,8 +1874,6 @@ "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/addons/*", "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/cluster-completed.spec", "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/igconfig/node/*", - "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/pki/private/kube-proxy/*", - "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/pki/private/kubelet/*", "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/secrets/dockerconfig" ] }, diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index 3a9871122e..dd37ff1841 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -147,9 +147,9 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope encryptionConfig: null etcdClusters: events: - version: 3.4.3 + version: 3.4.13 main: - version: 3.4.3 + version: 3.4.13 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -171,7 +171,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.18.15 + image: k8s.gcr.io/kube-apiserver:v1.19.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -195,7 +195,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope clusterCIDR: 100.96.0.0/11 clusterName: privatecilium.example.com configureCloudRoutes: false - image: k8s.gcr.io/kube-controller-manager:v1.18.15 + image: k8s.gcr.io/kube-controller-manager:v1.19.0 leaderElection: leaderElect: true logLevel: 2 @@ -203,10 +203,10 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: k8s.gcr.io/kube-proxy:v1.18.15 + image: k8s.gcr.io/kube-proxy:v1.19.0 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.18.15 + image: k8s.gcr.io/kube-scheduler:v1.19.0 leaderElection: leaderElect: true logLevel: 2 @@ -247,7 +247,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: 5edQ6jF/LuqWb8kjKQHlm/zJVGCkj/6SwmtSWvkl0EU= + NodeupConfigHash: QPowcTb0hx70EXW2JRFnx/GxS21gMl3ieV5HVprH+dw= __EOF_KUBE_ENV @@ -401,7 +401,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: k8s.gcr.io/kube-proxy:v1.18.15 + image: k8s.gcr.io/kube-proxy:v1.19.0 logLevel: 2 kubelet: anonymousAuth: false @@ -425,7 +425,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: FFuyJV2RPI+GoNiGfmdOX+PxaY8TGBx9Ff1H+8DoQ00= + NodeupConfigHash: mY9XBw10xSvvQf5RXnHs97ub5hcTK1WFJi2EODnKmiY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_iam_role_policy_nodes.privatecilium.example.com_policy b/tests/integration/update_cluster/privatecilium2/data/aws_iam_role_policy_nodes.privatecilium.example.com_policy index b871edf315..852205ccfa 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_iam_role_policy_nodes.privatecilium.example.com_policy +++ b/tests/integration/update_cluster/privatecilium2/data/aws_iam_role_policy_nodes.privatecilium.example.com_policy @@ -9,8 +9,6 @@ "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/addons/*", "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/cluster-completed.spec", "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/igconfig/node/*", - "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/pki/private/kube-proxy/*", - "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/pki/private/kubelet/*", "arn:aws-test:s3:::placeholder-read-bucket/clusters.example.com/privatecilium.example.com/secrets/dockerconfig" ] }, 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 30e130bfd5..f81aabb95f 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 @@ -145,9 +145,9 @@ docker: encryptionConfig: null etcdClusters: events: - version: 3.4.3 + version: 3.4.13 main: - version: 3.4.3 + version: 3.4.13 kubeAPIServer: allowPrivileged: true anonymousAuth: false @@ -169,7 +169,7 @@ kubeAPIServer: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.18.15 + image: k8s.gcr.io/kube-apiserver:v1.19.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -193,7 +193,7 @@ kubeControllerManager: clusterCIDR: 100.96.0.0/11 clusterName: privatecilium.example.com configureCloudRoutes: false - image: k8s.gcr.io/kube-controller-manager:v1.18.15 + image: k8s.gcr.io/kube-controller-manager:v1.19.0 leaderElection: leaderElect: true logLevel: 2 @@ -201,10 +201,10 @@ kubeControllerManager: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: k8s.gcr.io/kube-proxy:v1.18.15 + image: k8s.gcr.io/kube-proxy:v1.19.0 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.18.15 + image: k8s.gcr.io/kube-scheduler:v1.19.0 leaderElection: leaderElect: true logLevel: 2 @@ -245,7 +245,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: 5edQ6jF/LuqWb8kjKQHlm/zJVGCkj/6SwmtSWvkl0EU= +NodeupConfigHash: QPowcTb0hx70EXW2JRFnx/GxS21gMl3ieV5HVprH+dw= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data index d7e193671f..3d23094418 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 @@ -145,7 +145,7 @@ docker: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: k8s.gcr.io/kube-proxy:v1.18.15 + image: k8s.gcr.io/kube-proxy:v1.19.0 logLevel: 2 kubelet: anonymousAuth: false @@ -169,7 +169,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: FFuyJV2RPI+GoNiGfmdOX+PxaY8TGBx9Ff1H+8DoQ00= +NodeupConfigHash: mY9XBw10xSvvQf5RXnHs97ub5hcTK1WFJi2EODnKmiY= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content index a90a1db103..1746055440 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -42,14 +42,14 @@ spec: - instanceGroup: master-us-test-1a name: us-test-1a name: main - version: 3.4.3 + version: 3.4.13 - backups: backupStore: memfs://clusters.example.com/privatecilium.example.com/backups/etcd/events etcdMembers: - instanceGroup: master-us-test-1a name: us-test-1a name: events - version: 3.4.3 + version: 3.4.13 externalDns: provider: dns-controller iam: @@ -76,7 +76,7 @@ spec: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.18.15 + image: k8s.gcr.io/kube-apiserver:v1.19.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -100,7 +100,7 @@ spec: clusterCIDR: 100.96.0.0/11 clusterName: privatecilium.example.com configureCloudRoutes: false - image: k8s.gcr.io/kube-controller-manager:v1.18.15 + image: k8s.gcr.io/kube-controller-manager:v1.19.0 leaderElection: leaderElect: true logLevel: 2 @@ -122,10 +122,10 @@ spec: kubeProxy: clusterCIDR: 100.96.0.0/11 cpuRequest: 100m - image: k8s.gcr.io/kube-proxy:v1.18.15 + image: k8s.gcr.io/kube-proxy:v1.19.0 logLevel: 2 kubeScheduler: - image: k8s.gcr.io/kube-scheduler:v1.18.15 + image: k8s.gcr.io/kube-scheduler:v1.19.0 leaderElection: leaderElect: true logLevel: 2 @@ -145,7 +145,7 @@ spec: podManifestPath: /etc/kubernetes/manifests kubernetesApiAccess: - 0.0.0.0/0 - kubernetesVersion: 1.18.15 + kubernetesVersion: 1.19.0 masterInternalName: api.internal.privatecilium.example.com masterKubelet: anonymousAuth: false diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_etcd-cluster-spec-events_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_etcd-cluster-spec-events_content index 57c0617698..bb8ddb0e2e 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_etcd-cluster-spec-events_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_etcd-cluster-spec-events_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.4.3" + "etcdVersion": "3.4.13" } diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_etcd-cluster-spec-main_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_etcd-cluster-spec-main_content index 57c0617698..bb8ddb0e2e 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_etcd-cluster-spec-main_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_etcd-cluster-spec-main_content @@ -1,4 +1,4 @@ { "memberCount": 1, - "etcdVersion": "3.4.3" + "etcdVersion": "3.4.13" } diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content index a99164c335..d3ece0c021 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content @@ -20,7 +20,7 @@ APIServerConfig: - https://127.0.0.1:4001 etcdServersOverrides: - /events#https://127.0.0.1:4002 - image: k8s.gcr.io/kube-apiserver:v1.18.15 + image: k8s.gcr.io/kube-apiserver:v1.19.0 kubeletPreferredAddressTypes: - InternalIP - Hostname @@ -48,15 +48,15 @@ APIServerConfig: -----END RSA PUBLIC KEY----- Assets: amd64: - - 2d079bc9f7ac2c2d1f86df842df55f2ec8e74e01edc347994ccf1a054b9e6077@https://storage.googleapis.com/kubernetes-release/release/v1.18.15/bin/linux/amd64/kubelet - - eb5a5dd0a72795942ab81d1e4331625e80a90002c8bb39b2cb15aa707a3812c6@https://storage.googleapis.com/kubernetes-release/release/v1.18.15/bin/linux/amd64/kubectl + - 3f03e5c160a8b658d30b34824a1c00abadbac96e62c4d01bf5c9271a2debc3ab@https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/amd64/kubelet + - 79bb0d2f05487ff533999a639c075043c70a0a1ba25c1629eb1eef6ebe3ba70f@https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - 5504d190eef37355231325c176686d51ade6e0cabe2da526d561a38d8611506f@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.15.tgz - 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: - - c74f46e87aae7b9bb590319632fcb106b5efd998046dd47634c89bbb875d9fb6@https://storage.googleapis.com/kubernetes-release/release/v1.18.15/bin/linux/arm64/kubelet - - 6b4a63df325cdb523f16ffd8799745a8fdf979ef89e228c309a715671b6aa984@https://storage.googleapis.com/kubernetes-release/release/v1.18.15/bin/linux/arm64/kubectl + - d8fa5a9739ecc387dfcc55afa91ac6f4b0ccd01f1423c423dbd312d787bbb6bf@https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/arm64/kubelet + - d4adf1b6b97252025cb2f7febf55daa3f42dc305822e3da133f77fd33071ec2f@https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - 264f3396630507606a8646fda6a28a98d3ced8927df84be8ee9a74ab73cc1566@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content index 2aabf3388f..352ee3b6f3 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content @@ -1,12 +1,12 @@ Assets: amd64: - - 2d079bc9f7ac2c2d1f86df842df55f2ec8e74e01edc347994ccf1a054b9e6077@https://storage.googleapis.com/kubernetes-release/release/v1.18.15/bin/linux/amd64/kubelet - - eb5a5dd0a72795942ab81d1e4331625e80a90002c8bb39b2cb15aa707a3812c6@https://storage.googleapis.com/kubernetes-release/release/v1.18.15/bin/linux/amd64/kubectl + - 3f03e5c160a8b658d30b34824a1c00abadbac96e62c4d01bf5c9271a2debc3ab@https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/amd64/kubelet + - 79bb0d2f05487ff533999a639c075043c70a0a1ba25c1629eb1eef6ebe3ba70f@https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/amd64/kubectl - 977824932d5667c7a37aa6a3cbba40100a6873e7bd97e83e8be837e3e7afd0a8@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-amd64-v0.8.7.tgz - 5504d190eef37355231325c176686d51ade6e0cabe2da526d561a38d8611506f@https://download.docker.com/linux/static/stable/x86_64/docker-19.03.15.tgz arm64: - - c74f46e87aae7b9bb590319632fcb106b5efd998046dd47634c89bbb875d9fb6@https://storage.googleapis.com/kubernetes-release/release/v1.18.15/bin/linux/arm64/kubelet - - 6b4a63df325cdb523f16ffd8799745a8fdf979ef89e228c309a715671b6aa984@https://storage.googleapis.com/kubernetes-release/release/v1.18.15/bin/linux/arm64/kubectl + - d8fa5a9739ecc387dfcc55afa91ac6f4b0ccd01f1423c423dbd312d787bbb6bf@https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/arm64/kubelet + - d4adf1b6b97252025cb2f7febf55daa3f42dc305822e3da133f77fd33071ec2f@https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - 264f3396630507606a8646fda6a28a98d3ced8927df84be8ee9a74ab73cc1566@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz CAs: @@ -36,8 +36,6 @@ Hooks: - null - null KeypairIDs: - kube-proxy: "6986354184403674830529235586" - kubelet: "6986354184404014133128804066" kubernetes-ca: "6982820025135291416230495506" KubeletConfig: anonymousAuth: false diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content index 7d25cb3ccc..baa124a5ee 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: a458ac74b7ea2f4b7065200ec3ab0f7d424a79f07ab66c7adc6a22fd44be6b9f + manifestHash: 66aa121906873d86070881abbbdee49c35d05ed02381eb50cc0855ca3846323b name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -25,13 +25,6 @@ spec: selector: k8s-addon: kube-dns.addons.k8s.io version: 9.99.0 - - id: k8s-1.8 - manifest: rbac.addons.k8s.io/k8s-1.8.yaml - manifestHash: f81bd7c57bc1902ca342635d7ad7d01b82dfeaff01a1192b076e66907d87871e - name: rbac.addons.k8s.io - selector: - k8s-addon: rbac.addons.k8s.io - version: 9.99.0 - id: k8s-1.9 manifest: kubelet-api.rbac.addons.k8s.io/k8s-1.9.yaml manifestHash: 01c120e887bd98d82ef57983ad58a0b22bc85efb48108092a24c4b82e4c9ea81 diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content index 18ddd5721c..39a96f5f1b 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-kops-controller.addons.k8s.io-k8s-1.16_content @@ -1,7 +1,7 @@ apiVersion: v1 data: config.yaml: | - {"cloud":"aws","configBase":"memfs://clusters.example.com/privatecilium.example.com"} + {"cloud":"aws","configBase":"memfs://clusters.example.com/privatecilium.example.com","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.privatecilium.example.com"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}} kind: ConfigMap metadata: creationTimestamp: null @@ -32,6 +32,8 @@ spec: k8s-app: kops-controller template: metadata: + annotations: + dns.alpha.kubernetes.io/internal: kops-controller.internal.privatecilium.example.com labels: k8s-addon: kops-controller.addons.k8s.io k8s-app: kops-controller diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-rbac.addons.k8s.io-k8s-1.8_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-rbac.addons.k8s.io-k8s-1.8_content deleted file mode 100644 index ba115283a8..0000000000 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_privatecilium.example.com-addons-rbac.addons.k8s.io-k8s-1.8_content +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - creationTimestamp: null - labels: - addon.kops.k8s.io/name: rbac.addons.k8s.io - addonmanager.kubernetes.io/mode: Reconcile - app.kubernetes.io/managed-by: kops - k8s-addon: rbac.addons.k8s.io - kubernetes.io/cluster-service: "true" - name: kubelet-cluster-admin -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: system:node -subjects: -- apiGroup: rbac.authorization.k8s.io - kind: User - name: kubelet diff --git a/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml b/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml index 50ebe7e1c6..166714aabc 100644 --- a/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml +++ b/tests/integration/update_cluster/privatecilium2/in-v1alpha2.yaml @@ -21,7 +21,7 @@ spec: iam: {} kubelet: anonymousAuth: false - kubernetesVersion: v1.18.15 + kubernetesVersion: v1.19.0 masterInternalName: api.internal.privatecilium.example.com masterPublicName: api.privatecilium.example.com networkCIDR: 172.20.0.0/16 diff --git a/tests/integration/update_cluster/privatecilium2/kubernetes.tf b/tests/integration/update_cluster/privatecilium2/kubernetes.tf index a688527628..641e5bb100 100644 --- a/tests/integration/update_cluster/privatecilium2/kubernetes.tf +++ b/tests/integration/update_cluster/privatecilium2/kubernetes.tf @@ -906,14 +906,6 @@ resource "aws_s3_bucket_object" "privatecilium-example-com-addons-networking-cil server_side_encryption = "AES256" } -resource "aws_s3_bucket_object" "privatecilium-example-com-addons-rbac-addons-k8s-io-k8s-1-8" { - bucket = "testingBucket" - content = file("${path.module}/data/aws_s3_bucket_object_privatecilium.example.com-addons-rbac.addons.k8s.io-k8s-1.8_content") - key = "clusters.example.com/privatecilium.example.com/addons/rbac.addons.k8s.io/k8s-1.8.yaml" - provider = aws.files - server_side_encryption = "AES256" -} - resource "aws_s3_bucket_object" "privatecilium-example-com-addons-storage-aws-addons-k8s-io-v1-15-0" { bucket = "testingBucket" content = file("${path.module}/data/aws_s3_bucket_object_privatecilium.example.com-addons-storage-aws.addons.k8s.io-v1.15.0_content")