Merge pull request #101 from sam-berning/credential-provider-template-handle-null

kubernetes: handle null in credential provider template

Author: sam-berning

packages/kubernetes-1.23/credential-provider-config-yaml

@@ -16,8 +16,13 @@ providers:
 {{/each}}
     defaultCacheDuration: "{{default "12h" this.cache-duration}}"
     apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1
-{{#if (or (eq @key "ecr-credential-provider") this.environment)}}
+{{#if (eq @key "ecr-credential-provider")}}
+    env:
+{{else}}
+{{#if this.environment}}
     env:
+{{/if}}
+{{/if}}
 {{#if this.environment}}
 {{#each this.environment}}
       - name: {{@key}}
@@ -33,6 +38,5 @@ providers:
 {{/if}}
 {{/if}}
 {{/if}}
-{{/if}}
 {{/each}}
 {{/if}}

packages/kubernetes-1.24/credential-provider-config-yaml

@@ -16,8 +16,13 @@ providers:
 {{/each}}
     defaultCacheDuration: "{{default "12h" this.cache-duration}}"
     apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1
-{{#if (or (eq @key "ecr-credential-provider") this.environment)}}
+{{#if (eq @key "ecr-credential-provider")}}
+    env:
+{{else}}
+{{#if this.environment}}
     env:
+{{/if}}
+{{/if}}
 {{#if this.environment}}
 {{#each this.environment}}
       - name: {{@key}}
@@ -33,6 +38,5 @@ providers:
 {{/if}}
 {{/if}}
 {{/if}}
-{{/if}}
 {{/each}}
 {{/if}}

packages/kubernetes-1.25/credential-provider-config-yaml

@@ -16,8 +16,13 @@ providers:
 {{/each}}
     defaultCacheDuration: "{{default "12h" this.cache-duration}}"
     apiVersion: credentialprovider.kubelet.k8s.io/v1beta1
-{{#if (or (eq @key "ecr-credential-provider") this.environment)}}
+{{#if (eq @key "ecr-credential-provider")}}
+    env:
+{{else}}
+{{#if this.environment}}
     env:
+{{/if}}
+{{/if}}
 {{#if this.environment}}
 {{#each this.environment}}
       - name: {{@key}}
@@ -33,6 +38,5 @@ providers:
 {{/if}}
 {{/if}}
 {{/if}}
-{{/if}}
 {{/each}}
 {{/if}}

packages/kubernetes-1.26/credential-provider-config-yaml

@@ -16,8 +16,13 @@ providers:
 {{/each}}
     defaultCacheDuration: "{{default "12h" this.cache-duration}}"
     apiVersion: credentialprovider.kubelet.k8s.io/v1alpha1
-{{#if (or (eq @key "ecr-credential-provider") this.environment)}}
+{{#if (eq @key "ecr-credential-provider")}}
+    env:
+{{else}}
+{{#if this.environment}}
     env:
+{{/if}}
+{{/if}}
 {{#if this.environment}}
 {{#each this.environment}}
       - name: {{@key}}
@@ -33,6 +38,5 @@ providers:
 {{/if}}
 {{/if}}
 {{/if}}
-{{/if}}
 {{/each}}
 {{/if}}

packages/kubernetes-1.27/credential-provider-config-yaml

@@ -16,8 +16,13 @@ providers:
 {{/each}}
     defaultCacheDuration: "{{default "12h" this.cache-duration}}"
     apiVersion: credentialprovider.kubelet.k8s.io/v1
-{{#if (or (eq @key "ecr-credential-provider") this.environment)}}
+{{#if (eq @key "ecr-credential-provider")}}
+    env:
+{{else}}
+{{#if this.environment}}
     env:
+{{/if}}
+{{/if}}
 {{#if this.environment}}
 {{#each this.environment}}
       - name: {{@key}}
@@ -33,6 +38,5 @@ providers:
 {{/if}}
 {{/if}}
 {{/if}}
-{{/if}}
 {{/each}}
 {{/if}}

packages/kubernetes-1.28/credential-provider-config-yaml

@@ -16,8 +16,13 @@ providers:
 {{/each}}
     defaultCacheDuration: "{{default "12h" this.cache-duration}}"
     apiVersion: credentialprovider.kubelet.k8s.io/v1
-{{#if (or (eq @key "ecr-credential-provider") this.environment)}}
+{{#if (eq @key "ecr-credential-provider")}}
+    env:
+{{else}}
+{{#if this.environment}}
     env:
+{{/if}}
+{{/if}}
 {{#if this.environment}}
 {{#each this.environment}}
       - name: {{@key}}
@@ -33,6 +38,5 @@ providers:
 {{/if}}
 {{/if}}
 {{/if}}
-{{/if}}
 {{/each}}
 {{/if}}

packages/kubernetes-1.29/credential-provider-config-yaml

@@ -16,8 +16,13 @@ providers:
 {{/each}}
     defaultCacheDuration: "{{default "12h" this.cache-duration}}"
     apiVersion: credentialprovider.kubelet.k8s.io/v1
-{{#if (or (eq @key "ecr-credential-provider") this.environment)}}
+{{#if (eq @key "ecr-credential-provider")}}
+    env:
+{{else}}
+{{#if this.environment}}
     env:
+{{/if}}
+{{/if}}
 {{#if this.environment}}
 {{#each this.environment}}
       - name: {{@key}}
@@ -33,6 +38,5 @@ providers:
 {{/if}}
 {{/if}}
 {{/if}}
-{{/if}}
 {{/each}}
 {{/if}}

packages/kubernetes-1.30/credential-provider-config-yaml

@@ -16,8 +16,13 @@ providers:
 {{/each}}
     defaultCacheDuration: "{{default "12h" this.cache-duration}}"
     apiVersion: credentialprovider.kubelet.k8s.io/v1
-{{#if (or (eq @key "ecr-credential-provider") this.environment)}}
+{{#if (eq @key "ecr-credential-provider")}}
+    env:
+{{else}}
+{{#if this.environment}}
     env:
+{{/if}}
+{{/if}}
 {{#if this.environment}}
 {{#each this.environment}}
       - name: {{@key}}
@@ -33,6 +38,5 @@ providers:
 {{/if}}
 {{/if}}
 {{/if}}
-{{/if}}
 {{/each}}
 {{/if}}

packages/kubernetes-1.31/credential-provider-config-yaml

@@ -16,8 +16,13 @@ providers:
 {{/each}}
     defaultCacheDuration: "{{default "12h" this.cache-duration}}"
     apiVersion: credentialprovider.kubelet.k8s.io/v1
-{{#if (or (eq @key "ecr-credential-provider") this.environment)}}
+{{#if (eq @key "ecr-credential-provider")}}
+    env:
+{{else}}
+{{#if this.environment}}
     env:
+{{/if}}
+{{/if}}
 {{#if this.environment}}
 {{#each this.environment}}
       - name: {{@key}}
@@ -33,6 +38,5 @@ providers:
 {{/if}}
 {{/if}}
 {{/if}}
-{{/if}}
 {{/each}}
 {{/if}}