Skip to content

Commit 2fd2a9b

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1535 from openshift-cherrypick-robot/cherry-pick-1521-to-release-1.8
[release-1.8] chore: fixed some minor issues
2 parents 48e5763 + 4bb39b3 commit 2fd2a9b

File tree

4 files changed

+47
-41
lines changed

4 files changed

+47
-41
lines changed

‎integration-tests/scripts/.ci-env‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#### Templates
22
# For testing your changes, replace with your fork and branch of tssc-sample-templates
3-
export DEVELOPER_HUB__CATALOG__URL=https://github.com/redhat-appstudio/tssc-sample-templates/blob/main/all.yaml
3+
export DEVELOPER_HUB_CATALOG_URL=
44

55
#### Customize App Deployment Namespaces
66
# For setting different tssc app deployment namespaces
@@ -9,12 +9,13 @@ export TSSC_APP_DEPLOYMENT_NAMESPACES=""
99

1010
#### Github
1111
# https://docs.redhat.com/en/documentation/red_hat_trusted_application_pipeline/1.2/html-single/installing_red_hat_trusted_application_pipeline/index#creating_a_github_personal_access_token
12-
export GITHUB__APP__ID=
13-
export GITHUB__APP__CLIENT__ID=
14-
export GITHUB__APP__CLIENT__SECRET=
15-
export GITHUB__APP__PRIVATE_KEY=
16-
export GITOPS__GIT_TOKEN=
17-
export GITHUB__APP__WEBHOOK__SECRET=
12+
export GITHUB_APP_ID=
13+
export GITHUB_APP_CLIENT_ID=
14+
export GITHUB_APP_CLIENT_SECRET=
15+
export GITHUB_APP_PRIVATE_KEY=
16+
export GITOPS_GIT_TOKEN=
17+
export GITHUB_APP_WEBHOOK_SECRET=
18+
export GITHUB_AUTH_USERNAME="rhtap-ci-tests-bot"
1819

1920
#### Gitlab
2021
# https://docs.redhat.com/en/documentation/red_hat_trusted_application_pipeline/1.2/html-single/installing_red_hat_trusted_application_pipeline/index#optional_integrating_gitlab

‎integration-tests/scripts/.env.template‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export pipeline_config="tekton,jenkins,actions,gitlabci" # tekton, jenkins, acti
66

77
#### Templates
88
# For testing your changes, replace with your fork and branch of tssc-sample-templates
9-
export DEVELOPER_HUB__CATALOG__URL=
9+
export DEVELOPER_HUB_CATALOG_URL=
1010

1111
#### Customize App Deployment Namespaces
1212
# For setting different tssc app deployment namespaces
@@ -15,12 +15,13 @@ export TSSC_APP_DEPLOYMENT_NAMESPACES=""
1515

1616
#### Github
1717
# https://docs.redhat.com/en/documentation/red_hat_trusted_application_pipeline/1.2/html-single/installing_red_hat_trusted_application_pipeline/index#creating_a_github_personal_access_token
18-
export GITHUB__APP__ID=
19-
export GITHUB__APP__CLIENT__ID=
20-
export GITHUB__APP__CLIENT__SECRET=
21-
export GITHUB__APP__PRIVATE_KEY=
22-
export GITOPS__GIT_TOKEN=
23-
export GITHUB__APP__WEBHOOK__SECRET=
18+
export GITHUB_APP_ID=
19+
export GITHUB_APP_CLIENT_ID=
20+
export GITHUB_APP_CLIENT_SECRET=
21+
export GITHUB_APP_PRIVATE_KEY=
22+
export GITOPS_GIT_TOKEN=
23+
export GITHUB_APP_WEBHOOK_SECRET=
24+
export GITHUB_AUTH_USERNAME=
2425

2526
#### Gitlab
2627
# https://docs.redhat.com/en/documentation/red_hat_trusted_application_pipeline/1.2/html-single/installing_red_hat_trusted_application_pipeline/index#optional_integrating_gitlab

‎integration-tests/scripts/install.sh‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ ci_enabled() {
7777
}
7878

