From 6fd0453c52e9e01186ff4e722c418c5abed7f8b7 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Fri, 21 Jun 2024 16:44:52 +1200 Subject: [PATCH] DNM only run standalone, don't cleanup --- .../tests/deploy/10-assert-deploy-ironic.yaml | 162 ------------------ .../kuttl/tests/deploy/10-deploy-ironic.yaml | 5 - .../tests/deploy/15-assert-endpoints.yaml | 1 - ...assert-deploy-ironic-conductor-groups.yaml | 32 ---- .../20-deploy-ironic-conductor-groups.yaml | 5 - .../kuttl/tests/deploy/99-cleanup-ironic.yaml | 1 - .../deploy/99-errors-cleanup-ironic.yaml | 1 - tests/kuttl/tests/deploy_tls/00-assert.yaml | 1 - .../tests/deploy_tls/00-tls_ca_bundle.yaml | 1 - ...ls_cert_ironic-inspector-internal-svc.yaml | 1 - ...-tls_cert_ironic-inspector-public-svc.yaml | 1 - .../00-tls_cert_ironic-internal-svc.yaml | 1 - .../00-tls_cert_ironic-public-svc.yaml | 1 - .../deploy_tls/10-assert-deploy-ironic.yaml | 131 -------------- .../tests/deploy_tls/10-deploy-ironic.yaml | 5 - .../tests/deploy_tls/99-cleanup-ironic.yaml | 1 - .../deploy_tls/99-errors-cleanup-ironic.yaml | 1 - .../tests/standalone/99-cleanup-ironic.yaml | 1 - .../standalone/99-errors-cleanup-ironic.yaml | 1 - 19 files changed, 353 deletions(-) delete mode 100644 tests/kuttl/tests/deploy/10-assert-deploy-ironic.yaml delete mode 100644 tests/kuttl/tests/deploy/10-deploy-ironic.yaml delete mode 120000 tests/kuttl/tests/deploy/15-assert-endpoints.yaml delete mode 100644 tests/kuttl/tests/deploy/20-assert-deploy-ironic-conductor-groups.yaml delete mode 100644 tests/kuttl/tests/deploy/20-deploy-ironic-conductor-groups.yaml delete mode 120000 tests/kuttl/tests/deploy/99-cleanup-ironic.yaml delete mode 120000 tests/kuttl/tests/deploy/99-errors-cleanup-ironic.yaml delete mode 120000 tests/kuttl/tests/deploy_tls/00-assert.yaml delete mode 120000 tests/kuttl/tests/deploy_tls/00-tls_ca_bundle.yaml delete mode 120000 tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-inspector-internal-svc.yaml delete mode 120000 tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-inspector-public-svc.yaml delete mode 120000 tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-internal-svc.yaml delete mode 120000 tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-public-svc.yaml delete mode 100644 tests/kuttl/tests/deploy_tls/10-assert-deploy-ironic.yaml delete mode 100644 tests/kuttl/tests/deploy_tls/10-deploy-ironic.yaml delete mode 120000 tests/kuttl/tests/deploy_tls/99-cleanup-ironic.yaml delete mode 120000 tests/kuttl/tests/deploy_tls/99-errors-cleanup-ironic.yaml delete mode 120000 tests/kuttl/tests/standalone/99-cleanup-ironic.yaml delete mode 120000 tests/kuttl/tests/standalone/99-errors-cleanup-ironic.yaml diff --git a/tests/kuttl/tests/deploy/10-assert-deploy-ironic.yaml b/tests/kuttl/tests/deploy/10-assert-deploy-ironic.yaml deleted file mode 100644 index ce263b88..00000000 --- a/tests/kuttl/tests/deploy/10-assert-deploy-ironic.yaml +++ /dev/null @@ -1,162 +0,0 @@ -# -# Check for: -# -# Ironic -# IronicAPI -# IronicConductor -# IronicInspector -# IronicNeutronAgent -# - -apiVersion: ironic.openstack.org/v1beta1 -kind: Ironic -metadata: - finalizers: - - openstack.org/ironic - name: ironic -spec: - customServiceConfig: | - [DEFAULT] - debug = true - databaseInstance: openstack - ironicAPI: - replicas: 1 - ironicConductors: - - replicas: 1 - storageRequest: 10G - ironicInspector: - customServiceConfig: '# add your customization here' - databaseAccount: ironic-inspector - passwordSelectors: - service: IronicInspectorPassword - preserveJobs: true - replicas: 1 - serviceUser: ironic-inspector - ironicNeutronAgent: - customServiceConfig: "# add your customization here" - replicas: 1 - databaseAccount: ironic - passwordSelectors: - service: IronicPassword - preserveJobs: true - rabbitMqClusterName: rabbitmq - rpcTransport: json-rpc - secret: osp-secret - serviceUser: ironic - standalone: false -status: - databaseHostname: openstack.ironic-kuttl-tests.svc - ironicAPIReadyCount: 1 - ironicConductorReadyCount: - null_conductor_group_null: 1 - ironicNeutronAgentReadyCount: 1 ---- -apiVersion: ironic.openstack.org/v1beta1 -kind: IronicAPI -metadata: - finalizers: - - openstack.org/ironicapi - name: ironic-api - ownerReferences: - - apiVersion: ironic.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: Ironic - name: ironic -spec: - customServiceConfig: '# add your customization here' - databaseHostname: openstack.ironic-kuttl-tests.svc - databaseAccount: ironic - passwordSelectors: - service: IronicPassword - replicas: 1 - resources: {} - rpcTransport: json-rpc - secret: osp-secret - serviceUser: ironic - standalone: false -status: - readyCount: 1 ---- -apiVersion: ironic.openstack.org/v1beta1 -kind: IronicConductor -metadata: - finalizers: - - openstack.org/ironicconductor - name: ironic-conductor - ownerReferences: - - apiVersion: ironic.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: Ironic - name: ironic -spec: - conductorGroup: "" - customServiceConfig: '# add your customization here' - databaseHostname: openstack.ironic-kuttl-tests.svc - databaseAccount: ironic - passwordSelectors: - service: IronicPassword - replicas: 1 - resources: {} - rpcTransport: json-rpc - secret: osp-secret - serviceUser: ironic - standalone: false - storageRequest: 10G -status: - readyCount: 1 ---- -apiVersion: ironic.openstack.org/v1beta1 -kind: IronicInspector -metadata: - finalizers: - - openstack.org/ironicinspector - name: ironic-inspector - ownerReferences: - - apiVersion: ironic.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: Ironic - name: ironic -spec: - customServiceConfig: '# add your customization here' - databaseInstance: openstack - databaseAccount: ironic-inspector - passwordSelectors: - service: IronicInspectorPassword - preserveJobs: true - rabbitMqClusterName: rabbitmq - replicas: 1 - resources: {} - rpcTransport: json-rpc - secret: osp-secret - serviceUser: ironic-inspector - standalone: false -status: - databaseHostname: openstack.ironic-kuttl-tests.svc - readyCount: 1 ---- -apiVersion: ironic.openstack.org/v1beta1 -kind: IronicNeutronAgent -metadata: - finalizers: - - openstack.org/ironicneutronagent - name: ironic-ironic-neutron-agent - ownerReferences: - - apiVersion: ironic.openstack.org/v1beta1 - blockOwnerDeletion: true - controller: true - kind: Ironic - name: ironic -spec: - customServiceConfig: "# add your customization here" - passwordSelectors: - service: IronicPassword - rabbitMqClusterName: rabbitmq - replicas: 1 - resources: {} - secret: osp-secret - serviceUser: ironic -status: - readyCount: 1 diff --git a/tests/kuttl/tests/deploy/10-deploy-ironic.yaml b/tests/kuttl/tests/deploy/10-deploy-ironic.yaml deleted file mode 100644 index 2af9c340..00000000 --- a/tests/kuttl/tests/deploy/10-deploy-ironic.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../../../config/samples/ironic_v1beta1_ironic.yaml diff --git a/tests/kuttl/tests/deploy/15-assert-endpoints.yaml b/tests/kuttl/tests/deploy/15-assert-endpoints.yaml deleted file mode 120000 index 85c011a5..00000000 --- a/tests/kuttl/tests/deploy/15-assert-endpoints.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/assert-endpoints.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy/20-assert-deploy-ironic-conductor-groups.yaml b/tests/kuttl/tests/deploy/20-assert-deploy-ironic-conductor-groups.yaml deleted file mode 100644 index 6a8c55a4..00000000 --- a/tests/kuttl/tests/deploy/20-assert-deploy-ironic-conductor-groups.yaml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: ironic.openstack.org/v1beta1 -kind: Ironic -metadata: - name: ironic -spec: - serviceUser: ironic - customServiceConfig: | - [DEFAULT] - debug = true - databaseInstance: openstack - ironicAPI: - replicas: 1 - ironicConductors: - - replicas: 1 - storageRequest: 10G - - conductorGroup: auckland - replicas: 1 - storageRequest: 10G - - conductorGroup: stockholm - replicas: 1 - storageRequest: 10G - ironicInspector: - replicas: 1 - secret: osp-secret -status: - databaseHostname: openstack.ironic-kuttl-tests.svc - ironicAPIReadyCount: 1 - ironicConductorReadyCount: - null_conductor_group_null: 1 - auckland: 1 - stockholm: 1 - ironicNeutronAgentReadyCount: 1 diff --git a/tests/kuttl/tests/deploy/20-deploy-ironic-conductor-groups.yaml b/tests/kuttl/tests/deploy/20-deploy-ironic-conductor-groups.yaml deleted file mode 100644 index 19d0deac..00000000 --- a/tests/kuttl/tests/deploy/20-deploy-ironic-conductor-groups.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../../../config/samples/ironic_v1beta1_ironic_conductor_groups.yaml diff --git a/tests/kuttl/tests/deploy/99-cleanup-ironic.yaml b/tests/kuttl/tests/deploy/99-cleanup-ironic.yaml deleted file mode 120000 index 5b96dace..00000000 --- a/tests/kuttl/tests/deploy/99-cleanup-ironic.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/cleanup-ironic.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy/99-errors-cleanup-ironic.yaml b/tests/kuttl/tests/deploy/99-errors-cleanup-ironic.yaml deleted file mode 120000 index e8c1833b..00000000 --- a/tests/kuttl/tests/deploy/99-errors-cleanup-ironic.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/errors-cleanup-ironic.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy_tls/00-assert.yaml b/tests/kuttl/tests/deploy_tls/00-assert.yaml deleted file mode 120000 index 4e080a30..00000000 --- a/tests/kuttl/tests/deploy_tls/00-assert.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/assert_tls_cert.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy_tls/00-tls_ca_bundle.yaml b/tests/kuttl/tests/deploy_tls/00-tls_ca_bundle.yaml deleted file mode 120000 index 2e45b874..00000000 --- a/tests/kuttl/tests/deploy_tls/00-tls_ca_bundle.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/tls_ca_bundle.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-inspector-internal-svc.yaml b/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-inspector-internal-svc.yaml deleted file mode 120000 index 52d5e360..00000000 --- a/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-inspector-internal-svc.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/tls_cert_ironic-inspector-internal-svc.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-inspector-public-svc.yaml b/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-inspector-public-svc.yaml deleted file mode 120000 index 9b44b8db..00000000 --- a/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-inspector-public-svc.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/tls_cert_ironic-inspector-public-svc.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-internal-svc.yaml b/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-internal-svc.yaml deleted file mode 120000 index c4fbdb46..00000000 --- a/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-internal-svc.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/tls_cert_ironic-internal-svc.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-public-svc.yaml b/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-public-svc.yaml deleted file mode 120000 index 9b78b980..00000000 --- a/tests/kuttl/tests/deploy_tls/00-tls_cert_ironic-public-svc.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/tls_cert_ironic-public-svc.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy_tls/10-assert-deploy-ironic.yaml b/tests/kuttl/tests/deploy_tls/10-assert-deploy-ironic.yaml deleted file mode 100644 index ea1e2bc0..00000000 --- a/tests/kuttl/tests/deploy_tls/10-assert-deploy-ironic.yaml +++ /dev/null @@ -1,131 +0,0 @@ -# -# Check for: -# -# Ironic -# IronicAPI -# IronicConductor -# IronicInspector -# IronicNeutronAgent -# Registered TLS endpoints for api and inspector -# - -apiVersion: ironic.openstack.org/v1beta1 -kind: Ironic -metadata: - name: ironic -spec: - databaseInstance: openstack - ironicAPI: - replicas: 1 - tls: - api: - internal: - secretName: cert-ironic-internal-svc - public: - secretName: cert-ironic-public-svc - caBundleSecretName: combined-ca-bundle - ironicConductors: - - replicas: 1 - ironicInspector: - replicas: 1 - tls: - api: - internal: - secretName: cert-ironic-inspector-internal-svc - public: - secretName: cert-ironic-inspector-public-svc - caBundleSecretName: combined-ca-bundle - ironicNeutronAgent: - replicas: 1 -status: - databaseHostname: openstack.ironic-kuttl-tests.svc - ironicAPIReadyCount: 1 - ironicConductorReadyCount: - null_conductor_group_null: 1 - ironicInspectorReadyCount: 1 - ironicNeutronAgentReadyCount: 1 ---- -apiVersion: ironic.openstack.org/v1beta1 -kind: IronicAPI -metadata: - name: ironic-api -spec: - replicas: 1 - tls: - api: - internal: - secretName: cert-ironic-internal-svc - public: - secretName: cert-ironic-public-svc - caBundleSecretName: combined-ca-bundle -status: - readyCount: 1 ---- -apiVersion: ironic.openstack.org/v1beta1 -kind: IronicConductor -metadata: - name: ironic-conductor -spec: - replicas: 1 - tls: - caBundleSecretName: combined-ca-bundle -status: - readyCount: 1 ---- -apiVersion: ironic.openstack.org/v1beta1 -kind: IronicInspector -metadata: - name: ironic-inspector -spec: - replicas: 1 - tls: - api: - internal: - secretName: cert-ironic-inspector-internal-svc - public: - secretName: cert-ironic-inspector-public-svc - caBundleSecretName: combined-ca-bundle -status: - databaseHostname: openstack.ironic-kuttl-tests.svc - readyCount: 1 ---- -apiVersion: ironic.openstack.org/v1beta1 -kind: IronicNeutronAgent -metadata: - name: ironic-ironic-neutron-agent -spec: - replicas: 1 - tls: - caBundleSecretName: combined-ca-bundle -status: - readyCount: 1 ---- -# the actual addresses of the api endpoints are platform specific, so we can't rely on -# kuttl asserts to check them. This short script gathers the addresses and checks that -# the two endpoints are defined and their addresses follow the default pattern -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -commands: - - script: | - set -euxo pipefail - template='{{.spec.endpoints.internal}}{{":"}}{{.spec.endpoints.public}}{{"\n"}}' - regex="https:\/\/ironic-internal\.$NAMESPACE\..*:https:\/\/ironic-public\.$NAMESPACE\..*" - apiEndpoints=$(oc get -n $NAMESPACE KeystoneEndpoint ironic -o go-template="$template") - matches=$(echo "$apiEndpoints" | sed -e "s?$regex??") - if [[ -n "$matches" ]]; then - exit 1 - fi - exit 0 -# the actual addresses of the api endpoints are platform specific, so we can't rely on -# kuttl asserts to check them. This short script gathers the addresses and checks that -# the two endpoints are defined and their addresses follow the default pattern - - script: | - set -euxo pipefail - template='{{.spec.endpoints.internal}}{{":"}}{{.spec.endpoints.public}}{{"\n"}}' - regex="https:\/\/ironic-inspector-internal\.$NAMESPACE\..*:https:\/\/ironic-inspector-public\.$NAMESPACE\..*" - apiEndpoints=$(oc get -n $NAMESPACE KeystoneEndpoint ironic-inspector -o go-template="$template") - matches=$(echo "$apiEndpoints" | sed -e "s?$regex??") - if [[ -n "$matches" ]]; then - exit 1 - fi - exit 0 diff --git a/tests/kuttl/tests/deploy_tls/10-deploy-ironic.yaml b/tests/kuttl/tests/deploy_tls/10-deploy-ironic.yaml deleted file mode 100644 index f6c3878e..00000000 --- a/tests/kuttl/tests/deploy_tls/10-deploy-ironic.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../../../config/samples/ironic_v1beta1_ironic_tls.yaml diff --git a/tests/kuttl/tests/deploy_tls/99-cleanup-ironic.yaml b/tests/kuttl/tests/deploy_tls/99-cleanup-ironic.yaml deleted file mode 120000 index 5b96dace..00000000 --- a/tests/kuttl/tests/deploy_tls/99-cleanup-ironic.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/cleanup-ironic.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/deploy_tls/99-errors-cleanup-ironic.yaml b/tests/kuttl/tests/deploy_tls/99-errors-cleanup-ironic.yaml deleted file mode 120000 index e8c1833b..00000000 --- a/tests/kuttl/tests/deploy_tls/99-errors-cleanup-ironic.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/errors-cleanup-ironic.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/standalone/99-cleanup-ironic.yaml b/tests/kuttl/tests/standalone/99-cleanup-ironic.yaml deleted file mode 120000 index 5b96dace..00000000 --- a/tests/kuttl/tests/standalone/99-cleanup-ironic.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/cleanup-ironic.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/standalone/99-errors-cleanup-ironic.yaml b/tests/kuttl/tests/standalone/99-errors-cleanup-ironic.yaml deleted file mode 120000 index e8c1833b..00000000 --- a/tests/kuttl/tests/standalone/99-errors-cleanup-ironic.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/errors-cleanup-ironic.yaml \ No newline at end of file