Skip to content

Commit e10993c

Browse files
gustavoliragustavolira
committed
feat: centralize namespace configuration for RHDH CI/CD jobs
This commit introduces a new centralized namespace configuration file, `.ibm/pipelines/namespace-config.sh`, which standardizes namespace definitions across various job handlers. All job scripts now source this configuration and utilize the `set_namespaces()` function to dynamically set namespaces based on the `JOB_NAME` environment variable. This change enhances maintainability, consistency, and visibility of namespace management within the RHDH codebase.
1 parent 797f159 commit e10993c

File tree

11 files changed

+92
-4
lines changed

11 files changed

+92
-4
lines changed

‎.ibm/pipelines/jobs/aks-helm.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
source "$DIR"/utils.sh
55
# shellcheck source=.ibm/pipelines/cluster/aks/aks-helm-deployment.sh
66
source "$DIR"/cluster/aks/aks-helm-deployment.sh
7+
# shellcheck source=.ibm/pipelines/namespace-config.sh
8+
source "$DIR"/namespace-config.sh
79

810
handle_aks_helm() {
11+
set_namespaces
12+
913
echo "Starting AKS Helm deployment"
1014

1115
K8S_CLUSTER_ROUTER_BASE=$(kubectl get svc nginx --namespace app-routing-system -o jsonpath='{.status.loadBalancer.ingress[0].ip}')

‎.ibm/pipelines/jobs/aks-operator.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ source "$DIR"/install-methods/operator.sh
66
source "$DIR"/cluster/aks/aks-operator-deployment.sh
77
# shellcheck source=.ibm/pipelines/cluster/k8s/k8s-utils.sh
88
source "$DIR"/cluster/k8s/k8s-utils.sh
9+
# shellcheck source=.ibm/pipelines/namespace-config.sh
10+
source "$DIR"/namespace-config.sh
911

1012
handle_aks_operator() {
13+
set_namespaces
14+
1115
echo "Starting AKS Operator deployment"
1216

1317
K8S_CLUSTER_ROUTER_BASE=$(kubectl get svc nginx --namespace app-routing-system -o jsonpath='{.status.loadBalancer.ingress[0].ip}')

‎.ibm/pipelines/jobs/eks-helm.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ source "$DIR"/cluster/eks/eks-helm-deployment.sh
88
source "$DIR"/cluster/eks/aws.sh
99
# shellcheck source=.ibm/pipelines/cluster/k8s/k8s-utils.sh
1010
source "$DIR"/cluster/k8s/k8s-utils.sh
11+
# shellcheck source=.ibm/pipelines/namespace-config.sh
12+
source "$DIR"/namespace-config.sh
1113

1214
handle_eks_helm() {
15+
set_namespaces
16+
1317
echo "Starting EKS Helm deployment"
1418

1519
# Verify EKS cluster connectivity

‎.ibm/pipelines/jobs/eks-operator.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ source "$DIR"/cluster/eks/eks-operator-deployment.sh
88
source "$DIR"/cluster/k8s/k8s-utils.sh
99
# shellcheck source=.ibm/pipelines/cluster/eks/aws.sh
1010
source "$DIR"/cluster/eks/aws.sh
11+
# shellcheck source=.ibm/pipelines/namespace-config.sh
12+
source "$DIR"/namespace-config.sh
1113

1214
handle_eks_operator() {
15+
set_namespaces
16+
1317
echo "Starting EKS Operator deployment"
1418

1519
# Verify EKS cluster connectivity

‎.ibm/pipelines/jobs/gke-helm.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ source "$DIR"/utils.sh
66
source "$DIR"/cluster/gke/gcloud.sh
77
# shellcheck source=.ibm/pipelines/cluster/gke/gke-helm-deployment.sh
88
source "$DIR"/cluster/gke/gke-helm-deployment.sh
9+
# shellcheck source=.ibm/pipelines/namespace-config.sh
10+
source "$DIR"/namespace-config.sh
911

1012
handle_gke_helm() {
13+
set_namespaces
1114

1215
echo "Creating GKE SSL certificate..."
1316
gcloud_ssl_cert_create "$GKE_CERT_NAME" "$GKE_INSTANCE_DOMAIN_NAME" "$GOOGLE_CLOUD_PROJECT"

‎.ibm/pipelines/jobs/gke-operator.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ source "$DIR"/cluster/gke/gcloud.sh
88
source "$DIR"/cluster/gke/gke-operator-deployment.sh
99
# shellcheck source=.ibm/pipelines/install-methods/operator.sh
1010
source "$DIR"/install-methods/operator.sh
11+
# shellcheck source=.ibm/pipelines/namespace-config.sh
12+
source "$DIR"/namespace-config.sh
1113

1214
handle_gke_operator() {
15+
set_namespaces
1316

1417
echo "Creating GKE SSL certificate..."
1518
gcloud_ssl_cert_create "$GKE_CERT_NAME" "$GKE_INSTANCE_DOMAIN_NAME" "$GOOGLE_CLOUD_PROJECT"

‎.ibm/pipelines/jobs/ocp-nightly.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
# shellcheck source=.ibm/pipelines/utils.sh
44
source "$DIR"/utils.sh
5+
# shellcheck source=.ibm/pipelines/namespace-config.sh
6+
source "$DIR"/namespace-config.sh
57

68
handle_ocp_nightly() {
7-
export NAME_SPACE="showcase-ci-nightly"
8-
export NAME_SPACE_RBAC="showcase-rbac-nightly"
9-
export NAME_SPACE_POSTGRES_DB="postgress-external-db-nightly"
9+
set_namespaces
1010

1111
oc_login
1212

‎.ibm/pipelines/jobs/ocp-operator.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
source "$DIR"/utils.sh
55
# shellcheck source=.ibm/pipelines/install-methods/operator.sh
66
source "$DIR"/install-methods/operator.sh
7+
# shellcheck source=.ibm/pipelines/namespace-config.sh
8+
source "$DIR"/namespace-config.sh
79

810
initiate_operator_deployments() {
911
echo "Initiating Operator-backed deployments on OCP"
@@ -85,6 +87,8 @@ run_operator_runtime_config_change_tests() {
8587
}
8688

8789
handle_ocp_operator() {
90+
set_namespaces
91+
8892
oc_login
8993

9094
K8S_CLUSTER_ROUTER_BASE=$(oc get route console -n openshift-console -o=jsonpath='{.spec.host}' | sed 's/^[^.]*\.//')

‎.ibm/pipelines/jobs/ocp-pull.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#!/bin/bash
22

3+
# shellcheck source=.ibm/pipelines/namespace-config.sh
4+
source "$DIR"/namespace-config.sh
5+
36
handle_ocp_pull() {
7+
set_namespaces
8+
49
echo "Configuring namespace: ${NAME_SPACE}"
510
oc_login
611
echo "OCP version: $(oc version)"

‎.ibm/pipelines/jobs/upgrade.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
# shellcheck source=.ibm/pipelines/utils.sh
44
source "$DIR"/utils.sh
5+
# shellcheck source=.ibm/pipelines/namespace-config.sh
6+
source "$DIR"/namespace-config.sh
57

68
handle_ocp_helm_upgrade() {
7-
export NAME_SPACE="showcase-upgrade-nightly"
9+
set_namespaces
10+
811
export NAME_SPACE_POSTGRES_DB="${NAME_SPACE}-postgres-external-db"
912
export DEPLOYMENT_NAME="${RELEASE_NAME}-developer-hub"
1013
export QUAY_REPO_BASE="rhdh/rhdh-hub-rhel9"

0 commit comments

Comments
 (0)