Skip to content

Commit c124a4a

Browse files
bksagarSagar BK
andauthored
fix: Removal of ICN Validation for license check
* Removal of the ICN support and fix on the security issue * Upgrading the CIS profile version --------- Co-authored-by: Sagar BK <Sagar.BK1@ibm.com>
1 parent d151c57 commit c124a4a

39 files changed

+44
-322
lines changed

.releaserc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}],
1111
["@semantic-release/exec", {
1212
"successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV",
13-
"publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=${nextRelease.version}"
13+
"publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"
1414
}]
1515
]
1616
}

.tekton/lsf/lsf-pr-pipeline/listener-git-pr-status.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ spec:
7373
- name: solution
7474
description: Provide the value for the solution that is needed for the support of lsf and HPC.
7575
default: "lsf"
76-
- name: ibm_customer_number
77-
description: Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn)..
78-
default: ""
7976
resourcetemplates:
8077
- apiVersion: v1
8178
kind: PersistentVolumeClaim
@@ -142,8 +139,6 @@ spec:
142139
value: $(params.git_user_email)
143140
- name: solution
144141
value: $(params.solution)
145-
- name: ibm_customer_number
146-
value: $(params.ibm_customer_number)
147142
workspaces:
148143
- name: pipeline-ws
149144
persistentVolumeClaim:

.tekton/lsf/lsf-pr-pipeline/lsf-pipeline-git-pr-status.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ spec:
7878
- name: solution
7979
description: Provide the value for the solution that is needed for the support of lsf and HPC.
8080
default: "lsf"
81-
- name: ibm_customer_number
82-
description: Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn)..
83-
default: ""
8481
workspaces:
8582
- name: pipeline-ws
8683
tasks:
@@ -223,8 +220,6 @@ spec:
223220
value: $(params.git_user_email)
224221
- name: solution
225222
value: $(params.solution)
226-
- name: ibm_customer_number
227-
value: $(params.ibm_customer_number)
228223
# - name: wes-lsf-da-ubuntu-pr
229224
# runAfter: [git-clone, pre-requisites-install, ssh-key-creation]
230225
# taskRef:

.tekton/lsf/lsf-regression-pipeline/listener-git-trigger.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ spec:
8080
- name: solution
8181
description: Provide the value for the solution that is needed for the support of lsf and HPC.
8282
default: "lsf"
83-
- name: ibm_customer_number
84-
description: Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn)..
85-
default: ""
8683
- name: pac_ha_exist_certificate
8784
description: PAC HA Existing Certificate
8885
default: ""
@@ -142,8 +139,6 @@ spec:
142139
value: $(params.cos_api_key)
143140
- name: solution
144141
value: $(params.solution)
145-
- name: ibm_customer_number
146-
value: $(params.ibm_customer_number)
147142
- name: hpc_custom_reports_repo
148143
value: $(params.hpc_custom_reports_repo)
149144
- name: hpc_custom_reports_branch
@@ -199,8 +194,6 @@ spec:
199194
value: $(params.git_user_email)
200195
- name: solution
201196
value: $(params.solution)
202-
- name: ibm_customer_number
203-
value: $(params.ibm_customer_number)
204197
- name: pac_ha_exist_certificate
205198
value: $(params.pac_ha_exist_certificate)
206199
---
@@ -266,8 +259,6 @@ spec:
266259
value: $(event.ref)
267260
- name: solution
268261
value: $(event.ref)
269-
- name: ibm_customer_number
270-
value: $(event.ref)
271262
- name: pac_ha_exist_certificate
272263
value: $(event.ref)
273264
---

