diff --git a/.secrets.baseline b/.secrets.baseline index 018293f2fca..65a73821c6d 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$", "lines": null }, - "generated_at": "2026-01-29T07:04:47Z", + "generated_at": "2026-02-11T17:12:41Z", "plugins_used": [ { "name": "AWSKeyDetector" @@ -252,7 +252,7 @@ "hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa", "is_secret": false, "is_verified": false, - "line_number": 494, + "line_number": 500, "type": "Secret Keyword", "verified_result": null } @@ -730,7 +730,7 @@ "hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd", "is_secret": false, "is_verified": false, - "line_number": 16, + "line_number": 19, "type": "Secret Keyword", "verified_result": null } diff --git a/docs/catalogs/index.md b/docs/catalogs/index.md index a1c8ebc352f..b97bde967aa 100644 --- a/docs/catalogs/index.md +++ b/docs/catalogs/index.md @@ -11,7 +11,9 @@ The MAS CLI maintains a rolling window of approximately four months worth of sup ### Catalog Directory Note: The Red Hat Extended Update Support Add-on Term 1 offering is included with the OCP subscription that comes with a MAS license. In the case of EUS denoted OCP releases, the support dates stated below refer to the EUS1 end dates. For more details on the OCP support lifecycle see: [https://access.redhat.com/support/policy/updates/openshift](https://access.redhat.com/support/policy/updates/openshift). Also note that support for the non-EUS releases expires before the extended support for the previous EUS release, for example extended support for OCP 4.18 expires on Feb 25, 2027, while standard support for OCP 4.17 expires on April 1, 2026. +Note: The Red Hat Extended Update Support Add-on Term 1 offering is included with the OCP subscription that comes with a MAS license. In the case of EUS denoted OCP releases, the support dates stated below refer to the EUS1 end dates. For more details on the OCP support lifecycle see: [https://access.redhat.com/support/policy/updates/openshift](https://access.redhat.com/support/policy/updates/openshift). Also note that support for the non-EUS releases expires before the extended support for the previous EUS release, for example extended support for OCP 4.18 expires on Feb 25, 2027, while standard support for OCP 4.17 expires on April 1, 2026. + 2026 Catalogs 2025 Catalogs @@ -30,87 +32,94 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit CPD MongoDB CLI + Catalog + OCP + CPD + MongoDB + CLI - v9-261224 - TBD + v9-261224
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-261126 - TBD + v9-261126
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-261029 - TBD + v9-261029
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-260924 - TBD + v9-260924
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-260827 - TBD + v9-260827
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-260730 - TBD + v9-260730
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-260625 - TBD + v9-260625
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-260528 - TBD + v9-260528
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-260423 - TBD + v9-260423
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-260326 - TBD + v9-260326
amd64 | s390x | ppc64le + TBD
TBD TBD N/A - v9-260226 - TBD + v9-260226
amd64 | s390x | ppc64le + TBD
TBD TBD N/A + v9-260129
amd64 | s390x | ppc64le + 4.16 - 4.19
EOS Feb 25, 2027 ↗ v9-260129
amd64 | s390x | ppc64le 4.16 - 4.19
EOS Feb 25, 2027 ↗ 5.2.0 @@ -130,10 +139,17 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit CPD MongoDB CLI + Catalog + OCP + CPD + MongoDB + CLI + v9-251231
amd64 | s390x | ppc64le + 4.16 - 4.19
EOS Feb 25, 2027 ↗ v9-251231
amd64 | s390x | ppc64le 4.16 - 4.19
EOS Feb 25, 2027 ↗ 5.2.0 @@ -141,13 +157,18 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit latest + v9-251224
amd64 | s390x | ppc64le + 4.16 - 4.19
EOS Feb 25, 2027 ↗ v9-251224
amd64 | s390x | ppc64le 4.16 - 4.19
EOS Feb 25, 2027 ↗ 5.2.0 7.0 - 8.0 latest + latest + v9-251127
amd64 | s390x | ppc64le + 4.16 - 4.19
EOS Feb 25, 2027 ↗ v9-251127
amd64 | s390x | ppc64le 4.16 - 4.19
EOS Feb 25, 2027 ↗ 5.1.3 @@ -155,6 +176,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit latest + v9-251030
amd64 | s390x | ppc64le + 4.14 - 4.19
EOS Feb 25, 2027 ↗ v9-251030
amd64 | s390x | ppc64le 4.14 - 4.19
EOS Feb 25, 2027 ↗ 5.1.3 @@ -162,6 +185,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 15.11.0 + v9-251010
amd64 | ppc64le + 4.14 - 4.18
EOS Feb 25, 2027 ↗ v9-251010
amd64 | ppc64le 4.14 - 4.18
EOS Feb 25, 2027 ↗ 5.1.3 @@ -169,6 +194,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 15.9.0 + v9-250925
amd64 | ppc64le + 4.14 - 4.18
EOS Feb 25, 2027 ↗ v9-250925
amd64 | ppc64le 4.14 - 4.18
EOS Feb 25, 2027 ↗ 5.1.3 @@ -176,6 +203,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 15.7.0 + v9-250902
amd64 | s390x | ppc64le + 4.14 - 4.18
EOS Feb 25, 2027 ↗ v9-250902
amd64 | s390x | ppc64le 4.14 - 4.18
EOS Feb 25, 2027 ↗ 5.1.3 @@ -183,6 +212,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 15.3.0 + v9-250828
amd64 | s390x | ppc64le + 4.14 - 4.18
EOS Feb 25, 2027 ↗ v9-250828
amd64 | s390x | ppc64le 4.14 - 4.18
EOS Feb 25, 2027 ↗ 5.1.3 @@ -190,6 +221,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 15.2.0 + v9-250731
amd64 | s390x | ppc64le + 4.14 - 4.18
EOS Feb 25, 2027 ↗ v9-250731
amd64 | s390x | ppc64le 4.14 - 4.18
EOS Feb 25, 2027 ↗ 5.1.3 @@ -197,6 +230,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 15.1.0 + v9-250624
amd64 | s390x | ppc64le + 4.14 - 4.18
EOS Feb 25, 2027 ↗ v9-250624
amd64 | s390x | ppc64le 4.14 - 4.18
EOS Feb 25, 2027 ↗ 5.1.3 @@ -204,6 +239,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 13.26.0 + v9-250501
amd64 | s390x | N/A + 4.14 - 4.16
EOS Jun 27, 2026 ↗ v9-250501
amd64 | s390x | N/A 4.14 - 4.16
EOS Jun 27, 2026 ↗ 5.0.0 @@ -211,6 +248,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 13.20.0 + v9-250403
amd64 | s390x | N/A + 4.14 - 4.16
EOS Jun 27, 2026 ↗ v9-250403
amd64 | s390x | N/A 4.14 - 4.16
EOS Jun 27, 2026 ↗ 5.0.0 @@ -218,6 +257,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 13.15.0 + v9-250306
amd64 | s390x | N/A + 4.14 - 4.16
EOS Jun 27, 2026 ↗ v9-250306
amd64 | s390x | N/A 4.14 - 4.16
EOS Jun 27, 2026 ↗ 5.0.0 @@ -225,6 +266,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 13.10.0 + v9-250206
amd64 | s390x | N/A + 4.14 - 4.16
EOS Jun 27, 2026 ↗ v9-250206
amd64 | s390x | N/A 4.14 - 4.16
EOS Jun 27, 2026 ↗ 5.0.0 @@ -232,6 +275,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit 13.3.0 + v9-250109
amd64 | s390x | N/A + 4.14 - 4.16
EOS Jun 27, 2026 ↗ v9-250109
amd64 | s390x | N/A 4.14 - 4.16
EOS Jun 27, 2026 ↗ 5.0.0 @@ -250,12 +295,18 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit CPD MongoDB CLI + OCP + CPD + MongoDB + CLI v9-241205
amd64 | s390x 4.14 - 4.16
EOS Jun 27, 2026 ↗ + v9-241205
amd64 | s390x + 4.14 - 4.16
EOS Jun 27, 2026 ↗ 5.0.0 6.0 - 7.0 11.12.0 @@ -263,6 +314,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v9-241107
amd64 | s390x 4.12 - 4.15
EOS Aug 27, 2025 ↗ + v9-241107
amd64 | s390x + 4.12 - 4.15
EOS Aug 27, 2025 ↗ 4.8.0 6.0 - 7.0 11.7.0 @@ -270,6 +323,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v9-241003-amd64 4.12 - 4.15
EOS Aug 27, 2025 ↗ + v9-241003-amd64 + 4.12 - 4.15
EOS Aug 27, 2025 ↗ 4.8.0 5.0 - 7.0 13.0.0 @@ -277,6 +332,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v9-240827-amd64 4.12 - 4.15
EOS Aug 27, 2025 ↗ + v9-240827-amd64 + 4.12 - 4.15
EOS Aug 27, 2025 ↗ 4.8.0 5.0 - 7.0 11.11.3 @@ -284,6 +341,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v9-240730-amd64 4.12 - 4.15
EOS Aug 27, 2025 ↗ + v9-240730-amd64 + 4.12 - 4.15
EOS Aug 27, 2025 ↗ 4.8.0 5.0 - 7.0 11.5.0 @@ -291,6 +350,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v9-240625-amd64 4.12 - 4.14
EOS Oct 31, 2025 ↗ + v9-240625-amd64 + 4.12 - 4.14
EOS Oct 31, 2025 ↗ 4.8.0 5.0 - 7.0 10.9.2 @@ -298,6 +359,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v8-240528-amd64 4.12 - 4.14
EOS Oct 31, 2025 ↗ + v8-240528-amd64 + 4.12 - 4.14
EOS Oct 31, 2025 ↗ 4.6.6 5.0 - 7.0 10.8.1 @@ -305,6 +368,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v8-240430-amd64 4.12 - 4.14
EOS Oct 31, 2025 ↗ + v8-240430-amd64 + 4.12 - 4.14
EOS Oct 31, 2025 ↗ 4.6.6 5.0 - 7.0 9.4.0 @@ -312,6 +377,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v8-240405-amd64 4.12 - 4.14
EOS Oct 31, 2025 ↗ + v8-240405-amd64 + 4.12 - 4.14
EOS Oct 31, 2025 ↗ 4.6.6 5.0 - 7.0 9.4.0 @@ -319,6 +386,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v8-240326-amd64 4.12 - 4.14
EOS Oct 31, 2025 ↗ + v8-240326-amd64 + 4.12 - 4.14
EOS Oct 31, 2025 ↗ 4.6.6 5.0 - 7.0 9.4.0 @@ -326,6 +395,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v8-240227-amd64 4.12
EOS Jan 17, 2025 ↗ + v8-240227-amd64 + 4.12
EOS Jan 17, 2025 ↗ 4.6.6 5.0 - 7.0 8.2.2 @@ -333,6 +404,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit v8-240130-amd64 4.12
EOS Jan 17, 2025 ↗ + v8-240130-amd64 + 4.12
EOS Jan 17, 2025 ↗ 4.6.6 5.0 - 7.0 8.2.2 @@ -347,6 +420,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit Catalog OCP CLI + OCP + CLI Support Notes @@ -457,6 +532,8 @@ Note: The Red Hat Extended Update Support Add-on Term 1 offering is included wit Catalog OCP CLI + OCP + CLI Support Notes diff --git a/image/cli/mascli/functions/gitops_cluster b/image/cli/mascli/functions/gitops_cluster index e7d5510ade3..1ddac535912 100644 --- a/image/cli/mascli/functions/gitops_cluster +++ b/image/cli/mascli/functions/gitops_cluster @@ -28,6 +28,7 @@ IBM Container Registry Entitlement (Required): Target Cluster (Optional): --cluster-url ${COLOR_YELLOW}CLUSTER_URL${TEXT_RESET} Set to target a remote Kubernetes cluster (defaults to 'https://kubernetes.default.svc') + --hypervisor ${COLOR_YELLOW}HYPERVISOR${TEXT_RESET} Hypervisor type for the cluster (e.g., 'rosa', 'fyre') Operator Catalog (Optional): --catalog-version ${COLOR_YELLOW}MAS_CATALOG_VERSION${TEXT_RESET} Set the version of IBM Maximo Operator Catalog (defaults to 'v8-240130-amd64') @@ -354,6 +355,9 @@ function gitops_cluster_noninteractive() { --image-repo-mirror-prefix) export IMAGE_REPO_MIRROR_PREFIX=$1 && shift ;; + --hypervisor) + export HYPERVISOR=$1 && shift + ;; # Other Commands -h|--help) @@ -370,6 +374,7 @@ function gitops_cluster_noninteractive() { [[ -z "$CLUSTER_ID" ]] && gitops_cluster_help "CLUSTER_ID is not set" [[ -z "$REGION_ID" && -z "$SM_AWS_REGION" ]] && gitops_cluster_help "REGION_ID or SM_AWS_REGION is not set" [[ -z "$CLUSTER_URL" ]] && gitops_cluster_help "CLUSTER_URL is not set" + [[ -z "$HYPERVISOR" ]] && gitops_cluster_help "HYPERVISOR is not set" if [[ "$GITHUB_PUSH" == "true" ]]; then [[ -z "$GITHUB_HOST" ]] && gitops_cluster_help "GITHUB_HOST is not set" @@ -465,6 +470,7 @@ function gitops_cluster() { echo_h2 "Target" " " echo_reset_dim "Account ID ..................... ${COLOR_MAGENTA}${ACCOUNT_ID}" echo_reset_dim "Region ID ...................... ${COLOR_MAGENTA}${REGION_ID}" + echo_reset_dim "HYPERVISOR ..................... ${COLOR_MAGENTA}${HYPERVISOR}" echo_reset_dim "Cluster ID ..................... ${COLOR_MAGENTA}${CLUSTER_ID}" echo_reset_dim "Cluster URL .................... ${COLOR_MAGENTA}${CLUSTER_URL}" echo_reset_dim "Cluster Config Directory ....... ${COLOR_MAGENTA}${GITOPS_CLUSTER_DIR}" diff --git a/image/cli/mascli/functions/gitops_efs_csi_driver_operator b/image/cli/mascli/functions/gitops_efs_csi_driver_operator new file mode 100644 index 00000000000..4a3cc99bf49 --- /dev/null +++ b/image/cli/mascli/functions/gitops_efs_csi_driver_operator @@ -0,0 +1,225 @@ +#!/usr/bin/env bash + +function gitops_efs_csi_driver_operator_help() { + [[ -n "$1" ]] && echo_warning "$1" + reset_colors + cat << EOM +Usage: + mas gitops_efs_csi_driver_operator [options] +Where ${COLOR_YELLOW}specified${TEXT_RESET} each option may also be defined by setting the appropriate environment variable. +When no options are specified on the command line, interactive-mode will be enabled by default. + +Basic Configuration: + -d, --dir ${COLOR_YELLOW}GITOPS_WORKING_DIR${TEXT_RESET} Directory for GitOps repository + -a, --account-id ${COLOR_YELLOW}ACCOUNT_ID${TEXT_RESET} Account name that the cluster belongs to + -c, --cluster-id ${COLOR_YELLOW}CLUSTER_ID${TEXT_RESET} Cluster ID + -r, --efs-csi-driver-role-arn ${COLOR_YELLOW}EFS_CSI_DRIVER_ROLE_ARN${TEXT_RESET} ARN of the IAM Role to assign to the EFS CSI driver + --efs-catalog-source ${COLOR_YELLOW}EFS_CATALOG_SOURCE${TEXT_RESET} EFS catalog source + --efs-catalog-source-namespace ${COLOR_YELLOW}EFS_CATALOG_SOURCE_NAMESPACE${TEXT_RESET} EFS catalog source namespace + --efs-channel ${COLOR_YELLOW}EFS_CHANNEL${TEXT_RESET} EFS channel + --efs-subscription-source-namespace ${COLOR_YELLOW}EFS_SUBSCRIPTION_SOURCE_NAMESPACE${TEXT_RESET} EFS subscription source namespace + +Automatic GitHub Push (Optional): + -P, --github-push ${COLOR_YELLOW}GITHUB_PUSH${TEXT_RESET} Enable automatic push to GitHub + -H, --github-host ${COLOR_YELLOW}GITHUB_HOST${TEXT_RESET} GitHub Hostname for your GitOps repository + -O, --github-org ${COLOR_YELLOW}GITHUB_ORG${TEXT_RESET} Github org for your GitOps repository + -R, --github-repo ${COLOR_YELLOW}GITHUB_REPO${TEXT_RESET} Github repo for your GitOps repository + -S, --github-ssh ${COLOR_YELLOW}GIT_SSH${TEXT_RESET} Git ssh key path + -B, --git-branch ${COLOR_YELLOW}GIT_BRANCH${TEXT_RESET} Git branch to commit to of your GitOps repository + -M, --git-commit-msg ${COLOR_YELLOW}GIT_COMMIT_MSG${TEXT_RESET} Git commit message to use when committing to of your GitOps repository + +Other Commands: + -h, --help Show this help message +EOM + [[ -n "$1" ]] && exit 1 || exit 0 +} + +function gitops_efs_csi_driver_operator_noninteractive() { + GITOPS_WORKING_DIR=$PWD/working-dir + SECRETS_KEY_SEPERATOR="/" + GIT_COMMIT_MSG="gitops-efs-csi-driver commit" + + while [[ $# -gt 0 ]] + do + key="$1" + shift + case $key in + # GitOps Configuration + -d|--dir) + export GITOPS_WORKING_DIR=$1 && shift + ;; + -a|--account-id) + export ACCOUNT_ID=$1 && shift + ;; + -c|--cluster-id) + export CLUSTER_ID=$1 && shift + ;; + -r|--efs-csi-driver-role-arn) + export EFS_CSI_DRIVER_ROLE_ARN=$1 && shift + ;; + --efs-catalog-source) + export EFS_CATALOG_SOURCE=$1 && shift + ;; + --efs-catalog-source-namespace) + export EFS_CATALOG_SOURCE_NAMESPACE=$1 && shift + ;; + --efs-channel) + export EFS_CHANNEL=$1 && shift + ;; + --efs-subscription-source-namespace) + export EFS_SUBSCRIPTION_SOURCE_NAMESPACE=$1 && shift + ;; + + + # Automatic GitHub Push + -P|--github-push) + export GITHUB_PUSH=true + ;; + -H|--github-host) + export GITHUB_HOST=$1 && shift + ;; + -O|--github-org) + export GITHUB_ORG=$1 && shift + ;; + -R|--github-repo) + export GITHUB_REPO=$1 && shift + ;; + -S|--github-ssh) + export GIT_SSH=$1 && shift + ;; + -B|--git-branch) + export GIT_BRANCH=$1 && shift + ;; + -M|--git-commit-msg) + export GIT_COMMIT_MSG=$1 && shift + ;; + + # Other Commands + -h|--help) + gitops_efs_csi_driver_operator_help + ;; + *) + # unknown option + gitops_efs_csi_driver_operator_help "Usage Error: Unsupported option \"${key}\" " + ;; + esac + done + + [[ -z "$GITOPS_WORKING_DIR" ]] && gitops_efs_csi_driver_help "GITOPS_WORKING_DIR is not set" + [[ -z "$ACCOUNT_ID" ]] && gitops_efs_csi_driver_help "ACCOUNT_ID is not set" + [[ -z "$CLUSTER_ID" ]] && gitops_efs_csi_driver_help "CLUSTER_ID is not set" + + if [[ "$GITHUB_PUSH" == "true" ]]; then + [[ -z "$GITHUB_HOST" ]] && gitops_efs_csi_driver_help "GITHUB_HOST is not set" + [[ -z "$GITHUB_ORG" ]] && gitops_efs_csi_driver_help "GITHUB_ORG is not set" + [[ -z "$GITHUB_REPO" ]] && gitops_efs_csi_driver_help "GITHUB_REPO is not set" + [[ -z "$GIT_BRANCH" ]] && gitops_efs_csi_driver_help "GIT_BRANCH is not set" + fi + + [[ -z "$EFS_CSI_DRIVER_ROLE_ARN" ]] && gitops_efs_csi_driver_operator_help "EFS_CSI_DRIVER_ROLE_ARN is not set" + +} + +function gitops_efs_csi_driver_operator() { + # Take the first parameter off (it will be create-gitops) + shift + if [[ $# -gt 0 ]]; then + gitops_efs_csi_driver_operator_noninteractive "$@" + else + echo "Not supported yet" + exit 1 + gitops_efs_csi_driver_operator_interactive + fi + + # catch errors + set -o pipefail + trap 'echo "[ERROR] Error occurred at $BASH_SOURCE, line $LINENO, exited with $?"; exit 1' ERR + + mkdir -p ${GITOPS_WORKING_DIR} + GITOPS_CLUSTER_DIR=${GITOPS_WORKING_DIR}/${GITHUB_REPO}/${ACCOUNT_ID}/${CLUSTER_ID} + + echo + reset_colors + echo_h2 "Review Settings" + + echo "${TEXT_DIM}" + echo_h2 "Target" " " + echo_reset_dim "Account ID ..................... ${COLOR_MAGENTA}${ACCOUNT_ID}" + echo_reset_dim "Region ID ...................... ${COLOR_MAGENTA}${REGION_ID}" + echo_reset_dim "Cluster ID ..................... ${COLOR_MAGENTA}${CLUSTER_ID}" + echo_reset_dim "Cluster Config Directory ....... ${COLOR_MAGENTA}${GITOPS_CLUSTER_DIR}" + reset_colors + + echo "${TEXT_DIM}" + if [[ "$GITHUB_PUSH" == "true" ]]; then + echo_h2 "GitOps Target" " " + echo_reset_dim "Automatic Push ........................ ${COLOR_GREEN}Enabled" + echo_reset_dim "Working Directory ..................... ${COLOR_MAGENTA}${GITOPS_WORKING_DIR}" + echo_reset_dim "Host .................................. ${COLOR_MAGENTA}${GITHUB_HOST}" + echo_reset_dim "Organization .......................... ${COLOR_MAGENTA}${GITHUB_ORG}" + echo_reset_dim "Repository ............................ ${COLOR_MAGENTA}${GITHUB_REPO}" + echo_reset_dim "Branch ................................ ${COLOR_MAGENTA}${GIT_BRANCH}" + else + echo_h2 "GitOps Target" " " + echo_reset_dim "Automatic Push ........................ ${COLOR_RED}Disabled" + echo_reset_dim "Working Directory ..................... ${COLOR_MAGENTA}${GITOPS_WORKING_DIR}" + fi + reset_colors + + echo "${TEXT_DIM}" + echo_h2 "EFS CSI Driver" " " + echo_reset_dim "Role ARN ............................... ${COLOR_MAGENTA}${EFS_CSI_DRIVER_ROLE_ARN}" + echo_reset_dim "Catalog Source ......................... ${COLOR_MAGENTA}${EFS_CATALOG_SOURCE}" + echo_reset_dim "Catalog Source Namespace ............... ${COLOR_MAGENTA}${EFS_CATALOG_SOURCE_NAMESPACE}" + echo_reset_dim "Channel ................................ ${COLOR_MAGENTA}${EFS_CHANNEL}" + echo_reset_dim "Subscription Source Namespace .......... ${COLOR_MAGENTA}${EFS_SUBSCRIPTION_SOURCE_NAMESPACE}" + reset_colors + + + + CURRENT_DIR=$PWD + TEMP_DIR=$CURRENT_DIR/tmp-efs_csi_driver + mkdir -p $TEMP_DIR + + if [ -z $GIT_SSH ]; then + export GIT_SSH=false + fi + + + # Set and Validate App Names + # --------------------------------------------------------------------------- + EFS_CSI_DRIVER_APP_NAME="efs-csi-driver.${CLUSTER_ID}" + validate_app_name "${EFS_CSI_DRIVER_APP_NAME}" + + + # Clone github target repo + # --------------------------------------------------------------------------- + if [ "$GITHUB_PUSH" == "true" ]; then + echo + echo_h2 "Cloning GitHub repo $GITHUB_ORG $GITHUB_REPO" + clone_target_git_repo $GITHUB_HOST $GITHUB_ORG $GITHUB_REPO $GIT_BRANCH $GITOPS_WORKING_DIR $GIT_SSH + fi + mkdir -p ${GITOPS_CLUSTER_DIR} + + + # Generate ArgoApps + # --------------------------------------------------------------------------- + echo + echo_h2 "Generating efs_csi_driver operator Applications" + echo "- efs_csi_driver operator" + + echo "Generating efs_csi_driver file ${GITOPS_CLUSTER_DIR}/efs-csi-driver.yaml" + jinjanate_commmon $CLI_DIR/templates/gitops/appset-configs/cluster/efs-csi-driver.yaml.j2 ${GITOPS_CLUSTER_DIR}/efs-csi-driver.yaml + + # Commit and push to github target repo + # --------------------------------------------------------------------------- + if [ "$GITHUB_PUSH" == "true" ]; then + echo + echo_h2 "Commit and push changes to GitHub repo $GITHUB_ORG $GITHUB_REPO" + save_to_target_git_repo $GITHUB_HOST $GITHUB_ORG $GITHUB_REPO $GIT_BRANCH "${GITOPS_WORKING_DIR}/${GITHUB_REPO}" "${GIT_COMMIT_MSG}" + remove_git_repo_clone $GITOPS_WORKING_DIR/$GITHUB_REPO + fi + + rm -rf $TEMP_DIR + +} diff --git a/image/cli/mascli/functions/gitops_mas_config b/image/cli/mascli/functions/gitops_mas_config index 1eb10687a0f..2476ac7d385 100644 --- a/image/cli/mascli/functions/gitops_mas_config +++ b/image/cli/mascli/functions/gitops_mas_config @@ -67,7 +67,7 @@ JDBC Configuration (required if MAS_CONFIG_TYPE is "jdbc"): --jdbc-type ${COLOR_YELLOW}JDBC_TYPE${TEXT_RESET} Set to 'incluster-db2' when wanting to use the gitops configured, via gitops-db2u-database, db2u cluster (defaults to incluster-db2) --jdbc-instance-name ${COLOR_YELLOW}JDBC_INSTANCE_NAME${TEXT_RESET} The JDBC instance name to use. Required for all JDBC_TYPE's --jdbc-connection-url ${COLOR_YELLOW}JDBC_CONNECTION_URL${TEXT_RESET} The JDBC connection URL. Required when JDBC_TYPE is not incluster-db2 and rds-db2 - --jdbc-certificate-file ${COLOR_YELLOW}JDBC_CERTIFICATE_FILE${TEXT_RESET} Path to file containing CA Certificate for JDBC server. Required when JDBC_TYPE is not incluster-db2 + --jdbc-certificate-file ${COLOR_YELLOW}JDBC_CERTIFICATE_FILE${TEXT_RESET} Path to file containing CA Certificate for JDBC server. Required when JDBC_TYPE is not incluster-db2 and rds-db2 --jdbc-route ${COLOR_YELLOW}JDBC_ROUTE${TEXT_RESET} By default routes are not exposed to public. To expose route, set this to public. SMTP Configuration (required if MAS_CONFIG_TYPE is "smtp"): @@ -903,8 +903,11 @@ function gitops_mas_config() { export SECRET_KEY_DB2_DBNAME=${JDBC_CONFIG_SECRET_ID}#db2_dbname export SECRET_KEY_DB2_NAMESPACE=${JDBC_CONFIG_SECRET_ID}#db2_namespace elif [ "${JDBC_TYPE}" == "rds-db2" ]; then + # For rds-db2, the certificate is already stored in AWS Secrets Manager by gitops_rds_db2_database export JDBC_CONFIG_SECRET_ID=${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}${MAS_INSTANCE_ID}${SECRETS_KEY_SEPERATOR}jdbc${SECRETS_KEY_SEPERATOR}${JDBC_INSTANCE_NAME}${SECRETS_KEY_SEPERATOR}config - export JDBC_CERTIFICATE_CONTENT_B64=$(cat $JDBC_CERTIFICATE_FILE | base64 -w0) + export SECRET_KEY_JDBC_INSTANCE_NAME=${JDBC_INSTANCE_NAME} + export SECRET_KEY_JDBC_CONNECTION_URL=${JDBC_CONFIG_SECRET_ID}#jdbc_connection_url + export SECRET_KEY_JDBC_CERTIFICATE_CONTENT=${JDBC_CONFIG_SECRET_ID}#ca_b64 else # This secret we are creating here export JDBC_CONFIG_SECRET_ID=${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}${MAS_INSTANCE_ID}${SECRETS_KEY_SEPERATOR}jdbc${SECRETS_KEY_SEPERATOR}${JDBC_INSTANCE_NAME}${SECRETS_KEY_SEPERATOR}config @@ -913,10 +916,10 @@ function gitops_mas_config() { sm_update_secret $JDBC_CONFIG_SECRET_ID "{ \"jdbc_connection_url\": \"${JDBC_CONNECTION_URL}\", \"jdbc_instance_name\": \"${JDBC_INSTANCE_NAME}\", \"ca_b64\": \"${JDBC_CERTIFICATE_CONTENT_B64}\" }" "${TAGS}" echo_reset_dim "JDBC_INSTANCE_NAME ........................ ${COLOR_MAGENTA}$JDBC_INSTANCE_NAME" echo_reset_dim "JDBC_CONNECTION_URL ....................... ${COLOR_MAGENTA}${JDBC_CONNECTION_URL}" + export SECRET_KEY_JDBC_CONNECTION_URL=${JDBC_CONFIG_SECRET_ID}#jdbc_connection_url + export SECRET_KEY_JDBC_CERTIFICATE_CONTENT=${JDBC_CONFIG_SECRET_ID}#ca_b64 + export SECRET_KEY_JDBC_INSTANCE_NAME=${JDBC_CONFIG_SECRET_ID}#jdbc_instance_name fi - export SECRET_KEY_JDBC_CONNECTION_URL=${JDBC_CONFIG_SECRET_ID}#jdbc_connection_url - export SECRET_KEY_JDBC_CERTIFICATE_CONTENT=${JDBC_CONFIG_SECRET_ID}#ca_b64 - export SECRET_KEY_JDBC_INSTANCE_NAME=${JDBC_CONFIG_SECRET_ID}#jdbc_instance_name fi # Source: gitops_suite_smtp_config diff --git a/image/cli/mascli/mas b/image/cli/mascli/mas index 47b9db3375e..4ac06821d0e 100755 --- a/image/cli/mascli/mas +++ b/image/cli/mascli/mas @@ -77,6 +77,7 @@ mkdir -p $CONFIG_DIR . $CLI_DIR/functions/gitops_deprovision_suite_workspace . $CLI_DIR/functions/gitops_efs . $CLI_DIR/functions/gitops_efs_csi_driver +. $CLI_DIR/functions/gitops_efs_csi_driver_operator . $CLI_DIR/functions/gitops_dro . $CLI_DIR/functions/gitops_db2u . $CLI_DIR/functions/gitops_db2u_database @@ -552,6 +553,14 @@ case $1 in gitops_efs_csi_driver "$@" ;; + gitops-efs-csi-driver-operator) + echo "${TEXT_UNDERLINE}IBM Maximo Application Suite GitOps Manager (v${VERSION})${TEXT_RESET}" + echo "Powered by ${COLOR_CYAN}${TEXT_UNDERLINE}https://github.com/ibm-mas/gitops/${TEXT_RESET}" + echo + reset_colors + gitops_efs_csi_driver_operator "$@" + ;; + gitops-dro) echo "${TEXT_UNDERLINE}IBM Maximo Application Suite GitOps Manager (v${VERSION})${TEXT_RESET}" echo "Powered by ${COLOR_CYAN}${TEXT_UNDERLINE}https://github.com/ibm-mas/gitops/${TEXT_RESET}" diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/efs-csi-driver.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/efs-csi-driver.yaml.j2 index cf5d2e81a31..8091cd92174 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/efs-csi-driver.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/efs-csi-driver.yaml.j2 @@ -1,7 +1,8 @@ merge-key: "{{ ACCOUNT_ID }}/{{ CLUSTER_ID }}" efs_csi_driver: - catalog_source: redhat-operators - catalog_source_namespace: openshift-marketplace - channel: stable + catalog_source: {{ EFS_CATALOG_SOURCE }} + catalog_source_namespace: {{ EFS_CATALOG_SOURCE_NAMESPACE }} + channel: {{ EFS_CHANNEL }} + subscription_source_namespace: {{ EFS_SUBSCRIPTION_SOURCE_NAMESPACE }} role_arn: {{ EFS_CSI_DRIVER_ROLE_ARN }} diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-jdbc-config.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-jdbc-config.yaml.j2 index 41cfe6da251..c930598f673 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-jdbc-config.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/configs/ibm-mas-jdbc-config.yaml.j2 @@ -8,7 +8,7 @@ mas_config_api_version: "config.mas.ibm.com" use_postdelete_hooks: {{ USE_POSTDELETE_HOOKS }} jdbc_type: {{ JDBC_TYPE }} -jdbc_instance_name: +jdbc_instance_name: {{ SECRET_KEY_JDBC_INSTANCE_NAME }} jdbc_instance_username: jdbc_instance_password: mas_config_dir: {{ MAS_CONFIG_DIR }} diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-iac-rdsdb2.tf.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-iac-rdsdb2.tf.j2 index 38c9b8c3e90..6fde824f165 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-iac-rdsdb2.tf.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-iac-rdsdb2.tf.j2 @@ -10,7 +10,6 @@ locals { mas-saas-license-db2-json-{{RDS_APP}} = jsondecode(data.aws_secretsmanager_secret_version.mas-saas-license-db2-{{RDS_APP}}.secret_string) ibm_customer_id_{{RDS_APP}} = local.mas-saas-license-db2-json-{{RDS_APP}}["ibm_customer_id"] ibm_site_id_{{RDS_APP}} = local.mas-saas-license-db2-json-{{RDS_APP}}["ibm_site_id"] - secret_suffix_{{RDS_APP}} = join("-", ["rds", var.instance_name, "{{RDS_APP}}"]) } module "db2rds-{{RDS_APP}}" { @@ -25,8 +24,8 @@ module "db2rds-{{RDS_APP}}" { username = "db2admin" subnet_grp_id_list = local.cluster.internal_subnet_ids db2_egress_subnet_ids = local.cluster.external_subnet_ids - db2_ingress_subnet_ids = local.cluster.internal_subnet_ids - db2_additional_ingress_cidrs = local.cluster.cidrs.workload_internal + db2_ingress_subnet_ids = local.cluster.external_subnet_ids + db2_additional_ingress_cidrs = local.cluster.cidrs.workload_external db2_additional_egress_cidrs = local.cluster.cidrs.workload_external db2_instance_class = "{{RDS_MANAGE_DB2_INSTANCE_CLASS}}" db2_storage_type = "gp3" @@ -45,7 +44,8 @@ module "db2rds-{{RDS_APP}}" { backup_retention_period = 30 monitoring_interval = 30 db2_preferred_backup_window = "01:00-02:00" - db2_port = "50001" + db2_port = "50000" + db2_ssl_port = "50001" db2_parameters_file_path = "./db2_parameters-{{RDS_APP}}.yaml" major_engine_version = "11.5" s3_bucket_name_for_audit_log = join("-", [var.cluster_name, var.instance_name, "rds", "auditlog", "{{RDS_APP}}"]) diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/phase1/ibm-mas-cluster-base.yaml.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/phase1/ibm-mas-cluster-base.yaml.j2 index 41346ea5e0b..e32cf089775 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/phase1/ibm-mas-cluster-base.yaml.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/phase1/ibm-mas-cluster-base.yaml.j2 @@ -2,6 +2,9 @@ merge-key: "{{ ACCOUNT_ID }}/{{ CLUSTER_ID }}" account: id: {{ ACCOUNT_ID }} +{% if HYPERVISOR is defined and HYPERVISOR !='' %} + hypervisor: {{ HYPERVISOR }} +{% endif %} region: id: {{ REGION_ID }} diff --git a/python/src/mas/cli/aiservice/install/app.py b/python/src/mas/cli/aiservice/install/app.py index faa4226cb64..b3960cb76ad 100644 --- a/python/src/mas/cli/aiservice/install/app.py +++ b/python/src/mas/cli/aiservice/install/app.py @@ -138,6 +138,13 @@ def interactiveMode(self, simplified: bool, advanced: bool) -> None: # Interactive mode self.isInteractiveMode = True + if simplified: + self.showAdvancedOptions = False + elif advanced: + self.showAdvancedOptions = True + else: + self.chooseInstallFlavour() + if simplified: self.showAdvancedOptions = False elif advanced: diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py index bca00fb4523..885a2d1bfab 100644 --- a/python/src/mas/cli/install/app.py +++ b/python/src/mas/cli/install/app.py @@ -182,7 +182,6 @@ def formatCatalog(self, name: str) -> str: def processCatalogChoice(self) -> list: self.catalogDigest = self.chosenCatalog["catalog_digest"] self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"] - self.catalogDb2Channel = self.chosenCatalog.get("db2_channel_default", "v110509.0") # Returns fallback "v110509.0" for old catalogs without this field if self.architecture != "s390x" and self.architecture != "ppc64le": self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"] diff --git a/tekton/generate-tekton-tasks.yml b/tekton/generate-tekton-tasks.yml index da3d69922be..426b8344797 100644 --- a/tekton/generate-tekton-tasks.yml +++ b/tekton/generate-tekton-tasks.yml @@ -225,6 +225,7 @@ - gitops-deprovision-suite - gitops-dro - gitops-efs + - gitops-efs-csi-driver - gitops-jdbc-config - gitops-kafka - gitops-kafka-config diff --git a/tekton/src/pipelines/gitops/gitops-mas-apps.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-apps.yml.j2 index 0938b038d15..117d08ebc31 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-apps.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-apps.yml.j2 @@ -889,9 +889,6 @@ spec: kind: Task name: gitops-rds-db2-database when: - - input: "$(params.db2_action_iot)" - operator: notin - values: [""] - input: "$(params.jdbc_type_iot)" operator: in values: ["rds-db2"] @@ -1100,9 +1097,6 @@ spec: kind: Task name: gitops-rds-db2-database when: - - input: "$(params.db2_action_manage)" - operator: notin - values: [""] - input: "$(params.jdbc_type_manage)" operator: in values: ["rds-db2"] @@ -1448,9 +1442,6 @@ spec: kind: Task name: gitops-rds-db2-database when: - - input: "$(params.db2_action_facilities)" - operator: notin - values: [""] - input: "$(params.jdbc_type_facilities)" operator: in values: ["rds-db2"] diff --git a/tekton/src/pipelines/gitops/gitops-mas-cluster.yml.j2 b/tekton/src/pipelines/gitops/gitops-mas-cluster.yml.j2 index 0042dab3184..a0ec7215a4e 100644 --- a/tekton/src/pipelines/gitops/gitops-mas-cluster.yml.j2 +++ b/tekton/src/pipelines/gitops/gitops-mas-cluster.yml.j2 @@ -45,6 +45,17 @@ spec: - name: mas_catalog_image type: string + - name: role_arn + type: string + - name: efs_catalog_source + type: string + - name: efs_catalog_source_namespace + type: string + - name: efs_channel + type: string + - name: efs_subscription_source_namespace + type: string +f - name: dro_namespace type: string default: "ibm-software-central" @@ -269,6 +280,8 @@ spec: - name: provisioner_mas_annotations_repo_url type: string default: '' + - name: hypervisor + type: string tasks: - name: gitops-cluster params: @@ -386,6 +399,8 @@ spec: value: $(params.instana_agent_operator_env) - name: instana_agent_operator_jks_storage_class value: $(params.instana_agent_operator_jks_storage_class) + - name: hypervisor + value: $(params.hypervisor) taskRef: kind: Task @@ -396,6 +411,48 @@ spec: - name: gitops-cluster-configs workspace: gitops-cluster-configs + - name: gitops-efs-csi-driver + runAfter: + - gitops-cluster + params: + - name: cluster_name + value: $(params.cluster_name) + - name: account + value: $(params.account) + - name: git_branch + value: $(params.git_branch) + - name: github_org + value: $(params.github_org) + - name: github_repo + value: $(params.github_repo) + - name: github_host + value: $(params.github_host) + - name: git_commit_msg + value: $(params.git_commit_msg) + - name: role_arn + value: $(params.role_arn) + - name: hypervisor + value: $(params.hypervisor) + - name: efs_catalog_source + value: $(params.efs_catalog_source) + - name: efs_catalog_source_namespace + value: $(params.efs_catalog_source_namespace) + - name: efs_channel + value: $(params.efs_channel) + - name: efs_subscription_source_namespace + value: $(params.efs_subscription_source_namespace) + taskRef: + kind: Task + name: gitops-efs-csi-driver + when: + - input: "$(params.hypervisor)" + operator: in + values: ["rosa"] + workspaces: + - name: configs + workspace: configs + + - name: gitops-dro runAfter: - gitops-cluster diff --git a/tekton/src/tasks/gitops/gitops-cluster.yml.j2 b/tekton/src/tasks/gitops/gitops-cluster.yml.j2 index bc73cd07850..44af0f8b65b 100644 --- a/tekton/src/tasks/gitops/gitops-cluster.yml.j2 +++ b/tekton/src/tasks/gitops/gitops-cluster.yml.j2 @@ -153,6 +153,9 @@ spec: - name: instana_agent_operator_jks_storage_class type: string default: '' + - name: hypervisor + type: string + default: '' stepTemplate: name: gitops-cluster @@ -268,6 +271,8 @@ spec: value: $(params.instana_agent_operator_env) - name: INSTANA_AGENT_OPERATOR_JKS_STORAGE_CLASS value: $(params.instana_agent_operator_jks_storage_class) + - name: HYPERVISOR + value: $(params.hypervisor) envFrom: - configMapRef: @@ -324,7 +329,8 @@ spec: --github-org $GITHUB_ORG \ --github-repo $GITHUB_REPO \ --git-branch $GIT_BRANCH \ - --secrets-path $SECRET_PATH + --secrets-path $SECRET_PATH \ + --hypervisor $HYPERVISOR exit $? command: diff --git a/tekton/src/tasks/gitops/gitops-efs-csi-driver.yml.j2 b/tekton/src/tasks/gitops/gitops-efs-csi-driver.yml.j2 new file mode 100644 index 00000000000..3c714e43b1e --- /dev/null +++ b/tekton/src/tasks/gitops/gitops-efs-csi-driver.yml.j2 @@ -0,0 +1,90 @@ +--- +apiVersion: tekton.dev/v1beta1 +kind: Task +metadata: + name: gitops-efs-csi-driver +spec: + params: + - name: cluster_name + type: string + - name: account + type: string + - name: git_branch + type: string + - name: github_org + type: string + - name: github_repo + type: string + - name: github_host + type: string + - name: role_arn + type: string + - name: hypervisor + type: string + - name: efs_catalog_source + type: string + - name: efs_catalog_source_namespace + type: string + - name: efs_channel + type: string + - name: efs_subscription_source_namespace + type: string + stepTemplate: + name: gitops-efs-csi-driver + env: + - name: CLUSTER_NAME + value: $(params.cluster_name) + - name: ACCOUNT + value: $(params.account) + - name: GIT_BRANCH + value: $(params.git_branch) + - name: GITHUB_ORG + value: $(params.github_org) + - name: GITHUB_HOST + value: $(params.github_host) + - name: GITHUB_REPO + value: $(params.github_repo) + - name: EFS_CSI_DRIVER_ROLE_ARN + value: $(params.role_arn) + - name: HYPERVISOR + value: $(params.hypervisor) + - name: EFS_CATALOG_SOURCE + value: $(params.efs_catalog_source) + - name: EFS_CATALOG_SOURCE_NAMESPACE + value: $(params.efs_catalog_source_namespace) + - name: EFS_CHANNEL + value: $(params.efs_channel) + - name: EFS_SUBSCRIPTION_SOURCE_NAMESPACE + value: $(params.efs_subscription_source_namespace) + envFrom: + - configMapRef: + name: environment-properties + optional: true + - secretRef: + name: secure-properties + steps: + - args: + - |- + git config --global user.name "MAS Automation" + git config --global user.email "you@example.com" + git config --global user.password $GITHUB_PAT + + mkdir -p /tmp/init-efs-csi + mas gitops-efs-csi-driver-operator -a $ACCOUNT -c $CLUSTER_NAME \ + --dir /tmp/init-efs-csi \ + --github-push \ + --github-host $GITHUB_HOST \ + --github-org $GITHUB_ORG \ + --github-repo $GITHUB_REPO \ + --git-branch $GIT_BRANCH + + exit $? + command: + - /bin/sh + - -c + name: gitops-efs-csi-driver + imagePullPolicy: IfNotPresent + image: quay.io/ibmmas/cli:latest + workspaces: + - name: configs +