Added config map for env vars

aws · Jul 13, 2020 · e610815 · e610815
1 parent 650313f
commit e610815
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 135 deletions.
diff --git a/config/master/aws-k8s-cni-cn.yaml b/config/master/aws-k8s-cni-cn.yaml
@@ -107,40 +107,13 @@
                 - "fargate"
       "containers":
       - "env":
-        - "name": "ADDITIONAL_ENI_TAGS"
-          "value": "{}"
-        - "name": "AWS_VPC_CNI_NODE_PORT_SUPPORT"
-          "value": "true"
-        - "name": "AWS_VPC_ENI_MTU"
-          "value": "9001"
-        - "name": "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_EXTERNALSNAT"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_LOGLEVEL"
-          "value": "DEBUG"
-        - "name": "AWS_VPC_K8S_CNI_LOG_FILE"
-          "value": "/host/var/log/aws-routed-eni/ipamd.log"
-        - "name": "AWS_VPC_K8S_CNI_RANDOMIZESNAT"
-          "value": "prng"
-        - "name": "AWS_VPC_K8S_CNI_VETHPREFIX"
-          "value": "eni"
-        - "name": "AWS_VPC_K8S_PLUGIN_LOG_FILE"
-          "value": "/var/log/aws-routed-eni/plugin.log"
-        - "name": "AWS_VPC_K8S_PLUGIN_LOG_LEVEL"
-          "value": "DEBUG"
-        - "name": "DISABLE_INTROSPECTION"
-          "value": "false"
-        - "name": "DISABLE_METRICS"
-          "value": "false"
         - "name": "MY_NODE_NAME"
           "valueFrom":
             "fieldRef":
               "fieldPath": "spec.nodeName"
-        - "name": "WARM_ENI_TARGET"
-          "value": "1"
+        "envFrom":
+        - "configMapRef":
+            "name": "aws-k8s-cni-configmap"
         "image": "961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:latest"
         "imagePullPolicy": "Always"
         "livenessProbe":

diff --git a/config/master/aws-k8s-cni-configmap.yaml b/config/master/aws-k8s-cni-configmap.yaml
@@ -0,0 +1,25 @@
+---
+"apiVersion": "v1"
+"data":
+  "ADDITIONAL_ENI_TAGS": "{}"
+  "AWS_VPC_CNI_NODE_PORT_SUPPORT": "true"
+  "AWS_VPC_ENI_MTU": "9001"
+  "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER": "false"
+  "AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG": "false"
+  "AWS_VPC_K8S_CNI_EXTERNALSNAT": "false"
+  "AWS_VPC_K8S_CNI_LOGLEVEL": "DEBUG"
+  "AWS_VPC_K8S_CNI_LOG_FILE": "/host/var/log/aws-routed-eni/ipamd.log"
+  "AWS_VPC_K8S_CNI_RANDOMIZESNAT": "prng"
+  "AWS_VPC_K8S_CNI_VETHPREFIX": "eni"
+  "AWS_VPC_K8S_PLUGIN_LOG_FILE": "/var/log/aws-routed-eni/plugin.log"
+  "AWS_VPC_K8S_PLUGIN_LOG_LEVEL": "DEBUG"
+  "DISABLE_INTROSPECTION": "false"
+  "DISABLE_METRICS": "false"
+  "WARM_ENI_TARGET": "1"
+"kind": "ConfigMap"
+"metadata":
+  "labels":
+    "k8s-app": "aws-node-cm"
+  "name": "aws-k8s-cni-configmap"
+  "namespace": "kube-system"
+...
diff --git a/config/master/aws-k8s-cni-us-gov-east-1.yaml b/config/master/aws-k8s-cni-us-gov-east-1.yaml
@@ -107,40 +107,13 @@
                 - "fargate"
       "containers":
       - "env":
