Fix: Kubeconfig must be set at pod startup (#141)

because of how the code is written, setting the env Kubeconfig in the code doesnt set it soon enough. So just moving it to the deployment.yaml to make sure it is set at the start
razee-io · Jun 25, 2020 · 92a0a18 · 92a0a18
1 parent 458f289
commit 92a0a18
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/kubernetes/watch-keeper/resource.yaml b/kubernetes/watch-keeper/resource.yaml
@@ -32,6 +32,12 @@ spec:
                 fieldPath: metadata.namespace
           - name: NODE_ENV
             value: "production"
+          - name: KUBECONFIG
+            valueFrom:
+              configMapKeyRef:
+                name: watch-keeper-config
+                key: KUBECONFIG
+                optional: true
         image: "quay.io/razee/watch-keeper:{{TRAVIS_TAG}}"
         imagePullPolicy: Always
         name: watch-keeper
@@ -51,14 +57,14 @@ spec:
           timeoutSeconds: 30
           failureThreshold: 1
         volumeMounts:
-          - mountPath: /usr/src/app/envs/watch-keeper-config
-            name: watch-keeper-config
-          - mountPath: /usr/src/app/envs/watch-keeper-secret
-            name: watch-keeper-secret
-          - mountPath: /usr/src/app/envs/razee-identity-config
-            name: razee-identity-config
-          - mountPath: /usr/src/app/envs/razee-identity-secret
-            name: razee-identity-secret
+          - name: watch-keeper-config
+            mountPath: /usr/src/app/envs/watch-keeper-config
+          - name: watch-keeper-secret
+            mountPath: /usr/src/app/envs/watch-keeper-secret
+          - name: razee-identity-config
+            mountPath: /usr/src/app/envs/razee-identity-config
+          - name: razee-identity-secret
+            mountPath: /usr/src/app/envs/razee-identity-secret
       volumes:
         - name: watch-keeper-config
           configMap:

diff --git a/src/index.js b/src/index.js
@@ -130,11 +130,6 @@ async function setEnvs() {
   if (await fs.pathExists('envs/watch-keeper-config/CONFIG_NAMESPACE')) {
     env.CONFIG_NAMESPACE = (await fs.readFile('envs/watch-keeper-config/CONFIG_NAMESPACE', 'utf8')).trim();
   }
-  if (await fs.pathExists('envs/watch-keeper-config/KUBECONFIG')) {
-    env.KUBECONFIG = (await fs.readFile('envs/watch-keeper-config/KUBECONFIG', 'utf8')).trim();
-  } else {
-    env.KUBECONFIG = '/etc/kubernetes/admin-kubeconfig';
-  }
   if (await fs.pathExists('envs/watch-keeper-config/VALIDATE_INTERVAL')) {
     env.VALIDATE_INTERVAL = (await fs.readFile('envs/watch-keeper-config/VALIDATE_INTERVAL', 'utf8')).trim();
   }