diff --git a/chart/cloud-pak-deployer/templates/install-job.yaml b/chart/cloud-pak-deployer/templates/install-job.yaml index 0ed276c6..3c9fae4e 100644 --- a/chart/cloud-pak-deployer/templates/install-job.yaml +++ b/chart/cloud-pak-deployer/templates/install-job.yaml @@ -6,6 +6,7 @@ metadata: labels: App: {{ .Values.deployer.prefix }} annotations: + # https://github.com/terraform-ibm-modules/terraform-ibm-cloudpak-data/issues/14 checkov.io/skip1: CKV_K8S_10 checkov.io/skip2: CKV_K8S_11 checkov.io/skip3: CKV_K8S_12 @@ -27,6 +28,7 @@ metadata: checkov.io/skip19: CKV_K8S_16 checkov.io/skip20: CKV_K8S_8 checkov.io/skip21: CKV_K8S_43 + checkov.io/skip22: CKV2_K8S_6 spec: backoffLimit: 0 completions: 1 diff --git a/chart/cloud-pak-deployer/templates/uninstall-job.yaml b/chart/cloud-pak-deployer/templates/uninstall-job.yaml index 1dfdb9e7..a21f6e0e 100644 --- a/chart/cloud-pak-deployer/templates/uninstall-job.yaml +++ b/chart/cloud-pak-deployer/templates/uninstall-job.yaml @@ -9,6 +9,7 @@ metadata: "helm.sh/hook": pre-delete "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded,hook-failed "helm.sh/hook-weight": "4" + # https://github.com/terraform-ibm-modules/terraform-ibm-cloudpak-data/issues/14 checkov.io/skip1: CKV_K8S_21 checkov.io/skip2: CKV_K8S_30 checkov.io/skip3: CKV_K8S_28 @@ -29,6 +30,7 @@ metadata: checkov.io/skip18: CKV_K8S_12 checkov.io/skip19: CKV_K8S_13 checkov.io/skip20: CKV_K8S_14 + checkov.io/skip21: CKV2_K8S_6 spec: parallelism: 1 completions: 1 diff --git a/common-dev-assets b/common-dev-assets index 97bdd73a..6e39f79e 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit 97bdd73a486309b2d03c68e4836d2c5bbc9b3591 +Subproject commit 6e39f79e1389a1ec3bbe57215573e7d4e6dd98f1 diff --git a/cra-config.yaml b/cra-config.yaml index 5eda8e30..404ea490 100644 --- a/cra-config.yaml +++ b/cra-config.yaml @@ -6,12 +6,12 @@ # version: "v1" -CRA_TARGETS: - - CRA_TARGET: "examples/basic" # Target directory for CRA scan. If not provided, the CRA Scan will not be run. - CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json" - PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile). - # SCC_INSTANCE_ID: "" # The SCC instance ID to use to download profile for CRA scan. If not provided, a default global value will be used. - # SCC_REGION: "" # The IBM Cloud region that the SCC instance is in. If not provided, a default global value will be used. - CRA_ENVIRONMENT_VARIABLES: # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs. - TF_VAR_prefix: "roks-cpd" - TF_VAR_region: "au-syd" +CRA_TARGETS: [] # disable CRA since no SCC instance exists in the test account + # - CRA_TARGET: "examples/basic" # Target directory for CRA scan. If not provided, the CRA Scan will not be run. + # CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json" + # PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3" # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile). + # # SCC_INSTANCE_ID: "" # The SCC instance ID to use to download profile for CRA scan. If not provided, a default global value will be used. + # # SCC_REGION: "" # The IBM Cloud region that the SCC instance is in. If not provided, a default global value will be used. + # CRA_ENVIRONMENT_VARIABLES: # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs. + # TF_VAR_prefix: "roks-cpd" + # TF_VAR_region: "au-syd"