-        - "name": "ADDITIONAL_ENI_TAGS"
-          "value": "{}"
-        - "name": "AWS_VPC_CNI_NODE_PORT_SUPPORT"
-          "value": "true"
-        - "name": "AWS_VPC_ENI_MTU"
-          "value": "9001"
-        - "name": "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_EXTERNALSNAT"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_LOGLEVEL"
-          "value": "DEBUG"
-        - "name": "AWS_VPC_K8S_CNI_LOG_FILE"
-          "value": "/host/var/log/aws-routed-eni/ipamd.log"
-        - "name": "AWS_VPC_K8S_CNI_RANDOMIZESNAT"
-          "value": "prng"
-        - "name": "AWS_VPC_K8S_CNI_VETHPREFIX"
-          "value": "eni"
-        - "name": "AWS_VPC_K8S_PLUGIN_LOG_FILE"
-          "value": "/var/log/aws-routed-eni/plugin.log"
-        - "name": "AWS_VPC_K8S_PLUGIN_LOG_LEVEL"
-          "value": "DEBUG"
-        - "name": "DISABLE_INTROSPECTION"
-          "value": "false"
-        - "name": "DISABLE_METRICS"
-          "value": "false"
         - "name": "MY_NODE_NAME"
           "valueFrom":
             "fieldRef":
               "fieldPath": "spec.nodeName"
-        - "name": "WARM_ENI_TARGET"
-          "value": "1"
+        "envFrom":
+        - "configMapRef":
+            "name": "aws-k8s-cni-configmap"
         "image": "151742754352.dkr.ecr.us-gov-east-1.amazonaws.com/amazon-k8s-cni:latest"
         "imagePullPolicy": "Always"
         "livenessProbe":

diff --git a/config/master/aws-k8s-cni-us-gov-west-1.yaml b/config/master/aws-k8s-cni-us-gov-west-1.yaml
@@ -107,40 +107,13 @@
                 - "fargate"
       "containers":
       - "env":
-        - "name": "ADDITIONAL_ENI_TAGS"
-          "value": "{}"
-        - "name": "AWS_VPC_CNI_NODE_PORT_SUPPORT"
-          "value": "true"
-        - "name": "AWS_VPC_ENI_MTU"
-          "value": "9001"
-        - "name": "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_EXTERNALSNAT"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_LOGLEVEL"
-          "value": "DEBUG"
-        - "name": "AWS_VPC_K8S_CNI_LOG_FILE"
-          "value": "/host/var/log/aws-routed-eni/ipamd.log"
-        - "name": "AWS_VPC_K8S_CNI_RANDOMIZESNAT"
-          "value": "prng"
-        - "name": "AWS_VPC_K8S_CNI_VETHPREFIX"
-          "value": "eni"
-        - "name": "AWS_VPC_K8S_PLUGIN_LOG_FILE"
-          "value": "/var/log/aws-routed-eni/plugin.log"
-        - "name": "AWS_VPC_K8S_PLUGIN_LOG_LEVEL"
-          "value": "DEBUG"
-        - "name": "DISABLE_INTROSPECTION"
-          "value": "false"
-        - "name": "DISABLE_METRICS"
-          "value": "false"
         - "name": "MY_NODE_NAME"
           "valueFrom":
             "fieldRef":
               "fieldPath": "spec.nodeName"
-        - "name": "WARM_ENI_TARGET"
-          "value": "1"
+        "envFrom":
+        - "configMapRef":
+            "name": "aws-k8s-cni-configmap"
         "image": "013241004608.dkr.ecr.us-gov-west-1.amazonaws.com/amazon-k8s-cni:latest"
         "imagePullPolicy": "Always"
         "livenessProbe":

diff --git a/config/master/aws-k8s-cni.yaml b/config/master/aws-k8s-cni.yaml
@@ -107,40 +107,13 @@
                 - "fargate"
       "containers":
       - "env":