7979
update_dh_catalog_url() {
80-
# if DEVELOPER_HUB__CATALOG__URL is not empty string, then update the catalog url
81-
if [[ -n "${DEVELOPER_HUB__CATALOG__URL}" ]]; then
82-
echo "[INFO] Update dh catalog url with $DEVELOPER_HUB__CATALOG__URL"
83-
yq -i '.tssc.products[] |= select(.name == "Developer Hub").properties.catalogURL=strenv(DEVELOPER_HUB__CATALOG__URL)' "${config_file}"
80+
# if DEVELOPER_HUB_CATALOG_URL is not empty string, then update the catalog url
81+
if [[ -n "${DEVELOPER_HUB_CATALOG_URL}" ]]; then
82+
echo "[INFO] Update dh catalog url with $DEVELOPER_HUB_CATALOG_URL"
83+
yq -i '.tssc.products[] |= select(.name == "Developer Hub").properties.catalogURL=strenv(DEVELOPER_HUB_CATALOG_URL)' "${config_file}"
8484
fi
8585
}
8686

@@ -89,8 +89,11 @@ update_dh_auth_config() {
8989
if [[ " ${auth_config[*]} " =~ " gitlab " ]]; then
9090
echo "[INFO] Change Developer Hub auth to gitlab"
9191
yq -i '.tssc.products[] |= select(.name == "Developer Hub").properties.authProvider = "gitlab"' "${config_file}"
92+
elif [[ " ${auth_config[*]} " =~ " github " ]]; then
93+
echo "[INFO] Change Developer Hub auth to github"
94+
yq -i '.tssc.products[] |= select(.name == "Developer Hub").properties.authProvider = "github"' "${config_file}"
9295
else
93-
echo "[INFO] Keep Developer Hub auth as github (default)"
96+
echo "[INFO] Keep Developer Hub auth as oidc (default)"
9497
fi
9598
}
9699

@@ -128,12 +131,12 @@ github_integration() {
128131
if [[ " ${scm_config[*]} " =~ " github " ]] || [[ " ${auth_config[*]} " =~ " github " ]]; then
129132
echo "[INFO] Config Github integration with TSSC"
130133

131-
GITHUB__APP__ID="${GITHUB__APP__ID:-$(cat /usr/local/rhtap-cli-install/rhdh-github-app-id)}"
132-
GITHUB__APP__CLIENT__ID="${GITHUB__APP__CLIENT__ID:-$(cat /usr/local/rhtap-cli-install/rhdh-github-client-id)}"
133-
GITHUB__APP__CLIENT__SECRET="${GITHUB__APP__CLIENT__SECRET:-$(cat /usr/local/rhtap-cli-install/rhdh-github-client-secret)}"
134-
GITHUB__APP__PRIVATE_KEY="${GITHUB__APP__PRIVATE_KEY:-$(base64 -d < /usr/local/rhtap-cli-install/rhdh-github-private-key | sed 's/^/ /')}"
135-
GITOPS__GIT_TOKEN="${GITOPS__GIT_TOKEN:-$(cat /usr/local/rhtap-cli-install/github_token)}"
136-
GITHUB__APP__WEBHOOK__SECRET="${GITHUB__APP__WEBHOOK__SECRET:-$(cat /usr/local/rhtap-cli-install/rhdh-github-webhook-secret)}"
134+
GITHUB_APP_ID="${GITHUB_APP_ID:-$(cat /usr/local/rhtap-cli-install/rhdh-github-app-id)}"
135+
GITHUB_APP_CLIENT_ID="${GITHUB_APP_CLIENT_ID:-$(cat /usr/local/rhtap-cli-install/rhdh-github-client-id)}"
136+
GITHUB_APP_CLIENT_SECRET="${GITHUB_APP_CLIENT_SECRET:-$(cat /usr/local/rhtap-cli-install/rhdh-github-client-secret)}"
137+
GITHUB_APP_PRIVATE_KEY="${GITHUB_APP_PRIVATE_KEY:-$(base64 -d < /usr/local/rhtap-cli-install/rhdh-github-private-key | sed 's/^/ /')}"
138+
GITOPS_GIT_TOKEN="${GITOPS_GIT_TOKEN:-$(cat /usr/local/rhtap-cli-install/github_token)}"
139+
GITHUB_APP_WEBHOOK_SECRET="${GITHUB_APP_WEBHOOK_SECRET:-$(cat /usr/local/rhtap-cli-install/rhdh-github-webhook-secret)}"
137140

138141
cat << EOF | kubectl apply -f -
139142
kind: Secret
@@ -143,14 +146,15 @@ metadata:
143146
name: tssc-github-integration
144147
namespace: tssc
145148
stringData:
146-
id: "$GITHUB__APP__ID"
147-
clientId: "$GITHUB__APP__CLIENT__ID"
148-
clientSecret: "$GITHUB__APP__CLIENT__SECRET"
149+
id: "$GITHUB_APP_ID"
150+
clientId: "$GITHUB_APP_CLIENT_ID"
151+
clientSecret: "$GITHUB_APP_CLIENT_SECRET"
149152
host: github.com
150153
pem: |
151-
$(printf "%s\n" "${GITHUB__APP__PRIVATE_KEY}" | sed 's/^/ /')
152-
token: "$GITOPS__GIT_TOKEN"
153-
webhookSecret: "$GITHUB__APP__WEBHOOK__SECRET"
154+
$(printf "%s\n" "${GITHUB_APP_PRIVATE_KEY}" | sed 's/^/ /')
155+
token: "$GITOPS_GIT_TOKEN"
156+
username: "$GITHUB_AUTH_USERNAME"
157+
webhookSecret: "$GITHUB_APP_WEBHOOK_SECRET"
154158
EOF
155159
fi
156160
}
@@ -189,7 +193,7 @@ gitlab_integration() {
189193
GITLAB__APP_SECRET="${GITLAB__APP_SECRET:-$(cat /usr/local/rhtap-cli-install/gitlab-app-secret)}"
190194
GITLAB__GROUP="${GITLAB__GROUP:-$(cat /usr/local/rhtap-cli-install/gitlab-group)}"
191195

192-
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" gitlab --token="${GITLAB__TOKEN}" --app-id="${GITLAB__APP__ID}" --app-secret="${GITLAB__APP_SECRET}" --group="${GITLAB__GROUP}"
196+
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" gitlab --token="${GITLAB__TOKEN}" --app-id="${GITLAB__APP__ID}" --app-secret="${GITLAB__APP_SECRET}" --group="${GITLAB__GROUP}" --force
193197
fi
194198
}
195199

