diff --git a/config/overlays/e2e-release-0.4/ironic.env b/config/overlays/e2e-release-0.4/ironic.env deleted file mode 100644 index ea9d07501a..0000000000 --- a/config/overlays/e2e-release-0.4/ironic.env +++ /dev/null @@ -1,4 +0,0 @@ -DEPLOY_KERNEL_URL=http://192.168.222.199:6180/images/ironic-python-agent.kernel -DEPLOY_RAMDISK_URL=http://192.168.222.199:6180/images/ironic-python-agent.initramfs -IRONIC_ENDPOINT=https://192.168.222.199:6385/v1/ -IRONIC_INSPECTOR_ENDPOINT=https://192.168.222.199:5050/v1/ diff --git a/config/overlays/e2e-release-0.4/kustomization.yaml b/config/overlays/e2e-release-0.4/kustomization.yaml deleted file mode 100644 index 10c4705ec6..0000000000 --- a/config/overlays/e2e-release-0.4/kustomization.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: baremetal-operator-system -resources: -- https://github.com/metal3-io/baremetal-operator/config/tls?ref=release-0.4&timeout=120s -components: -- ../../components/basic-auth -configMapGenerator: -- name: ironic - behavior: merge - envs: - - ironic.env -patches: -- patch: | - # Don't try to pull again the pre-loaded image - - op: replace - path: /spec/template/spec/containers/0/imagePullPolicy - value: IfNotPresent - target: - kind: Deployment - name: controller-manager -images: -- name: quay.io/metal3-io/baremetal-operator - newTag: release-0.4 -# We cannot use suffix hashes since the kustomizations we build on -# cannot be aware of what suffixes we add. -generatorOptions: - disableNameSuffixHash: true -# NOTE: These credentials are generated automatically in hack/ci-e2e.sh -secretGenerator: -- name: ironic-credentials - files: - - username=ironic-username - - password=ironic-password -- name: ironic-inspector-credentials - files: - - username=ironic-inspector-username - - password=ironic-inspector-password diff --git a/config/overlays/e2e-release-0.5/ironic.env b/config/overlays/e2e-release-0.5/ironic.env deleted file mode 100644 index 0187ae15e4..0000000000 --- a/config/overlays/e2e-release-0.5/ironic.env +++ /dev/null @@ -1,3 +0,0 @@ -DEPLOY_KERNEL_URL=http://192.168.222.199:6180/images/ironic-python-agent.kernel -DEPLOY_RAMDISK_URL=http://192.168.222.199:6180/images/ironic-python-agent.initramfs -IRONIC_ENDPOINT=https://192.168.222.199:6385/v1/ diff --git a/config/overlays/e2e-release-0.5/kustomization.yaml b/config/overlays/e2e-release-0.5/kustomization.yaml deleted file mode 100644 index 5c26ca29fa..0000000000 --- a/config/overlays/e2e-release-0.5/kustomization.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: baremetal-operator-system -resources: -- https://github.com/metal3-io/baremetal-operator/config/overlays/basic-auth_tls?ref=release-0.5&timeout=120s -configMapGenerator: -- name: ironic - behavior: create - envs: - - ironic.env -patches: -- patch: | - # Don't try to pull again the pre-loaded image - - op: replace - path: /spec/template/spec/containers/0/imagePullPolicy - value: IfNotPresent - target: - kind: Deployment - name: controller-manager -images: -- name: quay.io/metal3-io/baremetal-operator - newTag: release-0.5 -# We cannot use suffix hashes since the kustomizations we build on -# cannot be aware of what suffixes we add. -generatorOptions: - disableNameSuffixHash: true -# NOTE: These credentials are generated automatically in hack/ci-e2e.sh -secretGenerator: -- name: ironic-credentials - files: - - username=ironic-username - - password=ironic-password -- name: ironic-inspector-credentials - files: - - username=ironic-inspector-username - - password=ironic-inspector-password diff --git a/config/overlays/fixture-release-0.4/kustomization.yaml b/config/overlays/fixture-release-0.4/kustomization.yaml deleted file mode 100644 index 5c6f1efafa..0000000000 --- a/config/overlays/fixture-release-0.4/kustomization.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.4 -- https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.4 -patches: -- patch: | - # Enable test mode (fixture provider instead of ironic) - - op: add - path: /spec/template/spec/containers/0/args/- - value: --test-mode - # Don't try to pull again the pre-loaded image - - op: replace - path: /spec/template/spec/containers/0/imagePullPolicy - value: IfNotPresent - target: - kind: Deployment - name: controller-manager -images: -- name: quay.io/metal3-io/baremetal-operator - newTag: release-0.4 diff --git a/config/overlays/fixture-release-0.5/kustomization.yaml b/config/overlays/fixture-release-0.5/kustomization.yaml deleted file mode 100644 index 4600b60d9d..0000000000 --- a/config/overlays/fixture-release-0.5/kustomization.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.5 -- https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.5 -patches: -- patch: | - # Enable test mode (fixture provider instead of ironic) - - op: add - path: /spec/template/spec/containers/0/args/- - value: --test-mode - # Don't try to pull again the pre-loaded image - - op: replace - path: /spec/template/spec/containers/0/imagePullPolicy - value: IfNotPresent - target: - kind: Deployment - name: controller-manager -images: -- name: quay.io/metal3-io/baremetal-operator - newTag: release-0.5 diff --git a/hack/ci-e2e.sh b/hack/ci-e2e.sh index 5643778146..5d55b982f8 100755 --- a/hack/ci-e2e.sh +++ b/hack/ci-e2e.sh @@ -186,8 +186,6 @@ BMO_OVERLAYS=( ) IRONIC_OVERLAYS=( "${REPO_ROOT}/ironic-deployment/overlays/e2e" - "${REPO_ROOT}/ironic-deployment/overlays/e2e-with-inspector" - "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-24.0-with-inspector" "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-24.1" "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-25.0" "${REPO_ROOT}/ironic-deployment/overlays/e2e-release-26.0" @@ -195,22 +193,14 @@ IRONIC_OVERLAYS=( IRONIC_USERNAME="$(uuidgen)" IRONIC_PASSWORD="$(uuidgen)" -IRONIC_INSPECTOR_USERNAME="$(uuidgen)" -IRONIC_INSPECTOR_PASSWORD="$(uuidgen)" # These must be exported so that envsubst can pick them up below export IRONIC_USERNAME export IRONIC_PASSWORD -export IRONIC_INSPECTOR_USERNAME -export IRONIC_INSPECTOR_PASSWORD for overlay in "${BMO_OVERLAYS[@]}"; do echo "${IRONIC_USERNAME}" > "${overlay}/ironic-username" echo "${IRONIC_PASSWORD}" > "${overlay}/ironic-password" - if [[ "${overlay}" =~ release-0\.[1-5]$ ]]; then - echo "${IRONIC_INSPECTOR_USERNAME}" > "${overlay}/ironic-inspector-username" - echo "${IRONIC_INSPECTOR_PASSWORD}" > "${overlay}/ironic-inspector-password" - fi done for overlay in "${IRONIC_OVERLAYS[@]}"; do @@ -218,15 +208,6 @@ for overlay in "${IRONIC_OVERLAYS[@]}"; do "${overlay}/ironic-htpasswd" envsubst < "${REPO_ROOT}/ironic-deployment/components/basic-auth/ironic-auth-config-tpl" > \ "${overlay}/ironic-auth-config" - - if [[ "${overlay}" =~ -with-inspector ]]; then - IRONIC_INSPECTOR_AUTH_CONFIG_TPL="/tmp/ironic-inspector-auth-config-tpl" - curl -o "${IRONIC_INSPECTOR_AUTH_CONFIG_TPL}" https://raw.githubusercontent.com/metal3-io/baremetal-operator/release-0.5/ironic-deployment/components/basic-auth/ironic-inspector-auth-config-tpl - envsubst < "${IRONIC_INSPECTOR_AUTH_CONFIG_TPL}" > \ - "${overlay}/ironic-inspector-auth-config" - echo "INSPECTOR_HTPASSWD=$(htpasswd -n -b -B "${IRONIC_INSPECTOR_USERNAME}" \ - "${IRONIC_INSPECTOR_PASSWORD}")" > "${overlay}/ironic-inspector-htpasswd" - fi done # We need to gather artifacts/logs before exiting also if there are errors diff --git a/ironic-deployment/overlays/e2e-release-24.0-with-inspector/ironic-patch.yaml b/ironic-deployment/overlays/e2e-release-24.0-with-inspector/ironic-patch.yaml deleted file mode 100644 index 098d21e109..0000000000 --- a/ironic-deployment/overlays/e2e-release-24.0-with-inspector/ironic-patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ironic -spec: - template: - spec: - containers: - - name: ironic-dnsmasq - $patch: delete diff --git a/ironic-deployment/overlays/e2e-release-24.0-with-inspector/ironic_bmo_configmap.env b/ironic-deployment/overlays/e2e-release-24.0-with-inspector/ironic_bmo_configmap.env deleted file mode 100644 index cd099090c2..0000000000 --- a/ironic-deployment/overlays/e2e-release-24.0-with-inspector/ironic_bmo_configmap.env +++ /dev/null @@ -1,6 +0,0 @@ -HTTP_PORT=6180 -PROVISIONING_IP=192.168.222.199 -CACHEURL=http://192.168.222.199/images -IRONIC_FAST_TRACK=true -IRONIC_KERNEL_PARAMS=console=ttyS0 -IRONIC_INSPECTOR_VLAN_INTERFACES=all diff --git a/ironic-deployment/overlays/e2e-release-24.0-with-inspector/kustomization.yaml b/ironic-deployment/overlays/e2e-release-24.0-with-inspector/kustomization.yaml deleted file mode 100644 index 104be2fe63..0000000000 --- a/ironic-deployment/overlays/e2e-release-24.0-with-inspector/kustomization.yaml +++ /dev/null @@ -1,55 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: baremetal-operator-system -resources: -- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.5&timeout=120s -- https://github.com/metal3-io/baremetal-operator/ironic-deployment/base?ref=release-0.5&timeout=120s - -components: -- https://github.com/metal3-io/baremetal-operator/ironic-deployment/components/basic-auth?ref=release-0.5&timeout=120s -- https://github.com/metal3-io/baremetal-operator/ironic-deployment/components/tls?ref=release-0.5&timeout=120s - -configMapGenerator: -- envs: - - ironic_bmo_configmap.env - name: ironic-bmo-configmap - behavior: create - -patches: - - path: ironic-patch.yaml - -images: -- name: quay.io/metal3-io/ironic - newTag: release-24.0 - -# NOTE: These credentials are generated automatically in hack/ci-e2e.sh -secretGenerator: -- name: ironic-htpasswd - behavior: create - files: - - htpasswd=ironic-htpasswd -- name: ironic-inspector-htpasswd - behavior: create - files: - - htpasswd=ironic-inspector-htpasswd -- name: ironic-auth-config - files: - - auth-config=ironic-auth-config -- name: ironic-inspector-auth-config - files: - - auth-config=ironic-inspector-auth-config - -replacements: - # Replace IRONIC_HOST_IP in certificates with the PROVISIONING_IP from the configmap - - source: - kind: ConfigMap - name: ironic-bmo-configmap - fieldPath: .data.PROVISIONING_IP - targets: - - select: - version: v1 - group: cert-manager.io - kind: Certificate - name: - fieldPaths: - - .spec.ipAddresses.0 diff --git a/ironic-deployment/overlays/e2e-with-inspector/ironic-patch.yaml b/ironic-deployment/overlays/e2e-with-inspector/ironic-patch.yaml deleted file mode 100644 index 098d21e109..0000000000 --- a/ironic-deployment/overlays/e2e-with-inspector/ironic-patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ironic -spec: - template: - spec: - containers: - - name: ironic-dnsmasq - $patch: delete diff --git a/ironic-deployment/overlays/e2e-with-inspector/ironic_bmo_configmap.env b/ironic-deployment/overlays/e2e-with-inspector/ironic_bmo_configmap.env deleted file mode 100644 index 65624598de..0000000000 --- a/ironic-deployment/overlays/e2e-with-inspector/ironic_bmo_configmap.env +++ /dev/null @@ -1,7 +0,0 @@ -HTTP_PORT=6180 -PROVISIONING_IP=192.168.222.199 -CACHEURL=http://192.168.222.199/images -IRONIC_FAST_TRACK=true -IRONIC_KERNEL_PARAMS=console=ttyS0 -IRONIC_INSPECTOR_VLAN_INTERFACES=all -USE_IRONIC_INSPECTOR=true diff --git a/ironic-deployment/overlays/e2e-with-inspector/kustomization.yaml b/ironic-deployment/overlays/e2e-with-inspector/kustomization.yaml deleted file mode 100644 index d1009417ca..0000000000 --- a/ironic-deployment/overlays/e2e-with-inspector/kustomization.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: baremetal-operator-system -resources: -- ../../../config/namespace -- https://github.com/metal3-io/baremetal-operator/ironic-deployment/base?ref=release-0.5&timeout=120s - -components: -- https://github.com/metal3-io/baremetal-operator/ironic-deployment/components/basic-auth?ref=release-0.5&timeout=120s -- https://github.com/metal3-io/baremetal-operator/ironic-deployment/components/tls?ref=release-0.5&timeout=120s - -configMapGenerator: -- envs: - - ironic_bmo_configmap.env - name: ironic-bmo-configmap - behavior: create - -patches: -- path: ironic-patch.yaml - -# NOTE: These credentials are generated automatically in hack/ci-e2e.sh -secretGenerator: -- name: ironic-htpasswd - behavior: create - envs: - - ironic-htpasswd -- name: ironic-inspector-htpasswd - behavior: create - envs: - - ironic-inspector-htpasswd -- name: ironic-auth-config - files: - - auth-config=ironic-auth-config -- name: ironic-inspector-auth-config - files: - - auth-config=ironic-inspector-auth-config - -replacements: -# Replace IRONIC_HOST_IP in certificates with the PROVISIONING_IP from the configmap -- source: - kind: ConfigMap - name: ironic-bmo-configmap - fieldPath: .data.PROVISIONING_IP - targets: - - select: - version: v1 - group: cert-manager.io - kind: Certificate - name: - fieldPaths: - - .spec.ipAddresses.0 diff --git a/test/e2e/config/ironic.yaml b/test/e2e/config/ironic.yaml index e0a7f336ee..1352a7b17e 100644 --- a/test/e2e/config/ironic.yaml +++ b/test/e2e/config/ironic.yaml @@ -79,12 +79,6 @@ bmoIronicUpgradeSpecs: initIronicKustomization: "../../ironic-deployment/overlays/e2e" upgradeEntityKustomization: "../../config/overlays/e2e" upgradeEntityName: "bmo" -- deployIronic: true - deployBMO: true - initBMOKustomization: "../../config/overlays/e2e-release-0.9" - initIronicKustomization: "../../ironic-deployment/overlays/e2e-release-24.0-with-inspector" - upgradeEntityKustomization: "../../ironic-deployment/overlays/e2e" - upgradeEntityName: "ironic" - deployIronic: true deployBMO: true initBMOKustomization: "../../config/overlays/e2e-release-0.9"