Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[minor] Added HMAC to COS role #1215

Merged
merged 16 commits into from
Aug 30, 2024
Merged

[minor] Added HMAC to COS role #1215

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4d62147
[patch] added hmac environment variable
Vishal-patel-7 Aug 21, 2024
a68f59f
[patch] added missing env variable
Vishal-patel-7 Aug 21, 2024
92e13ba
[patch] env variable changes
Vishal-patel-7 Aug 21, 2024
a16d79c
Merge branch 'master' into MASCORE-3383-1
Vishal-patel-7 Aug 28, 2024
5122985
[patch] deleted tar file
Vishal-patel-7 Aug 28, 2024
960e4ec
[patch] added file
Vishal-patel-7 Aug 28, 2024
3193bd2
[patch] added file
Vishal-patel-7 Aug 28, 2024
6fb9438
[patch] removed file
Vishal-patel-7 Aug 28, 2024
bb5bfd6
Merge branch 'master' into MASCORE-3383-1
whitfiea Aug 29, 2024
b942d90
[patch] added condition to check scope
Vishal-patel-7 Aug 30, 2024
b461c5a
Merge branch 'MASCORE-3383-1' of https://github.com/ibm-mas/cli into …
Vishal-patel-7 Aug 30, 2024
d115558
[patch] fixed build issue
Vishal-patel-7 Aug 30, 2024
2d6e3e6
Merge branch 'master' into MASCORE-3383-1
Vishal-patel-7 Aug 30, 2024
5a448b2
[patch] added suffix as parameter
Vishal-patel-7 Aug 30, 2024
5ffe77c
[patch] dependency added
Vishal-patel-7 Aug 30, 2024
2610d08
[patch] added missing bracket
Vishal-patel-7 Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tekton/src/params/install.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,10 @@
type: string
description: COS action to be performed (provision or deprovision)
default: ""
- name: use_hmac
type: string
description: Optional boolean variable weather hmac is enabled or not
default: ""

# MAS Integration - Grafana
# -----------------------------------------------------------------------------
Expand Down
3 changes: 3 additions & 0 deletions tekton/src/pipelines/fvt-deprovision-after.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ spec:
- name: cos_action
type: string
default: ""
- name: use_hmac
type: string
default: ""

# IBM Event Streams
- name: eventstreams_resourcegroup
Expand Down
5 changes: 5 additions & 0 deletions tekton/src/pipelines/gitops/deprovision-mas-deps.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ spec:
- name: ibmcloud_apikey
type: string
default: ""
- name: use_hmac
type: string
default: ""

tasks:
{% if wait_for_deprovision == true %}
Expand Down Expand Up @@ -198,6 +201,8 @@ spec:
value: $(params.ibmcloud_resourcegroup)
- name: ibmcloud_apikey
value: $(params.ibmcloud_apikey)
- name: use_hmac
value: $(params.use_hmac)

workspaces:
- name: configs
Expand Down
6 changes: 6 additions & 0 deletions tekton/src/pipelines/gitops/gitops-mas-deps.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ spec:
type: string
description: COS action to be performed (provision or deprovision)
default: ""
- name: use_hmac
type: string
description: Optional boolean variable weather hmac is enabled or not
default: ""

- name: ibmcloud_apikey
type: string
Expand Down Expand Up @@ -214,6 +218,8 @@ spec:
value: $(params.ibmcloud_resourcegroup)
- name: ibmcloud_apikey
value: $(params.ibmcloud_apikey)
- name: use_hmac
value: $(params.use_hmac

workspaces:
- name: configs
Expand Down
2 changes: 2 additions & 0 deletions tekton/src/pipelines/taskdefs/dependencies/cos.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

- name: custom_labels
value: $(params.custom_labels)
- name: use_hmac
value: $(params.use_hmac)
taskRef:
kind: Task
name: mas-devops-cos
Expand Down
6 changes: 6 additions & 0 deletions tekton/src/tasks/dependencies/cos.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ spec:
type: string
description: Name of COS instance in IBM Cloud account
default: ""
- name: use_hmac
type: string
description: Optional boolean variable weather hmac is enabled or not
default: ""


stepTemplate:
Expand Down Expand Up @@ -72,6 +76,8 @@ spec:
value: $(params.cos_resourcegroup)
- name: IBMCLOUD_RESOURCEGROUP
value: $(params.ibmcloud_resourcegroup)
- name: USE_HMAC
value: $(params.use_hmac)
steps:
- name: cos
command:
Expand Down
4 changes: 4 additions & 0 deletions tekton/src/tasks/gitops/gitops-cos.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ spec:
type: string
- name: ibmcloud_apikey
type: string
- name: use_hmac
type: string

stepTemplate:
name: gitops-cos
Expand Down Expand Up @@ -62,6 +64,8 @@ spec:
value: $(params.ibmcloud_resourcegroup)
- name: IBMCLOUD_APIKEY
value: $(params.ibmcloud_apikey)
- name: USE_HMAC
value: $(params.use_hmac)
steps:
- args:
- |-
Expand Down
4 changes: 4 additions & 0 deletions tekton/src/tasks/gitops/gitops-deprovision-cos.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ spec:
type: string
- name: ibmcloud_apikey
type: string
- name: use_hmac
type: string

stepTemplate:
name: gitops-deprovision-cos
Expand Down Expand Up @@ -75,6 +77,8 @@ spec:
value: $(params.ibmcloud_resourcegroup)
- name: IBMCLOUD_APIKEY
value: $(params.ibmcloud_apikey)
- name: USE_HMAC
value: $(params.use_hmac)
steps:
- args:
- |-
Expand Down