Skip to content

Commit 541656b

Browse files
committed
comment out ACS env vars in GitHub Actions
The automatically generated GitHub Actions workflows include a step which checks that exposed environment variables are actually set. `REKOR_HOST` and `TUF_MIRROR` should not be required and there is currently no way to easily mark the env vars as not required for the required check step. Comment them out and let users uncomment them when they want to use an external instance
1 parent dc5379e commit 541656b

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ env:
2828
# Set this password for your specific registry
2929
IMAGE_REGISTRY_PASSWORD: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
3030
# Set this only when using an external Rekor instance
31-
REKOR_HOST: ${{ secrets.REKOR_HOST }}
31+
# REKOR_HOST: ${{ secrets.REKOR_HOST }}
3232
# Set this only when using an external TUF instance
33-
TUF_MIRROR: ${{ secrets.TUF_MIRROR }}
33+
# TUF_MIRROR: ${{ secrets.TUF_MIRROR }}
3434
# QUAY_IO_CREDS_USR: ${{ secrets.QUAY_IO_CREDS_USR }}
3535
# QUAY_IO_CREDS_PSW: ${{ secrets.QUAY_IO_CREDS_PSW }}
3636
# ARTIFACTORY_IO_CREDS_USR: ${{ secrets.ARTIFACTORY_IO_CREDS_USR }}
@@ -78,9 +78,9 @@ jobs:
7878
/* Set this password for your specific registry */
7979
IMAGE_REGISTRY_PASSWORD: `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`,
8080
/* Set this only when using an external Rekor instance */
81-
REKOR_HOST: `${{ secrets.REKOR_HOST }}`,
81+
/*REKOR_HOST: `${{ secrets.REKOR_HOST }}`, */
8282
/* Set this only when using an external TUF instance */
83-
TUF_MIRROR: `${{ secrets.TUF_MIRROR }}`,
83+
/*TUF_MIRROR: `${{ secrets.TUF_MIRROR }}`, */
8484
/*QUAY_IO_CREDS_USR: `${{ secrets.QUAY_IO_CREDS_USR }}`, */
8585
/*QUAY_IO_CREDS_PSW: `${{ secrets.QUAY_IO_CREDS_PSW }}`, */
8686
/*ARTIFACTORY_IO_CREDS_USR: `${{ secrets.ARTIFACTORY_IO_CREDS_USR }}`, */

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ env:
2424
# Set this password for your specific registry
2525
IMAGE_REGISTRY_PASSWORD: ${{ secrets.IMAGE_REGISTRY_PASSWORD }}
2626
# Set this only when using an external Rekor instance
27-
REKOR_HOST: ${{ secrets.REKOR_HOST }}
27+
# REKOR_HOST: ${{ secrets.REKOR_HOST }}
2828
# Set this only when using an external TUF instance
29-
TUF_MIRROR: ${{ secrets.TUF_MIRROR }}
29+
# TUF_MIRROR: ${{ secrets.TUF_MIRROR }}
3030
# QUAY_IO_CREDS_USR: ${{ secrets.QUAY_IO_CREDS_USR }}
3131
# QUAY_IO_CREDS_PSW: ${{ secrets.QUAY_IO_CREDS_PSW }}
3232
# ARTIFACTORY_IO_CREDS_USR: ${{ secrets.ARTIFACTORY_IO_CREDS_USR }}
@@ -79,9 +79,9 @@ jobs:
7979
/* Set this password for your specific registry */
8080
IMAGE_REGISTRY_PASSWORD: `${{ secrets.IMAGE_REGISTRY_PASSWORD }}`,
8181
/* Set this only when using an external Rekor instance */
82-
REKOR_HOST: `${{ secrets.REKOR_HOST }}`,
82+
/*REKOR_HOST: `${{ secrets.REKOR_HOST }}`, */
8383
/* Set this only when using an external TUF instance */
84-
TUF_MIRROR: `${{ secrets.TUF_MIRROR }}`,
84+
/*TUF_MIRROR: `${{ secrets.TUF_MIRROR }}`, */
8585
/*QUAY_IO_CREDS_USR: `${{ secrets.QUAY_IO_CREDS_USR }}`, */
8686
/*QUAY_IO_CREDS_PSW: `${{ secrets.QUAY_IO_CREDS_PSW }}`, */
8787
/*ARTIFACTORY_IO_CREDS_USR: `${{ secrets.ARTIFACTORY_IO_CREDS_USR }}`, */

templates/data.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,11 @@ build_secrets:
3131
- name: REKOR_HOST
3232
if: 'isGitHub'
3333
comment: "Set this only when using an external Rekor instance"
34+
commented_out: true
3435
- name: TUF_MIRROR
3536
if: 'isGitHub'
3637
comment: "Set this only when using an external TUF instance"
38+
commented_out: true
3739
- name: IMAGE_REGISTRY_USER
3840
if: '!isGitHub'
3941
commented_out: true
@@ -112,9 +114,11 @@ gitops_secrets:
112114
- name: REKOR_HOST
113115
if: 'isGitHub'
114116
comment: "Set this only when using an external Rekor instance"
117+
commented_out: true
115118
- name: TUF_MIRROR
116119
if: 'isGitHub'
117120
comment: "Set this only when using an external TUF instance"
121+
commented_out: true
118122
# other CIs in transition so comment out and leave Quay.io
119123
- name: IMAGE_REGISTRY_USER
120124
if: '!isGitHub'

0 commit comments

Comments
 (0)