Allow variable namespace for KUTTL tests

Author: abays

kuttl-test.yaml

@@ -14,8 +14,8 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
 commands:
-  - command: oc apply -n openstack-kuttl-tests -f https://raw.githubusercontent.com/openstack-k8s-operators/infra-operator/main/config/samples/network_v1beta1_netconfig.yaml
-  - command: oc apply -n openstack-kuttl-tests -f https://raw.githubusercontent.com/openstack-k8s-operators/infra-operator/main/config/samples/network_v1beta1_dnsmasq.yaml
+  - command: oc apply -n $NAMESPACE -f https://raw.githubusercontent.com/openstack-k8s-operators/infra-operator/main/config/samples/network_v1beta1_netconfig.yaml
+  - command: oc apply -n $NAMESPACE -f https://raw.githubusercontent.com/openstack-k8s-operators/infra-operator/main/config/samples/network_v1beta1_dnsmasq.yaml
   - script: |
       if [ ! -f ansibleee-ssh-key-id_rsa ]; then
           ssh-keygen -f ansibleee-ssh-key-id_rsa -N "" -t rsa -b 4096
@@ -26,7 +26,7 @@ commands:
       --from-file=authorized_keys=ansibleee-ssh-key-id_rsa.pub \
       --from-file=ssh-privatekey=ansibleee-ssh-key-id_rsa \
       --from-file=ssh-publickey=ansibleee-ssh-key-id_rsa.pub \
-      -n openstack-kuttl-tests \
+      -n $NAMESPACE \
       -o yaml | \
       oc apply -f -
 reportFormat: xml

test/kuttl/common/README.md

@@ -79,24 +79,24 @@ commands:
 source ../../common/create_custom_cert.sh
 
 # For keystone
-create_service_route_certificate "keystone" "apps-crc.testing" "openstack-kuttl-tests"
+create_service_route_certificate "keystone" "apps-crc.testing" "$NAMESPACE"
 
 # For glance
-create_service_route_certificate "glance" "apps-crc.testing" "openstack-kuttl-tests"
+create_service_route_certificate "glance" "apps-crc.testing" "$NAMESPACE"
 ```
 
 ### Setup Complete Infrastructure
 
 ```bash
 # Creates both ingress and internal issuers
-setup_custom_certificate_infrastructure "openstack-kuttl-tests"
+setup_custom_certificate_infrastructure "$NAMESPACE"
 ```
 
 ### Cleanup
 
 ```bash
 # Remove all custom certificates and issuers
-cleanup_custom_certificates "openstack-kuttl-tests"
+cleanup_custom_certificates "$NAMESPACE"
 ```
 
 ## Security Considerations

test/kuttl/common/create_custom_cert.sh

@@ -8,7 +8,7 @@ function wait_for_state() {
     local object="$1"
     local state="$2"
     local timeout="$3"
-    local namespace="${4:-openstack-kuttl-tests}"
+    local namespace="${4:-$NAMESPACE}"
 
     echo "Waiting for '${object}' in namespace '${namespace}' to become '${state}'..."
     oc wait --for=${state} --timeout=${timeout} ${object} -n="${namespace}"
@@ -17,7 +17,7 @@ function wait_for_state() {
 
 # Create a self-signed issuer (prerequisite for CA certificate)
 function create_selfsigned_issuer() {
-    local namespace="${1:-openstack-kuttl-tests}"
+    local namespace="${1:-$NAMESPACE}"
 
     echo "Creating self-signed issuer in namespace ${namespace}..."
     oc apply -f - << EOF
@@ -43,7 +43,7 @@ EOF
 # Usage: create_custom_issuer <issuer-name> <namespace>
 function create_custom_issuer() {
     local issuer_name="${1:-rootca-custom}"
-    local namespace="${2:-openstack-kuttl-tests}"
+    local namespace="${2:-$NAMESPACE}"
 
     echo "Creating custom root CA and issuer: ${issuer_name} in namespace ${namespace}..."
 
@@ -107,7 +107,7 @@ function create_wildcard_certificate() {
     local cert_name="${1}"
     local domain="${2}"
     local issuer_name="${3:-rootca-custom}"
-    local namespace="${4:-openstack-kuttl-tests}"
+    local namespace="${4:-$NAMESPACE}"
 
     if [[ -z "${cert_name}" ]] || [[ -z "${domain}" ]]; then
         echo "Error: cert_name and domain are required"
@@ -157,7 +157,7 @@ EOF
 function create_service_route_certificate() {
     local service_name="${1}"
     local ingress_domain="${2}"
-    local namespace="${3:-openstack-kuttl-tests}"
+    local namespace="${3:-$NAMESPACE}"
     local issuer_name="rootca-ingress-custom"
     local cert_name="${service_name}-custom-route-cert"
     local route_secret_name="${service_name}-custom-route"
@@ -218,7 +218,7 @@ EOF
 # This creates ingress and internal issuers for comprehensive testing
 # Usage: setup_custom_certificate_infrastructure <namespace>
 function setup_custom_certificate_infrastructure() {
-    local namespace="${1:-openstack-kuttl-tests}"
+    local namespace="${1:-$NAMESPACE}"
 
     echo "Setting up custom certificate infrastructure in namespace ${namespace}..."
 
@@ -238,7 +238,7 @@ function setup_custom_certificate_infrastructure() {
 # Usage: create_barbican_placement_routes <ingress-domain> <namespace>
 function create_barbican_placement_routes() {
     local ingress_domain="${1}"
-    local namespace="${2:-openstack-kuttl-tests}"
+    local namespace="${2:-$NAMESPACE}"
 
     if [[ -z "${ingress_domain}" ]]; then
         echo "Error: ingress_domain is required"
@@ -265,7 +265,7 @@ function create_barbican_placement_routes() {
 # Cleanup custom certificates and issuers
 # Usage: cleanup_custom_certificates <namespace>
 function cleanup_custom_certificates() {
-    local namespace="${1:-openstack-kuttl-tests}"
+    local namespace="${1:-$NAMESPACE}"
 
     echo "Cleaning up custom certificates and issuers in namespace ${namespace}..."
 

test/kuttl/common/verify_route_override_certs.sh

@@ -6,7 +6,7 @@
 set -e
 
 SERVICE_NAME=$1
-NAMESPACE=${NAMESPACE:-openstack-kuttl-tests}
+NAMESPACE=${NAMESPACE:?NAMESPACE must be set}
 
 if [[ -z "${SERVICE_NAME}" ]]; then
     echo "ERROR: Service name is required"

test/kuttl/tests/ctlplane-tls-custom-route/README.md

@@ -14,7 +14,7 @@ The test uses a hybrid approach combining cert-manager, bash scripts, ConfigMaps
 ### Running the Test
 
 ```bash
