hack?

Author: tchinmai7

Tiltfile

@@ -172,8 +172,12 @@ if debug == "true":
 manager_yaml = decode_yaml_stream(kustomize("config/default"))
 for resource in manager_yaml:
     if resource["metadata"]["name"] == "capl-manager-credentials":
-        resource["stringData"]["apiToken"] = os.getenv("LINODE_TOKEN")
-        resource["stringData"]["dnsToken"] = os.getenv("LINODE_DNS_TOKEN")
+        resource["stringData"]["LINODE_TOKEN"] = os.getenv("LINODE_TOKEN")
+        resource["stringData"]["LINODE_DNS_TOKEN"] = os.getenv("LINODE_DNS_TOKEN")
+        if os.getenv("LINODE_URL"):
+            resource["stringData"]["LINODE_URL"] = os.getenv("LINODE_URL")
+        if os.getenv("LINODE_CA_BASE64"):
+            resource["stringData"]["SSL_CERT_DIR"] = "/tmp/linode-ca"
     if resource["metadata"]["name"] == "capl-akamai-edgerc-secret":
         resource["stringData"]["AKAMAI_HOST"] = os.getenv("AKAMAI_HOST")
         resource["stringData"]["AKAMAI_CLIENT_TOKEN"] = os.getenv("AKAMAI_CLIENT_TOKEN")
@@ -192,10 +196,7 @@ for resource in manager_yaml:
         for container in resource["spec"]["template"]["spec"]["containers"]:
             container.pop("securityContext")
             if container["name"] == "manager":
-                if os.getenv("LINODE_URL"):
-                    container["env"].append({"name": "LINODE_URL", "value": os.getenv("LINODE_URL")})
                 if os.getenv("LINODE_CA_BASE64"):
-                    container["env"].append({"name": "SSL_CERT_DIR", "value": "/tmp/linode-ca"})
                     container["volumeMounts"].append({"mountPath": "/tmp/linode-ca", "name": "linode-ca", "readOnly": True})
         if os.getenv("LINODE_CA_BASE64"):
             resource["spec"]["template"]["spec"]["volumes"].append({"name": "linode-ca", "secret": {"defaultMode": 420, "secretName": "linode-ca"}})

config/default/manager_credentials_patch.yaml

@@ -20,23 +20,3 @@ spec:
                 secretKeyRef:
                   key: dnsToken
                   name: capl-manager-credentials
-            - name: AKAMAI_HOST
-              valueFrom:
-                secretKeyRef:
-                  key: AKAMAI_HOST
-                  name: akamai-edgerc-secret
-            - name: AKAMAI_ACCESS_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  key: AKAMAI_ACCESS_TOKEN
-                  name: akamai-edgerc-secret
-            - name: AKAMAI_CLIENT_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  key: AKAMAI_CLIENT_TOKEN
-                  name: akamai-edgerc-secret
-            - name: AKAMAI_CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  key: AKAMAI_CLIENT_SECRET
-                  name: akamai-edgerc-secret

config/manager/manager.yaml

@@ -48,6 +48,16 @@ spec:
             - --leader-elect
           image: controller:latest
           env:
+            - name: LINODE_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: capl-manager-credentials
+                  key: LINODE_TOKEN
+            - name: LINODE_DNS_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: capl-manager-credentials
+                  key: LINODE_DNS_TOKEN
             - name: LINODE_API_VERSION
               value: v4beta
             - name: K8S_NODE_NAME