From 30f98bd142f498d9fbfb4b3d8b167a3a49351368 Mon Sep 17 00:00:00 2001 From: Penugonda Date: Thu, 25 Jun 2020 15:14:00 -0400 Subject: [PATCH] removed custom networking default vars, introspection var --- config/master/aws-k8s-cni-cn.yaml | 6 ------ config/master/aws-k8s-cni-us-gov-east-1.yaml | 6 ------ config/master/aws-k8s-cni-us-gov-west-1.yaml | 6 ------ config/master/aws-k8s-cni.yaml | 6 ------ config/master/manifests.jsonnet | 3 --- 5 files changed, 27 deletions(-) diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml index 1951b9684e..1096a84199 100644 --- a/config/master/aws-k8s-cni-cn.yaml +++ b/config/master/aws-k8s-cni-cn.yaml @@ -125,12 +125,6 @@ "value": "false" - "name": "DISABLE_METRICS" "value": "false" - - "name": "ENI_CONFIG_ANNOTATION_DEF" - "value": "k8s.amazonaws.com/eniConfig" - - "name": "ENI_CONFIG_LABEL_DEF" - "value": "k8s.amazonaws.com/eniConfig" - - "name": "INTROSPECTION_BIND_ADDRESS" - "value": "127.0.0.1:61679" - "name": "MY_NODE_NAME" "valueFrom": "fieldRef": diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml index 46dae12d91..6a14dc06ef 100644 --- a/config/master/aws-k8s-cni-us-gov-east-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-east-1.yaml @@ -125,12 +125,6 @@ "value": "false" - "name": "DISABLE_METRICS" "value": "false" - - "name": "ENI_CONFIG_ANNOTATION_DEF" - "value": "k8s.amazonaws.com/eniConfig" - - "name": "ENI_CONFIG_LABEL_DEF" - "value": "k8s.amazonaws.com/eniConfig" - - "name": "INTROSPECTION_BIND_ADDRESS" - "value": "127.0.0.1:61679" - "name": "MY_NODE_NAME" "valueFrom": "fieldRef": diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml index 3da1449442..be527d164b 100644 --- a/config/master/aws-k8s-cni-us-gov-west-1.yaml +++ b/config/master/aws-k8s-cni-us-gov-west-1.yaml @@ -125,12 +125,6 @@ "value": "false" - "name": "DISABLE_METRICS" "value": "false" - - "name": "ENI_CONFIG_ANNOTATION_DEF" - "value": "k8s.amazonaws.com/eniConfig" - - "name": "ENI_CONFIG_LABEL_DEF" - "value": "k8s.amazonaws.com/eniConfig" - - "name": "INTROSPECTION_BIND_ADDRESS" - "value": "127.0.0.1:61679" - "name": "MY_NODE_NAME" "valueFrom": "fieldRef": diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml index 8e944c5b09..9629afd9c1 100644 --- a/config/master/aws-k8s-cni.yaml +++ b/config/master/aws-k8s-cni.yaml @@ -125,12 +125,6 @@ "value": "false" - "name": "DISABLE_METRICS" "value": "false" - - "name": "ENI_CONFIG_ANNOTATION_DEF" - "value": "k8s.amazonaws.com/eniConfig" - - "name": "ENI_CONFIG_LABEL_DEF" - "value": "k8s.amazonaws.com/eniConfig" - - "name": "INTROSPECTION_BIND_ADDRESS" - "value": "127.0.0.1:61679" - "name": "MY_NODE_NAME" "valueFrom": "fieldRef": diff --git a/config/master/manifests.jsonnet b/config/master/manifests.jsonnet index 460ca199ac..4586c4db3f 100644 --- a/config/master/manifests.jsonnet +++ b/config/master/manifests.jsonnet @@ -152,8 +152,6 @@ local awsnode = { env_:: { AWS_VPC_CNI_NODE_PORT_SUPPORT: "true", AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG: "false", - ENI_CONFIG_ANNOTATION_DEF: "k8s.amazonaws.com/eniConfig", - ENI_CONFIG_LABEL_DEF: "k8s.amazonaws.com/eniConfig", AWS_VPC_ENI_MTU: "9001", AWS_VPC_K8S_CNI_EXTERNALSNAT: "false", AWS_VPC_K8S_CNI_RANDOMIZESNAT: "prng", @@ -162,7 +160,6 @@ local awsnode = { AWS_VPC_K8S_CNI_LOG_FILE: "/host/var/log/aws-routed-eni/ipamd.log", AWS_VPC_K8S_PLUGIN_LOG_FILE: "/var/log/aws-routed-eni/plugin.log", AWS_VPC_K8S_PLUGIN_LOG_LEVEL: "DEBUG", - INTROSPECTION_BIND_ADDRESS: "127.0.0.1:61679", DISABLE_INTROSPECTION: "false", DISABLE_METRICS: "false", AWS_VPC_K8S_CNI_VETHPREFIX: "eni",