-        - "name": "ADDITIONAL_ENI_TAGS"
-          "value": "{}"
-        - "name": "AWS_VPC_CNI_NODE_PORT_SUPPORT"
-          "value": "true"
-        - "name": "AWS_VPC_ENI_MTU"
-          "value": "9001"
-        - "name": "AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_EXTERNALSNAT"
-          "value": "false"
-        - "name": "AWS_VPC_K8S_CNI_LOGLEVEL"
-          "value": "DEBUG"
-        - "name": "AWS_VPC_K8S_CNI_LOG_FILE"
-          "value": "/host/var/log/aws-routed-eni/ipamd.log"
-        - "name": "AWS_VPC_K8S_CNI_RANDOMIZESNAT"
-          "value": "prng"
-        - "name": "AWS_VPC_K8S_CNI_VETHPREFIX"
-          "value": "eni"
-        - "name": "AWS_VPC_K8S_PLUGIN_LOG_FILE"
-          "value": "/var/log/aws-routed-eni/plugin.log"
-        - "name": "AWS_VPC_K8S_PLUGIN_LOG_LEVEL"
-          "value": "DEBUG"
-        - "name": "DISABLE_INTROSPECTION"
-          "value": "false"
-        - "name": "DISABLE_METRICS"
-          "value": "false"
         - "name": "MY_NODE_NAME"
           "valueFrom":
             "fieldRef":
               "fieldPath": "spec.nodeName"
-        - "name": "WARM_ENI_TARGET"
-          "value": "1"
+        "envFrom":
+        - "configMapRef":
+            "name": "aws-k8s-cni-configmap"
         "image": "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:latest"
         "imagePullPolicy": "Always"
         "livenessProbe":

diff --git a/config/master/manifests.jsonnet b/config/master/manifests.jsonnet
@@ -27,6 +27,37 @@ local regions = {
   },
 };
 
+local awsnodecm = {
+  configMap: {
+    apiVersion: "v1",
+    kind: "ConfigMap",
+    metadata: {
+      name: "aws-k8s-cni-configmap",
+      namespace: "kube-system",
+      labels: {
+        "k8s-app": "aws-node-cm",
+      },
+    },
+    data: {
+      AWS_VPC_CNI_NODE_PORT_SUPPORT: "true",
+      AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG: "false",
+      AWS_VPC_ENI_MTU: "9001",
+      AWS_VPC_K8S_CNI_EXTERNALSNAT: "false",
+      AWS_VPC_K8S_CNI_RANDOMIZESNAT: "prng",
+      WARM_ENI_TARGET: "1",
+      AWS_VPC_K8S_CNI_LOGLEVEL: "DEBUG",
+      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",
+      DISABLE_INTROSPECTION: "false",
+      DISABLE_METRICS: "false",
+      AWS_VPC_K8S_CNI_VETHPREFIX: "eni",
+      ADDITIONAL_ENI_TAGS: "{}",
+      AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER: "false",
+    },
+  },
+};
+
 local awsnode = {
   clusterRole: {
     apiVersion: "rbac.authorization.k8s.io/v1",
@@ -154,22 +185,10 @@ local awsnode = {
               livenessProbe: self.readinessProbe + {
                 initialDelaySeconds: 60,
               },
+              envFrom: [
+                {configMapRef: {name: "aws-k8s-cni-configmap"}},
+              ],
               env_:: {
-                AWS_VPC_CNI_NODE_PORT_SUPPORT: "true",
-                AWS_VPC_K8S_CNI_CUSTOM_NETWORK_CFG: "false",
-                AWS_VPC_ENI_MTU: "9001",
-                AWS_VPC_K8S_CNI_EXTERNALSNAT: "false",
-                AWS_VPC_K8S_CNI_RANDOMIZESNAT: "prng",
-                WARM_ENI_TARGET: "1",
-                AWS_VPC_K8S_CNI_LOGLEVEL: "DEBUG",
-                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",
-                DISABLE_INTROSPECTION: "false",
-                DISABLE_METRICS: "false",
-                AWS_VPC_K8S_CNI_VETHPREFIX: "eni",
-                ADDITIONAL_ENI_TAGS: "{}",
-                AWS_VPC_K8S_CNI_CONFIGURE_RPFILTER: "false",
                 MY_NODE_NAME: {
                   valueFrom: {
                     fieldRef: {fieldPath: "spec.nodeName"},
@@ -390,3 +409,4 @@ byRegion("cni-metrics-helper", metricsHelper);
   [kv[0] + ".yaml"]: std.manifestYamlStream(objectValues(kv[1]))
   for kv in objectItems(output)
 }
+{"aws-k8s-cni-configmap.yaml": std.manifestYamlStream(objectValues(awsnodecm))}