Revert "Increse imdv2 hop limit on control plane nodes"

This reverts commit 4e00e29fc3.
2021-02-04 17:57:23 +01:00 · 2021-02-04 17:57:23 +01:00 · a4c36af9de
parent beb8b62746
commit a4c36af9de
17 changed files with 1 additions and 29 deletions
--- a/tests/integration/create_cluster/complex/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/complex/expected-v1alpha2.yaml
@ -65,7 +65,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/ha/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/ha/expected-v1alpha2.yaml
@ -85,7 +85,6 @@ metadata:
 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
@ -108,7 +107,6 @@ metadata:
 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
@ -131,7 +129,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/ha_encrypt/expected-v1alpha2.yaml
@ -85,7 +85,6 @@ metadata:
 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
@ -108,7 +107,6 @@ metadata:
 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
@ -131,7 +129,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/ha_shared_zone/expected-v1alpha2.yaml
@ -77,7 +77,6 @@ metadata:
 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
@ -100,7 +99,6 @@ metadata:
 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
@ -123,7 +121,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/ha_shared_zones/expected-v1alpha2.yaml
@ -93,7 +93,6 @@ metadata:
 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
@ -116,7 +115,6 @@ metadata:
 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
@ -139,7 +137,6 @@ metadata:
 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
@ -162,7 +159,6 @@ metadata:
 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
@ -185,7 +181,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/ingwspecified/expected-v1alpha2.yaml
@ -94,7 +94,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/minimal-1.18/expected-v1alpha2.yaml
@ -65,7 +65,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/minimal-1.19/expected-v1alpha2.yaml
@ -65,7 +65,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/minimal-1.20/expected-v1alpha2.yaml
@ -65,7 +65,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/ngwspecified/expected-v1alpha2.yaml
@ -94,7 +94,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/overrides/expected-v1alpha2.yaml
@ -68,7 +68,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/private/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/private/expected-v1alpha2.yaml
@ -100,7 +100,6 @@ spec:
  - 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
--- a/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/private_shared_subnets/expected-v1alpha2.yaml
@ -74,7 +74,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/shared_subnets/expected-v1alpha2.yaml
@ -67,7 +67,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/shared_subnets_vpc_lookup/expected-v1alpha2.yaml
@ -67,7 +67,6 @@ metadata:
 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
--- a/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml
+++ b/tests/integration/create_cluster/shared_vpc/expected-v1alpha2.yaml
@ -66,7 +66,6 @@ metadata:
 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
--- a/upup/pkg/fi/cloudup/new_cluster.go
+++ b/upup/pkg/fi/cloudup/new_cluster.go
@ -679,9 +679,7 @@ func setupMasters(opt *NewClusterOptions, cluster *api.Cluster, zoneToSubnetMap
 				k8sVersion, err := version.ParseKubernetesVersion(cluster.Spec.KubernetesVersion)
 				if err == nil && version.IsKubernetesGTE("1.18", *k8sVersion) {
 					if g.Spec.InstanceMetadata == nil {
-						g.Spec.InstanceMetadata = &api.InstanceMetadataOptions{
-							HTTPPutResponseHopLimit: fi.Int64(2),
-						}
+						g.Spec.InstanceMetadata = &api.InstanceMetadataOptions{}
 					}
 					g.Spec.InstanceMetadata.HTTPTokens = fi.String(ec2.LaunchTemplateHttpTokensStateRequired)
 					if strings.Contains(g.Spec.Image, "debian-stretch") {