Skip to content

Commit f5d3a58

Browse files
dperaza4dustbitdperaza4dustbit
authored
Merge pull request #508 from dperaza4dustbit/synch_dh_1.8_req
Keeping github Nunjucks synched up with tssc-sample-template
2 parents 237acdc + dcc36a6 commit f5d3a58

File tree

6 files changed

+87
-87
lines changed

6 files changed

+87
-87
lines changed

‎generated/gitops-template/githubactions/.github/workflows/gitops-promotion.yml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@ env:
1212

1313
# 🖊️ EDIT to change the image registry settings.
1414
# Registries such as GHCR, Quay.io, and Docker Hub are supported.
15-
IMAGE_REGISTRY: ${{ secrets.IMAGE_REGISTRY }}
15+
IMAGE_REGISTRY: ${{ '${{' }} secrets.IMAGE_REGISTRY }}
1616

1717
# Used to verify the image signature and attestation
18-
COSIGN_PUBLIC_KEY: ${{ vars.COSIGN_PUBLIC_KEY }}
18+
COSIGN_PUBLIC_KEY: ${{ '${{' }} vars.COSIGN_PUBLIC_KEY }}
1919
# URL of the BOMbastic api host (e.g. https://sbom.trustification.dev)
20-
TRUSTIFICATION_BOMBASTIC_API_URL: ${{ vars.TRUSTIFICATION_BOMBASTIC_API_URL }}
20+
TRUSTIFICATION_BOMBASTIC_API_URL: ${{ '${{' }} vars.TRUSTIFICATION_BOMBASTIC_API_URL }}
2121
# URL of the OIDC token issuer (e.g. https://sso.trustification.dev/realms/chicken)
22-
TRUSTIFICATION_OIDC_ISSUER_URL: ${{ vars.TRUSTIFICATION_OIDC_ISSUER_URL }}
23-
TRUSTIFICATION_OIDC_CLIENT_ID: ${{ vars.TRUSTIFICATION_OIDC_CLIENT_ID }}
24-
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION: ${{ vars.TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION }}
22+
TRUSTIFICATION_OIDC_ISSUER_URL: ${{ '${{' }} vars.TRUSTIFICATION_OIDC_ISSUER_URL }}
23+
TRUSTIFICATION_OIDC_CLIENT_ID: ${{ '${{' }} vars.TRUSTIFICATION_OIDC_CLIENT_ID }}
24+
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION: ${{ '${{' }} vars.TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION }}
2525
# Set this to the user for your specific registry
26-
IMAGE_REGISTRY_USER: ${{ vars.IMAGE_REGISTRY_USER }}
26+
IMAGE_REGISTRY_USER: ${{ '${{' }} vars.IMAGE_REGISTRY_USER }}
2727
# Set this only when using an external Rekor instance
28-
REKOR_HOST: ${{ vars.REKOR_HOST }}
28+
REKOR_HOST: ${{ '${{' }} vars.REKOR_HOST }}
2929
# Set this only when using an external TUF instance
30-
TUF_MIRROR: ${{ vars.TUF_MIRROR }}
31-
# QUAY_IO_CREDS_USR: ${{ vars.QUAY_IO_CREDS_USR }}
32-
# ARTIFACTORY_IO_CREDS_USR: ${{ vars.ARTIFACTORY_IO_CREDS_USR }}
33-
# NEXUS_IO_CREDS_USR: ${{ vars.NEXUS_IO_CREDS_USR }}
30+
TUF_MIRROR: ${{ '${{' }} vars.TUF_MIRROR }}
31+
# QUAY_IO_CREDS_USR: ${{ '${{' }} vars.QUAY_IO_CREDS_USR }}
32+
# ARTIFACTORY_IO_CREDS_USR: ${{ '${{' }} vars.ARTIFACTORY_IO_CREDS_USR }}
33+
# NEXUS_IO_CREDS_USR: ${{ '${{' }} vars.NEXUS_IO_CREDS_USR }}
3434
# Secrets
35-
TRUSTIFICATION_OIDC_CLIENT_SECRET: ${{ secrets.TRUSTIFICATION_OIDC_CLIENT_SECRET }}
35+
TRUSTIFICATION_OIDC_CLIENT_SECRET: ${{ '${{' }} secrets.TRUSTIFICATION_OIDC_CLIENT_SECRET }}
3636
# Set this password for your specific registry
37-
IMAGE_REGISTRY_PASSWORD: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
38-
# QUAY_IO_CREDS_PSW: ${{ secrets.QUAY_IO_CREDS_PSW }}
39-
# ARTIFACTORY_IO_CREDS_PSW: ${{ secrets.ARTIFACTORY_IO_CREDS_PSW }}
40-
# NEXUS_IO_CREDS_PSW: ${{ secrets.NEXUS_IO_CREDS_PSW }}
37+
IMAGE_REGISTRY_PASSWORD: ${{ '${{' }} secrets.IMAGE_REGISTRY_PASSWORD }}
38+
# QUAY_IO_CREDS_PSW: ${{ '${{' }} secrets.QUAY_IO_CREDS_PSW }}
39+
# ARTIFACTORY_IO_CREDS_PSW: ${{ '${{' }} secrets.ARTIFACTORY_IO_CREDS_PSW }}
40+
# NEXUS_IO_CREDS_PSW: ${{ '${{' }} secrets.NEXUS_IO_CREDS_PSW }}
4141

