[minor] Added HMAC to COS role (#1228)

Co-authored-by: unnati-solanki-git <[email protected]>
ibm-mas · Sep 10, 2024 · 8b6b7c6 · 8b6b7c6
1 parent b0035d3
commit 8b6b7c6
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 3 deletions.
diff --git a/tekton/src/params/install.yml.j2 b/tekton/src/params/install.yml.j2
@@ -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
 # -----------------------------------------------------------------------------
@@ -638,7 +642,7 @@
   default: ""
 - name: mas_arcgis_channel
   type: string
-  description: Default channel for IBM Maximo Location Services for ESRI 
+  description: Default channel for IBM Maximo Location Services for ESRI
   default: "" # default is handled by ansible-devops
 
 # MAS Application Configuration - Health Application

diff --git a/tekton/src/pipelines/fvt-deprovision-after.yml.j2 b/tekton/src/pipelines/fvt-deprovision-after.yml.j2
@@ -53,6 +53,9 @@ spec:
     - name: cos_action
       type: string
       default: ""
+    - name: use_hmac
+      type: string
+      default: ""
 
     # IBM Event Streams
     - name: eventstreams_resourcegroup

diff --git a/tekton/src/pipelines/gitops/deprovision-mas-deps.yml.j2 b/tekton/src/pipelines/gitops/deprovision-mas-deps.yml.j2
@@ -84,6 +84,9 @@ spec:
     - name: ibmcloud_apikey
       type: string
       default: ""
+    - name: use_hmac
+      type: string
+      default: ""
 
   tasks:
 {% if wait_for_deprovision == true %}
@@ -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

diff --git a/tekton/src/pipelines/gitops/gitops-mas-deps.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-deps.yml.j2
@@ -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
@@ -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

diff --git a/tekton/src/pipelines/taskdefs/dependencies/cos.yml.j2 b/tekton/src/pipelines/taskdefs/dependencies/cos.yml.j2
@@ -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

diff --git a/tekton/src/tasks/dependencies/cos.yml.j2 b/tekton/src/tasks/dependencies/cos.yml.j2
@@ -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:
@@ -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:

diff --git a/tekton/src/tasks/gitops/gitops-cos.yml.j2 b/tekton/src/tasks/gitops/gitops-cos.yml.j2
@@ -32,6 +32,8 @@ spec:
       type: string
     - name: ibmcloud_apikey
       type: string
+    - name: use_hmac
+      type: string
 
   stepTemplate:
     name: gitops-cos
@@ -62,17 +64,19 @@ spec:
         value: $(params.ibmcloud_resourcegroup)
       - name: IBMCLOUD_APIKEY
         value: $(params.ibmcloud_apikey)
+      - name: USE_HMAC
+        value: $(params.use_hmac)
   steps:
     - args:
       - |-
         git config --global user.name "MAS Automation"
         git config --global user.email "[email protected]"
         git config --global user.password $GITHUB_PAT
-        
+
         export MAS_CONFIG_DIR=/workspace/configs/$MAS_INSTANCE_ID-cos
         mkdir -p /workspace/configs/$MAS_INSTANCE_ID-cos
         mkdir -p /tmp/init-cos
-        
+
         mas gitops-cos -a $ACCOUNT -c $CLUSTER_NAME \
         --dir /tmp/init-cos \
         --secrets-path $SECRET_PATH

diff --git a/tekton/src/tasks/gitops/gitops-deprovision-cos.yml.j2 b/tekton/src/tasks/gitops/gitops-deprovision-cos.yml.j2
@@ -37,6 +37,8 @@ spec:
       type: string
     - name: ibmcloud_apikey
       type: string
+    - name: use_hmac
+      type: string
 
   stepTemplate:
     name: gitops-deprovision-cos
@@ -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:
       - |-