@@ -200,7 +204,7 @@ quay_integration() {
200204
QUAY__DOCKERCONFIGJSON="${QUAY__DOCKERCONFIGJSON:-$(cat /usr/local/rhtap-cli-install/quay-dockerconfig-json)}"
201205
QUAY__API_TOKEN="${QUAY__API_TOKEN:-$(cat /usr/local/rhtap-cli-install/quay-api-token)}"
202206

203-
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" quay --url="https://quay.io" --dockerconfigjson="${QUAY__DOCKERCONFIGJSON}" --token="${QUAY__API_TOKEN}"
207+
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" quay --url="https://quay.io" --dockerconfigjson="${QUAY__DOCKERCONFIGJSON}" --token="${QUAY__API_TOKEN}" --force
204208
fi
205209
}
206210

@@ -224,7 +228,7 @@ acs_integration() {
224228
ACS__CENTRAL_ENDPOINT="${ACS__CENTRAL_ENDPOINT:-$(cat /usr/local/rhtap-cli-install/acs-central-endpoint)}"
225229
ACS__API_TOKEN="${ACS__API_TOKEN:-$(cat /usr/local/rhtap-cli-install/acs-api-token)}"
226230

227-
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" acs --endpoint="${ACS__CENTRAL_ENDPOINT}" --token="${ACS__API_TOKEN}"
231+
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" acs --endpoint="${ACS__CENTRAL_ENDPOINT}" --token="${ACS__API_TOKEN}" --force
228232
fi
229233
}
230234

@@ -235,7 +239,7 @@ bitbucket_integration() {
235239
BITBUCKET_USERNAME="${BITBUCKET_USERNAME:-$(cat /usr/local/rhtap-cli-install/bitbucket-username)}"
236240
BITBUCKET_APP_PASSWORD="${BITBUCKET_APP_PASSWORD:-$(cat /usr/local/rhtap-cli-install/bitbucket-app-password)}"
237241

238-
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" bitbucket --host="${BITBUCKET_HOST}" --username="${BITBUCKET_USERNAME}" --app-password="${BITBUCKET_APP_PASSWORD}"
242+
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" bitbucket --host="${BITBUCKET_HOST}" --username="${BITBUCKET_USERNAME}" --app-password="${BITBUCKET_APP_PASSWORD}" --force
239243
fi
240244
}
241245

