Skip to content

Commit 159ecc7

Browse files
author
Sean Sundberg
authored
Automates password reset and uses internal url (#13)
* Bumps tool-config chart to v0.9.0 * Adds privateUrl to tool-config values that points to internal sonarqube service url * Adds job to reset sonarqube password and generate an api token cloud-native-toolkit/planning#484 cloud-native-toolkit/planning#324
1 parent 54bd9e2 commit 159ecc7

File tree

11 files changed

+63
-14
lines changed

11 files changed

+63
-14
lines changed

.github/scripts/validate-deploy.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@ fi
3737

3838
echo "Validating endpoints:\n${ENDPOINTS}"
3939

40-
echo "${ENDPOINTS}" | while read endpoint; do
40+
echo "${ENDPOINTS}" | while read -r endpoint; do
4141
if [[ -n "${endpoint}" ]]; then
42-
${SCRIPT_DIR}/waitForEndpoint.sh "${endpoint}" 10 10
42+
if [[ "${endpoint}" =~ destroytest ]]; then
43+
echo "Skipping destroytest endpoint"
44+
else
45+
"${SCRIPT_DIR}/waitForEndpoint.sh" "${endpoint}" 10 10
46+
fi
4347
fi
4448
done
4549

.github/scripts/waitForEndpoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ count=0
1414

1515
sleep 20
1616

17-
until [[ $(curl -X GET -Iq --insecure "${URL}" | grep -E "403|200") ]] || \
17+
until [[ $(curl -X GET -LLq --insecure "${URL}" | grep -E "401|403|200") ]] || \
1818
[[ $count -eq ${WAIT_COUNT} ]]
1919
do
2020
echo ">>> waiting for ${URL} to be available"

.github/workflows/verify.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
# The type of runner that the job will run on
1515
if: "!contains(github.event.commits[0].message, '[skip ci]')"
1616
runs-on: ubuntu-latest
17-
container: ibmgaragecloud/cli-tools:0.5.0-lite
17+
container: ibmgaragecloud/cli-tools:0.6.0-lite
1818

1919
strategy:
2020
matrix:
21-
platform: [iks118_vpc, ocp4_vpc, ocp44_vpc]
21+
platform: [ocp4_vpc, ocp44_vpc]
2222
# max-parallel: 1
2323
fail-fast: false
2424

chart/sonarqube/Chart.lock

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
dependencies:
22
- name: service-account
33
repository: https://ibm-garage-cloud.github.io/toolkit-charts/
4-
version: 0.4.0
4+
version: 0.5.0
5+
- name: service-account
6+
repository: https://ibm-garage-cloud.github.io/toolkit-charts/
7+
version: 0.5.0
58
- name: sonarqube
69
repository: https://oteemo.github.io/charts
710
version: 6.6.0
@@ -10,6 +13,9 @@ dependencies:
1013
version: 0.3.0
1114
- name: tool-config
1215
repository: https://ibm-garage-cloud.github.io/toolkit-charts/
13-
version: 0.8.1
14-
digest: sha256:d26461cfcb840e1a2a49535c7418596acbbecb24e00f6952f6a472b5e5d35e37
15-
generated: "2020-07-25T16:34:41.07768-05:00"
16+
version: 0.9.0
17+
- name: setup-job
18+
repository: https://ibm-garage-cloud.github.io/toolkit-charts/
19+
version: 0.1.7
20+
digest: sha256:46292e695609d61996869f2eaa0b33f02aaa9cf830b16ecbe090df04193f8f51
21+
generated: "2020-08-20T07:53:39.523465-05:00"
-2.02 KB
Binary file not shown.
2.19 KB
Binary file not shown.
1.75 KB
Binary file not shown.
-118 KB
Binary file not shown.
141 KB
Binary file not shown.

chart/sonarqube/requirements.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
dependencies:
22
- name: service-account
3-
version: 0.4.0
3+
version: 0.5.0
44
repository: https://ibm-garage-cloud.github.io/toolkit-charts/
5+
- name: service-account
6+
version: 0.5.0
7+
repository: https://ibm-garage-cloud.github.io/toolkit-charts/
8+
alias: config-service-account
59
- name: sonarqube
610
version: 6.6.0
711
repository: https://oteemo.github.io/charts
812
- name: ocp-route
913
version: 0.3.0
1014
repository: https://ibm-garage-cloud.github.io/toolkit-charts/
1115
- name: tool-config
12-
version: 0.8.1
16+
version: 0.9.0
17+
repository: https://ibm-garage-cloud.github.io/toolkit-charts/
18+
- name: setup-job
19+
version: 0.1.7
1320
repository: https://ibm-garage-cloud.github.io/toolkit-charts/

0 commit comments

Comments
 (0)