4242
# 🖊️ EDIT to specify custom tags for the container image, or default tags will be generated below.
4343
IMAGE_TAGS: ""
@@ -62,25 +62,25 @@ jobs:
6262
with:
6363
script: |
6464
const vars = {
65-
IMAGE_REGISTRY: `${{ vars.IMAGE_REGISTRY }}`,
65+
IMAGE_REGISTRY: `${{ '${{' }} vars.IMAGE_REGISTRY }}`,
6666
6767
/* Used to verify the image signature and attestation */
68-
COSIGN_PUBLIC_KEY: `${{ vars.COSIGN_PUBLIC_KEY }}`,
68+
COSIGN_PUBLIC_KEY: `${{ '${{' }} vars.COSIGN_PUBLIC_KEY }}`,
6969
/* URL of the BOMbastic api host (e.g. https://sbom.trustification.dev) */
70-
TRUSTIFICATION_BOMBASTIC_API_URL: `${{ vars.TRUSTIFICATION_BOMBASTIC_API_URL }}`,
70+
TRUSTIFICATION_BOMBASTIC_API_URL: `${{ '${{' }} vars.TRUSTIFICATION_BOMBASTIC_API_URL }}`,
7171
/* URL of the OIDC token issuer (e.g. https://sso.trustification.dev/realms/chicken) */
72-
TRUSTIFICATION_OIDC_ISSUER_URL: `${{ vars.TRUSTIFICATION_OIDC_ISSUER_URL }}`,
73-
TRUSTIFICATION_OIDC_CLIENT_ID: `${{ vars.TRUSTIFICATION_OIDC_CLIENT_ID }}`,
74-
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION: `${{ vars.TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION }}`,
72+
TRUSTIFICATION_OIDC_ISSUER_URL: `${{ '${{' }} vars.TRUSTIFICATION_OIDC_ISSUER_URL }}`,
73+
TRUSTIFICATION_OIDC_CLIENT_ID: `${{ '${{' }} vars.TRUSTIFICATION_OIDC_CLIENT_ID }}`,
74+
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION: `${{ '${{' }} vars.TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION }}`,
7575
/* Set this to the user for your specific registry */
76-
IMAGE_REGISTRY_USER: `${{ vars.IMAGE_REGISTRY_USER }}`,
76+
IMAGE_REGISTRY_USER: `${{ '${{' }} vars.IMAGE_REGISTRY_USER }}`,
7777
/* Set this only when using an external Rekor instance */
78-
REKOR_HOST: `${{ vars.REKOR_HOST }}`,
78+
REKOR_HOST: `${{ '${{' }} vars.REKOR_HOST }}`,
7979
/* Set this only when using an external TUF instance */
80-
TUF_MIRROR: `${{ vars.TUF_MIRROR }}`,
81-
/*QUAY_IO_CREDS_USR: `${{ vars.QUAY_IO_CREDS_USR }}`,*/
82-
/*ARTIFACTORY_IO_CREDS_USR: `${{ vars.ARTIFACTORY_IO_CREDS_USR }}`,*/
83-
/*NEXUS_IO_CREDS_USR: `${{ vars.NEXUS_IO_CREDS_USR }}`,*/
80+
TUF_MIRROR: `${{ '${{' }} vars.TUF_MIRROR }}`,
81+
/*QUAY_IO_CREDS_USR: `${{ '${{' }} vars.QUAY_IO_CREDS_USR }}`,*/
82+
/*ARTIFACTORY_IO_CREDS_USR: `${{ '${{' }} vars.ARTIFACTORY_IO_CREDS_USR }}`,*/
83+
/*NEXUS_IO_CREDS_USR: `${{ '${{' }} vars.NEXUS_IO_CREDS_USR }}`,*/
8484
};
8585
8686
const missingVars = Object.entries(vars).filter(([ name, value ]) => {
@@ -94,12 +94,12 @@ jobs:
9494
9595
const secrets = {
9696
97-
TRUSTIFICATION_OIDC_CLIENT_SECRET: `${{ secrets.TRUSTIFICATION_OIDC_CLIENT_SECRET }}`,
97+
TRUSTIFICATION_OIDC_CLIENT_SECRET: `${{ '${{' }} secrets.TRUSTIFICATION_OIDC_CLIENT_SECRET }}`,
9898
/* Set this password for your specific registry */
99-
IMAGE_REGISTRY_PASSWORD: `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`,
100-
/*QUAY_IO_CREDS_PSW: `${{ secrets.QUAY_IO_CREDS_PSW }}`,*/
101-
/*ARTIFACTORY_IO_CREDS_PSW: `${{ secrets.ARTIFACTORY_IO_CREDS_PSW }}`,*/
102-
/*NEXUS_IO_CREDS_PSW: `${{ secrets.NEXUS_IO_CREDS_PSW }}`,*/
99+
IMAGE_REGISTRY_PASSWORD: `${{ '${{' }} secrets.IMAGE_REGISTRY_PASSWORD }}`,
100+
/*QUAY_IO_CREDS_PSW: `${{ '${{' }} secrets.QUAY_IO_CREDS_PSW }}`,*/
101+
/*ARTIFACTORY_IO_CREDS_PSW: `${{ '${{' }} secrets.ARTIFACTORY_IO_CREDS_PSW }}`,*/
102+
/*NEXUS_IO_CREDS_PSW: `${{ '${{' }} secrets.NEXUS_IO_CREDS_PSW }}`,*/
103103
};
104104
105105
const missingSecrets = Object.entries(secrets).filter(([ name, value ]) => {
@@ -135,7 +135,7 @@ jobs:
135135
- name: Check out repository
136136
uses: actions/checkout@v4
137137
with:
138-
fetch-depth: '2'
138+
fetch-depth: "2"
139139
- name: Pre-init
140140
run: |
141141
buildah --version

‎generated/source-repo/githubactions/.github/workflows/build-and-update-gitops.yml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,34 @@ env:
1313
# 🖊️ EDIT to change the image registry settings.
1414

1515
# Vars
16-
ROX_CENTRAL_ENDPOINT: ${{ vars.ROX_CENTRAL_ENDPOINT }}
17-
# GITOPS_AUTH_USERNAME: ${{ vars.GITOPS_AUTH_USERNAME }}
16+
ROX_CENTRAL_ENDPOINT: ${{ '${{' }} vars.ROX_CENTRAL_ENDPOINT }}
17+
# GITOPS_AUTH_USERNAME: ${{ '${{' }} vars.GITOPS_AUTH_USERNAME }}
1818
# Set this to the user for your specific registry
19-
IMAGE_REGISTRY_USER: ${{ vars.IMAGE_REGISTRY_USER }}
19+
IMAGE_REGISTRY_USER: ${{ '${{' }} vars.IMAGE_REGISTRY_USER }}
2020
# Set this only when using an external Rekor instance
21-
REKOR_HOST: ${{ vars.REKOR_HOST }}
21+
REKOR_HOST: ${{ '${{' }} vars.REKOR_HOST }}
2222
# Set this only when using an external TUF instance
23-
TUF_MIRROR: ${{ vars.TUF_MIRROR }}
24-
# QUAY_IO_CREDS_USR: ${{ vars.QUAY_IO_CREDS_USR }}
25-
# ARTIFACTORY_IO_CREDS_USR: ${{ vars.ARTIFACTORY_IO_CREDS_USR }}
26-
# NEXUS_IO_CREDS_USR: ${{ vars.NEXUS_IO_CREDS_USR }}
23+
TUF_MIRROR: ${{ '${{' }} vars.TUF_MIRROR }}
24+
# QUAY_IO_CREDS_USR: ${{ '${{' }} vars.QUAY_IO_CREDS_USR }}
25+
# ARTIFACTORY_IO_CREDS_USR: ${{ '${{' }} vars.ARTIFACTORY_IO_CREDS_USR }}
26+
# NEXUS_IO_CREDS_USR: ${{ '${{' }} vars.NEXUS_IO_CREDS_USR }}
2727
# Used to verify the image signature and attestation
28-
COSIGN_PUBLIC_KEY: ${{ vars.COSIGN_PUBLIC_KEY }}
28+
COSIGN_PUBLIC_KEY: ${{ '${{' }} vars.COSIGN_PUBLIC_KEY }}
2929
# Custom Root CA to be used in scripts as trusted
30-
CUSTOM_ROOT_CA: ${{ vars.CUSTOM_ROOT_CA }}
30+
CUSTOM_ROOT_CA: ${{ '${{' }} vars.CUSTOM_ROOT_CA }}
3131
# Secrets
32-
ROX_API_TOKEN: ${{ secrets.ROX_API_TOKEN }}
33-
GITOPS_AUTH_PASSWORD: ${{ secrets.GITOPS_AUTH_PASSWORD }}
32+
ROX_API_TOKEN: ${{ '${{' }} secrets.ROX_API_TOKEN }}
33+
GITOPS_AUTH_PASSWORD: ${{ '${{' }} secrets.GITOPS_AUTH_PASSWORD }}
3434
# Set this password for your specific registry
35-
IMAGE_REGISTRY_PASSWORD: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
36-
# QUAY_IO_CREDS_PSW: ${{ secrets.QUAY_IO_CREDS_PSW }}
37-
# ARTIFACTORY_IO_CREDS_PSW: ${{ secrets.ARTIFACTORY_IO_CREDS_PSW }}
38-
# NEXUS_IO_CREDS_PSW: ${{ secrets.NEXUS_IO_CREDS_PSW }}
39-
COSIGN_SECRET_PASSWORD: ${{ secrets.COSIGN_SECRET_PASSWORD }}
40-
COSIGN_SECRET_KEY: ${{ secrets.COSIGN_SECRET_KEY }}
35+
IMAGE_REGISTRY_PASSWORD: ${{ '${{' }} secrets.IMAGE_REGISTRY_PASSWORD }}
36+
# QUAY_IO_CREDS_PSW: ${{ '${{' }} secrets.QUAY_IO_CREDS_PSW }}
37+
# ARTIFACTORY_IO_CREDS_PSW: ${{ '${{' }} secrets.ARTIFACTORY_IO_CREDS_PSW }}
38+
# NEXUS_IO_CREDS_PSW: ${{ '${{' }} secrets.NEXUS_IO_CREDS_PSW }}
39+
COSIGN_SECRET_PASSWORD: ${{ '${{' }} secrets.COSIGN_SECRET_PASSWORD }}
40+
COSIGN_SECRET_KEY: ${{ '${{' }} secrets.COSIGN_SECRET_KEY }}
4141

