File tree Expand file tree Collapse file tree 6 files changed +27
-46
lines changed
ci/images/ci-runner/hack/bin Expand file tree Collapse file tree 6 files changed +27
-46
lines changed Original file line number Diff line number Diff line change @@ -27,20 +27,20 @@ spec:
27
27
value : " $(params.region)"
28
28
- name : OCP_VERSION
29
29
value : " $(params.ocp_version)"
30
- - name : BW_CLIENTID
30
+ - name : ROSA_TOKEN
31
31
valueFrom :
32
32
secretKeyRef :
33
- name : hypershift-bitwarden
34
- key : " BW_CLIENTID "
35
- - name : BW_CLIENTSECRET
33
+ name : plnsvc-ci-secret
34
+ key : " PLNSVC_ROSA_TOKEN "
35
+ - name : AWS_ACCESS_KEY_ID
36
36
valueFrom :
37
37
secretKeyRef :
38
- name : hypershift-bitwarden
39
- key : " BW_CLIENTSECRET "
40
- - name : BW_PASSWORD
38
+ name : plnsvc-ci-secret
39
+ key : " PLNSVC_AWS_KEY_ID "
40
+ - name : AWS_SECRET_ACCESS_KEY
41
41
valueFrom :
42
42
secretKeyRef :
43
- name : hypershift-bitwarden
44
- key : " BW_PASSWORD "
43
+ name : plnsvc-ci-secret
44
+ key : " PLNSVC_AWS_KEY "
45
45
command :
46
46
- $(workspaces.source.path)/ci/images/ci-runner/hack/bin/deploy-cluster.sh
Original file line number Diff line number Diff line change @@ -18,21 +18,21 @@ spec:
18
18
env :
19
19
- name : CLUSTER_NAME
20
20
value : " $(params.cluster-name)"
21
- - name : BW_CLIENTID
21
+ - name : ROSA_TOKEN
22
22
valueFrom :
23
23
secretKeyRef :
24
- name : hypershift-bitwarden
25
- key : " BW_CLIENTID "
26
- - name : BW_CLIENTSECRET
24
+ name : plnsvc-ci-secret
25
+ key : " PLNSVC_ROSA_TOKEN "
26
+ - name : AWS_ACCESS_KEY_ID
27
27
valueFrom :
28
28
secretKeyRef :
29
- name : hypershift-bitwarden
30
- key : " BW_CLIENTSECRET "
31
- - name : BW_PASSWORD
29
+ name : plnsvc-ci-secret
30
+ key : " PLNSVC_AWS_KEY_ID "
31
+ - name : AWS_SECRET_ACCESS_KEY
32
32
valueFrom :
33
33
secretKeyRef :
34
- name : hypershift-bitwarden
35
- key : " BW_PASSWORD "
34
+ name : plnsvc-ci-secret
35
+ key : " PLNSVC_AWS_KEY "
36
36
- name : KUBECONFIG_DIR
37
37
value : " $(workspaces.output.path)"
38
38
- name : REGION
Original file line number Diff line number Diff line change @@ -14,21 +14,21 @@ spec:
14
14
- name : destroy
15
15
image : quay.io/redhat-pipeline-service/ci-runner:$(params.target_branch)
16
16
env :
17
- - name : BW_CLIENTID
17
+ - name : ROSA_TOKEN
18
18
valueFrom :
19
19
secretKeyRef :
20
- name : hypershift-bitwarden
21
- key : " BW_CLIENTID "
22
- - name : BW_CLIENTSECRET
20
+ name : plnsvc-ci-secret
21
+ key : " PLNSVC_ROSA_TOKEN "
22
+ - name : AWS_ACCESS_KEY_ID
23
23
valueFrom :
24
24
secretKeyRef :
25
- name : hypershift-bitwarden
26
- key : " BW_CLIENTSECRET "
27
- - name : BW_PASSWORD
25
+ name : plnsvc-ci-secret
26
+ key : " PLNSVC_AWS_KEY_ID "
27
+ - name : AWS_SECRET_ACCESS_KEY
28
28
valueFrom :
29
29
secretKeyRef :
30
- name : hypershift-bitwarden
31
- key : " BW_PASSWORD "
30
+ name : plnsvc-ci-secret
31
+ key : " PLNSVC_AWS_KEY "
32
32
- name : REGION
33
33
value : " $(params.region)"
34
34
command :
Original file line number Diff line number Diff line change @@ -13,13 +13,6 @@ source "$SCRIPT_DIR/utils.sh"
13
13
14
14
EXCLUDE_CLUSTER=(local-cluster newci4plnsvc)
15
15
16
- fetch_bitwarden_secrets () {
17
- printf " Fetch secrets from bitwarden server\n" | indent 2
18
- open_bitwarden_session
19
- get_aws_credentials
20
- get_rosa_token
21
- }
22
-
23
16
is_cluster_expired () {
24
17
cluster_name=$1
25
18
@@ -47,7 +40,6 @@ destroy_expired_clusters() {
47
40
done
48
41
}
49
42
50
- fetch_bitwarden_secrets
51
43
setx_off
52
44
rosa login --token=" $ROSA_TOKEN "
53
45
setx_on
Original file line number Diff line number Diff line change @@ -11,13 +11,6 @@ SCRIPT_DIR="$(
11
11
# shellcheck source=ci/images/ci-runner/hack/bin/utils.sh
12
12
source " $SCRIPT_DIR /utils.sh"
13
13
14
- fetch_bitwarden_secrets () {
15
- printf " Fetch secrets from bitwarden server\n" | indent 2
16
- open_bitwarden_session
17
- get_aws_credentials
18
- get_rosa_token
19
- }
20
-
21
14
print_debug_info () {
22
15
printf " Print debug info......\n" | indent 2
23
16
rosa describe cluster --cluster=" $CLUSTER_NAME "
@@ -102,5 +95,4 @@ deploy_cluster() {
102
95
check_clusteroperators
103
96
}
104
97
105
- fetch_bitwarden_secrets
106
98
deploy_cluster
Original file line number Diff line number Diff line change @@ -36,9 +36,6 @@ source "$SCRIPT_DIR/utils.sh"
36
36
37
37
if [[ -n " $CLUSTER_NAME " ]]; then
38
38
echo " Started to destroy cluster [$CLUSTER_NAME ]..."
39
- open_bitwarden_session
40
- get_aws_credentials
41
- get_rosa_token
42
39
43
40
printf " Log in to your Red Hat account...\n" | indent 2
44
41
setx_off
You can’t perform that action at this time.
0 commit comments