@@ -261,7 +265,7 @@ tpa_integration() {
261265
OIDC_CLIENT_SECRET="${OIDC_CLIENT_SECRET:-$(cat /usr/local/rhtap-cli-install/oidc-client-secret)}"
262266
OIDC_ISSUER_URL="${OIDC_ISSUER_URL:-$(cat /usr/local/rhtap-cli-install/oidc-issuer-url)}"
263267

264-
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" trustification --bombastic-api-url="${BOMBASTIC_API_URL}" --oidc-client-id="${OIDC_CLIENT_ID}" --oidc-client-secret="${OIDC_CLIENT_SECRET}" --oidc-issuer-url="${OIDC_ISSUER_URL}" --supported-cyclonedx-version="${SUPPORTED_CYCLONEDX_VERSION}"
268+
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" trustification --bombastic-api-url="${BOMBASTIC_API_URL}" --oidc-client-id="${OIDC_CLIENT_ID}" --oidc-client-secret="${OIDC_CLIENT_SECRET}" --oidc-issuer-url="${OIDC_ISSUER_URL}" --supported-cyclonedx-version="${SUPPORTED_CYCLONEDX_VERSION}" --force
265269
fi
266270
}
267271

@@ -272,7 +276,7 @@ artifactory_integration() {
272276
ARTIFACTORY_URL="${ARTIFACTORY_URL:-$(cat /usr/local/rhtap-cli-install/artifactory-url)}"
273277
ARTIFACTORY_TOKEN="${ARTIFACTORY_TOKEN:-$(cat /usr/local/rhtap-cli-install/artifactory-token)}"
274278
ARTIFACTORY_DOCKERCONFIGJSON="${ARTIFACTORY_DOCKERCONFIGJSON:-$(cat /usr/local/rhtap-cli-install/artifactory-dockerconfig-json)}"
275-
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" artifactory --url="${ARTIFACTORY_URL}" --token="${ARTIFACTORY_TOKEN}" --dockerconfigjson="${ARTIFACTORY_DOCKERCONFIGJSON}"
279+
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" artifactory --url="${ARTIFACTORY_URL}" --token="${ARTIFACTORY_TOKEN}" --dockerconfigjson="${ARTIFACTORY_DOCKERCONFIGJSON}" --force
276280
fi
277281
}
278282

@@ -282,7 +286,7 @@ nexus_integration() {
282286

283287
NEXUS_URL="${NEXUS_URL:-$(cat /usr/local/rhtap-cli-install/nexus-ui-url)}"
284288
NEXUS_DOCKERCONFIGJSON="${NEXUS_DOCKERCONFIGJSON:-$(cat /usr/local/rhtap-cli-install/nexus-dockerconfig-json)}"
285-
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" nexus --url="${NEXUS_URL}" --dockerconfigjson="${NEXUS_DOCKERCONFIGJSON}"
289+
"${TSSC_BINARY}" integration --kube-config "$KUBECONFIG" nexus --url="${NEXUS_URL}" --dockerconfigjson="${NEXUS_DOCKERCONFIGJSON}" --force
286290
fi
287291
}
288292

@@ -300,7 +304,7 @@ create_cluster_config() {
300304

301305
echo "[INFO] Applying the cluster configuration, and showing the 'config.yaml'"
302306
set -x
303-
"${TSSC_BINARY}" config --kube-config "$KUBECONFIG" --get --create "$config_file"
307+
"${TSSC_BINARY}" config --kube-config "$KUBECONFIG" --get --create "$config_file" --force
304308
set +x
305309

306310
echo "[INFO] Cluster configuration created successfully"

‎integration-tests/tasks/tssc-install.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ spec:
108108
GIT_REVISION="${GIT_REVISION:-$(echo "$JOB_SPEC" | jq -r '.git.commit_sha')}"
109109
GIT_URL="${GIT_URL:-$(echo "$JOB_SPEC" | jq -r '.git.source_repo_url')}"
110110
TEST_DH_CATALOG_URL="$GIT_URL/blob/$GIT_REVISION/all.yaml"
111-
# Update DEVELOPER_HUB__CATALOG__URL value in .ci-env
112-
sed -i "s|^export DEVELOPER_HUB__CATALOG__URL.*|export DEVELOPER_HUB__CATALOG__URL=${TEST_DH_CATALOG_URL}|" "${env_file}"
111+
# Update DEVELOPER_HUB_CATALOG_URL value in .ci-env
112+
sed -i "s|^export DEVELOPER_HUB_CATALOG_URL.*|export DEVELOPER_HUB_CATALOG_URL=${TEST_DH_CATALOG_URL}|" "${env_file}"
113113
fi
114114
115115
echo "INFO: .env file for tssc installation"

0 commit comments

Comments
 (0)