removed custom networking default vars, introspection var

bnapolitan · Jun 25, 2020 · 30f98bd · 30f98bd
1 parent aa8b818
commit 30f98bd
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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",