4242
# Registries such as GHCR, Quay.io, and Docker Hub are supported.
43-
IMAGE_REGISTRY: ${{ secrets.IMAGE_REGISTRY }}
43+
IMAGE_REGISTRY: ${{ '${{' }} secrets.IMAGE_REGISTRY }}
4444

4545
# 🖊️ EDIT to specify custom tags for the container image, or default tags will be generated below.
4646
IMAGE_TAGS: ""
@@ -51,7 +51,7 @@ env:
5151
on:
5252
push:
5353
branches:
54-
- 'main'
54+
- "main"
5555
workflow_dispatch:
5656

5757
jobs:
@@ -69,21 +69,21 @@ jobs:
6969
with:
7070
script: |
7171
const vars = {
72-
IMAGE_REGISTRY: `${{ vars.IMAGE_REGISTRY }}`,
72+
IMAGE_REGISTRY: `${{ '${{' }} vars.IMAGE_REGISTRY }}`,
7373
74-
ROX_CENTRAL_ENDPOINT: `${{ vars.ROX_CENTRAL_ENDPOINT }}`,
75-
/* GITOPS_AUTH_USERNAME: `${{ vars.GITOPS_AUTH_USERNAME }}`, */
74+
ROX_CENTRAL_ENDPOINT: `${{ '${{' }} vars.ROX_CENTRAL_ENDPOINT }}`,
75+
/* GITOPS_AUTH_USERNAME: `${{ '${{' }} vars.GITOPS_AUTH_USERNAME }}`, */
7676
/* Set this to the user for your specific registry */
77-
IMAGE_REGISTRY_USER: `${{ vars.IMAGE_REGISTRY_USER }}`,
77+
IMAGE_REGISTRY_USER: `${{ '${{' }} vars.IMAGE_REGISTRY_USER }}`,
7878
/* Set this only when using an external Rekor instance */
79-
REKOR_HOST: `${{ vars.REKOR_HOST }}`,
79+
REKOR_HOST: `${{ '${{' }} vars.REKOR_HOST }}`,
8080
/* Set this only when using an external TUF instance */
81-
TUF_MIRROR: `${{ vars.TUF_MIRROR }}`,
82-
/* QUAY_IO_CREDS_USR: `${{ vars.QUAY_IO_CREDS_USR }}`, */
83-
/* ARTIFACTORY_IO_CREDS_USR: `${{ vars.ARTIFACTORY_IO_CREDS_USR }}`, */
84-
/* NEXUS_IO_CREDS_USR: `${{ vars.NEXUS_IO_CREDS_USR }}`, */
81+
TUF_MIRROR: `${{ '${{' }} vars.TUF_MIRROR }}`,
82+
/* QUAY_IO_CREDS_USR: `${{ '${{' }} vars.QUAY_IO_CREDS_USR }}`, */
83+
/* ARTIFACTORY_IO_CREDS_USR: `${{ '${{' }} vars.ARTIFACTORY_IO_CREDS_USR }}`, */
84+
/* NEXUS_IO_CREDS_USR: `${{ '${{' }} vars.NEXUS_IO_CREDS_USR }}`, */
8585
/* Used to verify the image signature and attestation */
86-
COSIGN_PUBLIC_KEY: `${{ vars.COSIGN_PUBLIC_KEY }}`,
86+
COSIGN_PUBLIC_KEY: `${{ '${{' }} vars.COSIGN_PUBLIC_KEY }}`,
8787
};
8888
8989
const missingVars = Object.entries(vars).filter(([ name, value ]) => {
@@ -97,15 +97,15 @@ jobs:
9797
9898
const secrets = {
9999
100-
ROX_API_TOKEN: `${{ secrets.ROX_API_TOKEN }}`,
101-
GITOPS_AUTH_PASSWORD: `${{ secrets.GITOPS_AUTH_PASSWORD }}`,
100+
ROX_API_TOKEN: `${{ '${{' }} secrets.ROX_API_TOKEN }}`,
101+
GITOPS_AUTH_PASSWORD: `${{ '${{' }} secrets.GITOPS_AUTH_PASSWORD }}`,
102102
/* Set this password for your specific registry */
103-
IMAGE_REGISTRY_PASSWORD: `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`,
104-
/* QUAY_IO_CREDS_PSW: `${{ secrets.QUAY_IO_CREDS_PSW }}`, */
105-
/* ARTIFACTORY_IO_CREDS_PSW: `${{ secrets.ARTIFACTORY_IO_CREDS_PSW }}`, */
106-
/* NEXUS_IO_CREDS_PSW: `${{ secrets.NEXUS_IO_CREDS_PSW }}`, */
107-
COSIGN_SECRET_PASSWORD: `${{ secrets.COSIGN_SECRET_PASSWORD }}`,
108-
COSIGN_SECRET_KEY: `${{ secrets.COSIGN_SECRET_KEY }}`,
103+
IMAGE_REGISTRY_PASSWORD: `${{ '${{' }} secrets.IMAGE_REGISTRY_PASSWORD }}`,
104+
/* QUAY_IO_CREDS_PSW: `${{ '${{' }} secrets.QUAY_IO_CREDS_PSW }}`, */
105+
/* ARTIFACTORY_IO_CREDS_PSW: `${{ '${{' }} secrets.ARTIFACTORY_IO_CREDS_PSW }}`, */
106+
/* NEXUS_IO_CREDS_PSW: `${{ '${{' }} secrets.NEXUS_IO_CREDS_PSW }}`, */
107+
COSIGN_SECRET_PASSWORD: `${{ '${{' }} secrets.COSIGN_SECRET_PASSWORD }}`,
108+
COSIGN_SECRET_KEY: `${{ '${{' }} secrets.COSIGN_SECRET_KEY }}`,
109109
};
110110
111111
const missingSecrets = Object.entries(secrets).filter(([ name, value ]) => {
@@ -141,7 +141,7 @@ jobs:
141141
- name: Check out repository
142142
uses: actions/checkout@v4
143143
with:
144-
fetch-depth: '2'
144+
fetch-depth: "2"
145145
- name: Pre-init
146146
run: |
147147
buildah --version

‎templates/gitops-template/gitops-promotion.yml.njk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212

1313
# 🖊️ EDIT to change the image registry settings.
1414
# Registries such as GHCR, Quay.io, and Docker Hub are supported.
15-
IMAGE_REGISTRY: ${{ "secrets.IMAGE_REGISTRY" | inCurlies }}
15+
IMAGE_REGISTRY: ${{ "'${{' }} secrets.IMAGE_REGISTRY" | inCurlies }}
1616
{{ '' }}{# Ensure new line for better readability #}
1717
{%- for var in gitops_variables -%}
1818
{% include "github-variable.njk" %}
@@ -48,13 +48,13 @@ jobs:
4848
Perhaps this could use the bash var/secret checker too for consistency
4949
#}
5050
const vars = {
51-
IMAGE_REGISTRY: `${{ "vars.IMAGE_REGISTRY" | inCurlies }}`,
51+
IMAGE_REGISTRY: `${{ "'${{' }} vars.IMAGE_REGISTRY" | inCurlies }}`,
5252
{% for var in gitops_variables %}
5353
{%- if var | eval_if_condition %}
5454
{%- if var.comment %}
5555
/* {{ var.comment }} */
5656
{%- endif %}
57-
{% if var.commented_out %}/*{% endif %}{{ var.name }}: `${{ ("vars." + var.name) | inCurlies }}`,{% if var.commented_out %}*/{% endif %}
57+
{% if var.commented_out %}/*{% endif %}{{ var.name }}: `${{ ("'${{' }} vars." + var.name) | inCurlies }}`,{% if var.commented_out %}*/{% endif %}
5858
{%- endif %}
5959
{%- endfor %}
6060
};
@@ -74,7 +74,7 @@ jobs:
7474
{%- if secret.comment %}
7575
/* {{ secret.comment }} */
7676
{%- endif %}
77-
{% if secret.commented_out %}/*{% endif %}{{ secret.name }}: `${{ ("secrets." + secret.name) | inCurlies }}`,{% if secret.commented_out %}*/{% endif %}
77+
{% if secret.commented_out %}/*{% endif %}{{ secret.name }}: `${{ ("'${{' }} secrets." + secret.name) | inCurlies }}`,{% if secret.commented_out %}*/{% endif %}
7878
{%- endif %}
7979
{%- endfor %}
8080
};
@@ -112,7 +112,7 @@ jobs:
112112
- name: Check out repository
113113
uses: actions/checkout@v4
114114
with:
115-
fetch-depth: '2'
115+
fetch-depth: "2"
116116
- name: Pre-init
117117
run: |
118118
buildah --version

‎templates/partials/github-secret.njk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
{%- if secret.comment %}
33
# {{ secret.comment }}
44
{%- endif %}
5-
{% if secret.commented_out -%}{{ ' # ' }}{% else %}{{ ' ' }}{% endif -%}{{- secret.name -}}: ${{- ("secrets." + secret.name) | inCurlies -}}
5+
{% if secret.commented_out -%}{{ ' # ' }}{% else %}{{ ' ' }}{% endif -%}{{- secret.name -}}: ${{- ("'${{' }} secrets." + secret.name) | inCurlies -}}
66
{%- endif -%}

‎templates/partials/github-variable.njk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
{%- if var.comment %}
33
# {{ var.comment }}
44
{%- endif %}
5-
{% if var.commented_out -%}{{ ' # ' }}{% else %}{{ ' ' }}{% endif -%}{{- var.name -}}: ${{- ("vars." + var.name) | inCurlies -}}
5+
{% if var.commented_out -%}{{ ' # ' }}{% else %}{{ ' ' }}{% endif -%}{{- var.name -}}: ${{- ("'${{' }} vars." + var.name) | inCurlies -}}
66
{%- endif -%}

‎templates/source-repo/build-and-update-gitops.yml.njk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
{%- endfor %}
2424

2525
# Registries such as GHCR, Quay.io, and Docker Hub are supported.
26-
IMAGE_REGISTRY: ${{ "secrets.IMAGE_REGISTRY" | inCurlies }}
26+
IMAGE_REGISTRY: ${{ "'${{' }} secrets.IMAGE_REGISTRY" | inCurlies }}
2727

2828
# 🖊️ EDIT to specify custom tags for the container image, or default tags will be generated below.
2929
IMAGE_TAGS: ""
@@ -34,7 +34,7 @@ env:
3434
on:
3535
push:
3636
branches:
37-
- 'main'
37+
- "main"
3838
workflow_dispatch:
3939

4040
jobs:
@@ -55,14 +55,14 @@ jobs:
5555
Perhaps this could use the bash var/secret checker too for consistency
5656
#}
5757
const vars = {
58-
IMAGE_REGISTRY: `${{ "vars.IMAGE_REGISTRY" | inCurlies }}`,
58+
IMAGE_REGISTRY: `${{ "'${{' }} vars.IMAGE_REGISTRY" | inCurlies }}`,
5959
{% for var in build_variables %}
6060
{%- if var | eval_if_condition %}
6161
{%- if not var.optional %}
6262
{%- if var.comment %}
6363
/* {{ var.comment }} */
6464
{%- endif %}
65-
{% if var.commented_out %}/* {% endif %}{{ var.name }}: `${{ ("vars." + var.name) | inCurlies }}`,{% if var.commented_out %} */{% endif %}
65+
{% if var.commented_out %}/* {% endif %}{{ var.name }}: `${{ ("'${{' }} vars." + var.name) | inCurlies }}`,{% if var.commented_out %} */{% endif %}
6666
{%- endif %}
6767
{%- endif %}
6868
{%- endfor %}
@@ -83,7 +83,7 @@ jobs:
8383
{%- if secret.comment %}
8484
/* {{ secret.comment }} */
8585
{%- endif %}
86-
{% if secret.commented_out %}/* {% endif %}{{ secret.name }}: `${{ ("secrets." + secret.name) | inCurlies }}`,{% if secret.commented_out %} */{% endif %}
86+
{% if secret.commented_out %}/* {% endif %}{{ secret.name }}: `${{ ("'${{' }} secrets." + secret.name) | inCurlies }}`,{% if secret.commented_out %} */{% endif %}
8787
{%- endif %}
8888
{%- endfor %}
8989
};
@@ -121,7 +121,7 @@ jobs:
121121
- name: Check out repository
122122
uses: actions/checkout@v4
123123
with:
124-
fetch-depth: '2'
124+
fetch-depth: "2"
125125
- name: Pre-init
126126
run: |
127127
buildah --version

0 commit comments

Comments
 (0)