-export NAMESPACE="openstack-kuttl-tests"
+export NAMESPACE="my-kuttl-namespace"
 kubectl kuttl test --test ctlplane-tls-custom-route
 ```
 
@@ -161,17 +161,17 @@ The `../../common/create_custom_cert.sh` script provides:
 source ../../common/create_custom_cert.sh
 
 # For keystone
-create_service_route_certificate "keystone" "apps-crc.testing" "openstack-kuttl-tests"
+create_service_route_certificate "keystone" "apps-crc.testing" "$NAMESPACE"
 
 # For glance
-create_service_route_certificate "glance" "apps-crc.testing" "openstack-kuttl-tests"
+create_service_route_certificate "glance" "apps-crc.testing" "$NAMESPACE"
 ```
 
 #### Setup Complete Infrastructure
 
 ```bash
 # Creates both ingress and internal issuers
-setup_custom_certificate_infrastructure "openstack-kuttl-tests"
+setup_custom_certificate_infrastructure "$NAMESPACE"
 ```
 
 ## Kustomize Implementation Details

test/kuttl/tests/dataplane-deploy-global-service-test/00-assert.yaml

@@ -3,7 +3,7 @@ kind: TestAssert
 timeout: 600
 collectors:
 - type: command
-  command: oc get OpenStackDataPlaneDeployment -n openstack-kuttl-tests edpm-compute-global -o yaml
+  command: oc get OpenStackDataPlaneDeployment -n $NAMESPACE edpm-compute-global -o yaml
   name: edpm-compute-global-deployment
 - type: command
   command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack
@@ -13,7 +13,6 @@ apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneNodeSet
 metadata:
   name: edpm-compute-global
-  namespace: openstack-kuttl-tests
 spec:
   preProvisioned: true
   services:

test/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml

@@ -3,7 +3,7 @@ kind: TestAssert
 timeout: 600
 collectors:
 - type: command
-  command: oc get OpenStackDataPlaneDeployment -n openstack-kuttl-tests edpm-compute-global -o yaml
+  command: oc get OpenStackDataPlaneDeployment -n $NAMESPACE edpm-compute-global -o yaml
   name: edpm-compute-global-deployment
 - type: command
   command: oc logs -n openstack-operators -l openstack.org/operator-name=openstack
@@ -13,7 +13,6 @@ apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneNodeSet
 metadata:
   name: edpm-compute-global
-  namespace: openstack-kuttl-tests
 spec:
   services:
   - download-cache
