Skip to content

Commit 7f65514

Browse files
committed
Remove TRUSTIFICATION_* from Jenkins secrets
Since these are not contain sensitive information, it is now accessed via a regular variables instead of a credential. Signed-off-by: Luiz Carvalho <[email protected]>
1 parent 5704c17 commit 7f65514

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

generated/gitops-template/jenkins/Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ pipeline {
1313
/* Used to verify the image signature and attestation */
1414
/* COSIGN_PUBLIC_KEY = credentials('COSIGN_PUBLIC_KEY') */
1515
/* URL of the BOMbastic api host (e.g. https://sbom.trustification.dev) */
16-
TRUSTIFICATION_BOMBASTIC_API_URL = credentials('TRUSTIFICATION_BOMBASTIC_API_URL')
16+
/* TRUSTIFICATION_BOMBASTIC_API_URL = credentials('TRUSTIFICATION_BOMBASTIC_API_URL') */
1717
/* URL of the OIDC token issuer (e.g. https://sso.trustification.dev/realms/chicken) */
18-
TRUSTIFICATION_OIDC_ISSUER_URL = credentials('TRUSTIFICATION_OIDC_ISSUER_URL')
19-
TRUSTIFICATION_OIDC_CLIENT_ID = credentials('TRUSTIFICATION_OIDC_CLIENT_ID')
20-
TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION = credentials('TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION')
18+
/* TRUSTIFICATION_OIDC_ISSUER_URL = credentials('TRUSTIFICATION_OIDC_ISSUER_URL') */
19+
/* TRUSTIFICATION_OIDC_CLIENT_ID = credentials('TRUSTIFICATION_OIDC_CLIENT_ID') */
20+
/* TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION = credentials('TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION') */
2121
/* Set when using Jenkins on non-local cluster and using an external Rekor instance */
2222
/* REKOR_HOST = credentials('REKOR_HOST') */
2323
/* Set when using Jenkins on non-local cluster and using an external TUF instance */

templates/data.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,32 @@ gitops_variables:
129129
comment: Used to verify the image signature and attestation
130130

131131
- name: TRUSTIFICATION_BOMBASTIC_API_URL
132+
if: 'isGitHub || isAzure'
133+
comment: URL of the BOMbastic api host (e.g. https://sbom.trustification.dev)
134+
- name: TRUSTIFICATION_BOMBASTIC_API_URL
135+
if: '!isGitHub && !isAzure'
136+
commented_out: true
132137
comment: URL of the BOMbastic api host (e.g. https://sbom.trustification.dev)
138+
133139
- name: TRUSTIFICATION_OIDC_ISSUER_URL
140+
if: 'isGitHub || isAzure'
141+
comment: URL of the OIDC token issuer (e.g. https://sso.trustification.dev/realms/chicken)
142+
- name: TRUSTIFICATION_OIDC_ISSUER_URL
143+
if: '!isGitHub && !isAzure'
144+
commented_out: true
134145
comment: URL of the OIDC token issuer (e.g. https://sso.trustification.dev/realms/chicken)
146+
147+
- name: TRUSTIFICATION_OIDC_CLIENT_ID
148+
if: 'isGitHub || isAzure'
135149
- name: TRUSTIFICATION_OIDC_CLIENT_ID
150+
if: '!isGitHub && !isAzure'
151+
commented_out: true
152+
153+
- name: TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION
154+
if: 'isGitHub || isAzure'
136155
- name: TRUSTIFICATION_SUPPORTED_CYCLONEDX_VERSION
156+
if: '!isGitHub && !isAzure'
157+
commented_out: true
137158

138159
# If the OCI registry is not public then ec needs some credentials so it can see the attestations.
139160
# Todo: Use different credentials here so we provide read access only instead of read/write access.

0 commit comments

Comments
 (0)