Merge pull request #10729 from olemarkus/imdsv2-not-default

Revert making imdsv2 default
kubernetes · Feb 4, 2021 · 0271f0e · 0271f0e
2 parents c954793 + 364b0ce
commit 0271f0e
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 153 deletions.
diff --git a/docs/releases/1.20-NOTES.md b/docs/releases/1.20-NOTES.md
@@ -11,7 +11,6 @@
 * Default settings for AWS instances are updated to take advantage of recent performance and security features:
     * Default root volume encryption changes to enabled
     * Default root volume type changes from `gp2` to `gp3`
-    * Default instance metadata service (IMDS) v2 changes from `optional` to `required` for newly created clusters
 
 * Added [template funtions](https://kops.sigs.k8s.io/operations/cluster_template/#template-functions) for kubernetes version based on channel data.
 

diff --git a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml
@@ -64,9 +64,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -87,8 +84,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml
@@ -84,9 +84,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -107,9 +104,6 @@ metadata:
   name: master-us-test-1b
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -130,9 +124,6 @@ metadata:
   name: master-us-test-1c
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -153,8 +144,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1
@@ -175,8 +164,6 @@ metadata:
   name: nodes-us-test-1b
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1
@@ -197,8 +184,6 @@ metadata:
   name: nodes-us-test-1c
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml
@@ -84,9 +84,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -107,9 +104,6 @@ metadata:
   name: master-us-test-1b
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -130,9 +124,6 @@ metadata:
   name: master-us-test-1c
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -153,8 +144,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1
@@ -175,8 +164,6 @@ metadata:
   name: nodes-us-test-1b
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1
@@ -197,8 +184,6 @@ metadata:
   name: nodes-us-test-1c
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml
@@ -76,9 +76,6 @@ metadata:
   name: master-us-test-1a-1
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -99,9 +96,6 @@ metadata:
   name: master-us-test-1a-2
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -122,9 +116,6 @@ metadata:
   name: master-us-test-1a-3
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -145,8 +136,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml
@@ -92,9 +92,6 @@ metadata:
   name: master-us-test-1a-1
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -115,9 +112,6 @@ metadata:
   name: master-us-test-1a-2
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -138,9 +132,6 @@ metadata:
   name: master-us-test-1a-3
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -161,9 +152,6 @@ metadata:
   name: master-us-test-1b-1
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -184,9 +172,6 @@ metadata:
   name: master-us-test-1b-2
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -207,8 +192,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1
@@ -229,8 +212,6 @@ metadata:
   name: nodes-us-test-1b
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml
@@ -93,9 +93,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -116,8 +113,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml
@@ -64,9 +64,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -87,8 +84,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml
@@ -64,9 +64,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -87,8 +84,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml b/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml
@@ -64,9 +64,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -87,8 +84,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml
@@ -93,9 +93,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -116,8 +113,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml
@@ -67,9 +67,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -90,8 +87,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/private/expected-v1alpha2.yaml b/tests/integration/create_cluster/private/expected-v1alpha2.yaml
@@ -99,9 +99,6 @@ spec:
   - sg-exampleid3
   - sg-exampleid4
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -125,8 +122,6 @@ spec:
   - sg-exampleid
   - sg-exampleid2
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1

diff --git a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml
@@ -73,9 +73,6 @@ metadata:
   name: master-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpPutResponseHopLimit: 2
-    httpTokens: required
   machineType: m3.medium
   maxSize: 1
   minSize: 1
@@ -96,8 +93,6 @@ metadata:
   name: nodes-us-test-1a
 spec:
   image: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210119.1
-  instanceMetadata:
-    httpTokens: required
   machineType: t2.medium
   maxSize: 1
   minSize: 1