.tekton/lsf/lsf-regression-pipeline/lsf-pipeline-git-trigger.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ spec:
7171
- name: solution
7272
description: Provide the value for the solution that is needed for the support of lsf and HPC.
7373
default: "lsf"
74-
- name: ibm_customer_number
75-
description: Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn)..
76-
default: ""
7774
- name: pac_ha_exist_certificate
7875
description: PAC HA Existing Certificate
7976
default: ""
@@ -177,8 +174,6 @@ spec:
177174
value: $(params.git_user_email)
178175
- name: solution
179176
value: $(params.solution)
180-
- name: ibm_customer_number
181-
value: $(params.ibm_customer_number)
182177
- name: wes-lsf-da-rhel-2
183178
runAfter: [git-clone, pre-requisites-install, ssh-key-creation]
184179
taskRef:
@@ -225,8 +220,6 @@ spec:
225220
value: $(params.git_user_email)
226221
- name: solution
227222
value: $(params.solution)
228-
- name: ibm_customer_number
229-
value: $(params.ibm_customer_number)
230223
- name: wes-lsf-da-rhel-3
231224
runAfter: [git-clone, pre-requisites-install, ssh-key-creation]
232225
taskRef:
@@ -273,8 +266,6 @@ spec:
273266
value: $(params.git_user_email)
274267
- name: solution
275268
value: $(params.solution)
276-
- name: ibm_customer_number
277-
value: $(params.ibm_customer_number)
278269
- name: wes-lsf-da-rhel-4
279270
runAfter: [git-clone, pre-requisites-install, ssh-key-creation]
280271
taskRef:
@@ -321,8 +312,6 @@ spec:
321312
value: $(params.git_user_email)
322313
- name: solution
323314
value: $(params.solution)
324-
- name: ibm_customer_number
325-
value: $(params.ibm_customer_number)
326315
- name: pac_ha_exist_certificate
327316
value: $(params.pac_ha_exist_certificate)
328317
# - name: wes-lsf-da-ubuntu
@@ -415,8 +404,6 @@ spec:
415404
value: $(params.git_user_email)
416405
- name: solution
417406
value: $(params.solution)
418-
- name: ibm_customer_number
419-
value: $(params.ibm_customer_number)
420407
- name: wes-lsf-da-negative
421408
runAfter: [git-clone, pre-requisites-install, ssh-key-creation]
422409
taskRef:
@@ -461,8 +448,6 @@ spec:
461448
value: $(params.git_user_name)
462449
- name: git_user_email
463450
value: $(params.git_user_email)
464-
- name: ibm_customer_number
465-
value: $(params.ibm_customer_number)
466451
- name: ssh-key-deletion
467452
runAfter:
468453
[

.tekton/lsf/lsf_task/lsf-task-infra-rhel-1.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ spec:
7171
- name: solution
7272
description: Provide the value for the solution that is needed for the support of lsf and HPC.
7373
default: "lsf"
74-
- name: ibm_customer_number
75-
description: Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn)..
76-
default: ""
7774
workspaces:
7875
- name: workspace
7976
mountPath: /artifacts
@@ -121,8 +118,6 @@ spec:
121118
value: $(params.git_access_token)
122119
- name: solution
123120
value: $(params.solution)
124-
- name: ibm_customer_number
125-
value: $(params.ibm_customer_number)
126121
- name: management_image_name
127122
value: $(params.management_image_name)
128123
steps:

.tekton/lsf/lsf_task/lsf-task-infra-rhel-2.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ spec:
7171
- name: solution
7272
description: Provide the value for the solution that is needed for the support of lsf and HPC.
7373
default: "lsf"
74-
- name: ibm_customer_number
75-
description: Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn)..
76-
default: ""
7774
workspaces:
7875
- name: workspace
7976
mountPath: /artifacts
@@ -121,8 +118,6 @@ spec:
121118
value: $(params.git_access_token)
122119
- name: solution
123120
value: $(params.solution)
124-
- name: ibm_customer_number
125-
value: $(params.ibm_customer_number)
126121
- name: management_image_name
127122
value: $(params.management_image_name)
128123
steps:

.tekton/lsf/lsf_task/lsf-task-infra-rhel-3.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ spec:
7171
- name: solution
7272
description: Provide the value for the solution that is needed for the support of lsf and HPC.
7373
default: "lsf"
74-
- name: ibm_customer_number
75-
description: Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn)..
76-
default: ""
7774
workspaces:
7875
- name: workspace
7976
mountPath: /artifacts
@@ -121,8 +118,6 @@ spec:
121118
value: $(params.git_access_token)
122119
- name: solution
123120
value: $(params.solution)
124-
- name: ibm_customer_number
125-
value: $(params.ibm_customer_number)
126121
- name: management_image_name
127122
value: $(params.management_image_name)
128123
steps:

.tekton/lsf/lsf_task/lsf-task-infra-rhel-4.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ spec:
7171
- name: solution
7272
description: Provide the value for the solution that is needed for the support of lsf and HPC.
7373
default: "lsf"
74-
- name: ibm_customer_number
75-
description: Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn)..
76-
default: ""
7774
- name: pac_ha_exist_certificate
7875
description: PAC HA Existing Certificate
7976
default: ""
@@ -124,8 +121,6 @@ spec:
124121
value: $(params.git_access_token)
125122
- name: solution
126123
value: $(params.solution)
127-
- name: ibm_customer_number
128-
value: $(params.ibm_customer_number)
129124
- name: management_image_name
130125
value: $(params.management_image_name)
131126
- name: pac_ha_exist_certificate

.tekton/lsf/lsf_task/lsf-task-negative.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ spec:
7171
- name: solution
7272
description: Provide the value for the solution that is needed for the support of lsf and HPC.
7373
default: "lsf"
74-
- name: ibm_customer_number
75-
description: Comma-separated list of the IBM Customer Number(s) (ICN) that is used for the Bring Your Own License (BYOL) entitlement check. For more information on how to find your ICN, see [What is my IBM Customer Number (ICN)?](https://www.ibm.com/support/pages/what-my-ibm-customer-number-icn)..
76-
default: ""
7774
workspaces:
7875
- name: workspace
7976
mountPath: /artifacts
@@ -121,8 +118,6 @@ spec:
121118
value: $(params.git_access_token)
122119
- name: solution
123120
value: $(params.solution)
124-
- name: ibm_customer_number
125-
value: $(params.ibm_customer_number)
126121
- name: management_image_name
127122
value: $(params.management_image_name)
128123
steps:

0 commit comments

Comments
 (0)