@@ -80,7 +79,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: custom-global-service
   name: custom-global-service-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -188,7 +186,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: download-cache
   name: download-cache-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -286,7 +283,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: bootstrap
   name: bootstrap-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -390,7 +386,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: configure-network
   name: configure-network-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -488,7 +483,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: validate-network
   name: validate-network-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -586,7 +580,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: configure-os
   name: configure-os-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -684,7 +677,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: install-certs
   name: install-certs-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -831,7 +823,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: ovn
   name: ovn-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -940,7 +931,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: neutron-metadata
   name: neutron-metadata-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -1079,7 +1069,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: neutron-ovn
   name: neutron-ovn-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -1218,7 +1207,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: neutron-sriov
   name: neutron-sriov-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -1327,7 +1315,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: neutron-dhcp
   name: neutron-dhcp-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -1436,7 +1423,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: libvirt
   name: libvirt-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -1545,7 +1531,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-global
     openstackdataplaneservice: nova
   name: nova-edpm-compute-global-edpm-compute-global
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true

test/kuttl/tests/dataplane-deploy-global-service-test/02-assert.yaml

@@ -10,7 +10,6 @@ apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneNodeSet
 metadata:
   name: edpm-compute-beta-nodeset
-  namespace: openstack-kuttl-tests
 spec:
   services:
   - download-cache
@@ -67,7 +66,6 @@ apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneDeployment
 metadata:
   name: edpm-multinodeset
-  namespace: openstack-kuttl-tests
 spec:
   nodeSets:
     - edpm-compute-global
@@ -81,7 +79,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-beta-nodeset
     openstackdataplaneservice: download-cache
   name: download-cache-edpm-multinodeset-edpm-compute-beta-nodeset
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -178,7 +175,6 @@ metadata:
     openstackdataplanenodeset: edpm-compute-beta-nodeset
     openstackdataplaneservice: bootstrap
   name: bootstrap-edpm-multinodeset-edpm-compute-beta-nodeset
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true

test/kuttl/tests/dataplane-deploy-multiple-secrets/01-create-cert-issuers.yaml

@@ -15,8 +15,8 @@ commands:
         fi
       }
 
-      if oc get secret combined-ca-bundle -n openstack-kuttl-tests; then  oc delete secret  combined-ca-bundle -n openstack-kuttl-tests; fi
+      if oc get secret combined-ca-bundle -n $NAMESPACE; then  oc delete secret  combined-ca-bundle -n $NAMESPACE; fi
       oc apply -f ./certs.yaml
-      wait_for 100 oc get secret osp-rootca-secret -n openstack-kuttl-tests
-      CA_CRT=$(oc get secret osp-rootca-secret -n openstack-kuttl-tests -o json|jq -r '.data."ca.crt"')
-      oc create secret generic combined-ca-bundle  -n openstack-kuttl-tests --from-literal=TLSCABundleFile=$CA_CRT
+      wait_for 100 oc get secret osp-rootca-secret -n $NAMESPACE
+      CA_CRT=$(oc get secret osp-rootca-secret -n $NAMESPACE -o json|jq -r '.data."ca.crt"')
+      oc create secret generic combined-ca-bundle  -n $NAMESPACE --from-literal=TLSCABundleFile=$CA_CRT

test/kuttl/tests/dataplane-deploy-multiple-secrets/02-assert.yaml

@@ -52,7 +52,7 @@ kind: TestAssert
 commands:
   - script: |
       template='{{index .metadata.annotations "cert-manager.io/alt-names" }}'
-      names=$(oc get secret cert-generic-service1-default-edpm-compute-0 -n openstack-kuttl-tests -o go-template="$template")
+      names=$(oc get secret cert-generic-service1-default-edpm-compute-0 -n $NAMESPACE -o go-template="$template")
       echo $names > test123.data
       regex="(?=.*(edpm-compute-0\.internalapi\.example\.com))(?=.*(edpm-compute-0\.storage\.example\.com))(?=.*(edpm-compute-0\.tenant\.example\.com))(?=.*(edpm-compute-0\.ctlplane\.example\.com))"
       matches=$(grep -P "$regex" test123.data)
@@ -113,7 +113,6 @@ metadata:
     openstackdataplanenodeset: openstack-edpm-tls
     openstackdataplaneservice: install-certs-ovr
   name: install-certs-ovr-openstack-edpm-tls-openstack-edpm-tls
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true
@@ -238,7 +237,6 @@ metadata:
     openstackdataplanenodeset: openstack-edpm-tls
     openstackdataplaneservice: generic-service1
   name: generic-service1-openstack-edpm-tls-openstack-edpm-tls
-  namespace: openstack-kuttl-tests
   ownerReferences:
   - apiVersion: dataplane.openstack.org/v1beta1
     blockOwnerDeletion: true