diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/OWNERS b/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/OWNERS deleted file mode 100644 index f14198cff70e..000000000000 --- a/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/OWNERS +++ /dev/null @@ -1,11 +0,0 @@ -approvers: -- smarterclayton -- wking -- stevekuznetsov -- vrutkovs -- abhinavdahiya -- deads2k -- crawford -- ewolinetz -- csrwng -- staebler diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-commands.sh b/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-commands.sh deleted file mode 100644 index 13566b99f45a..000000000000 --- a/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-commands.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -o nounset -set -o errexit -set -o pipefail - -echo "Gathering installer artifacts ..." -# we don't have jq, so the python equivalent of -# jq '.modules[].resources."aws_instance.bootstrap".primary.attributes."public_ip" | select(.)' -bootstrap_ip=$(python -c \ - 'import sys, json; d=reduce(lambda x,y: dict(x.items() + y.items()), map(lambda x: x["resources"], json.load(sys.stdin)["modules"])); k="aws_instance.bootstrap"; print d[k]["primary"]["attributes"]["public_ip"] if k in d else ""' \ - < "${SHARED_DIR}/terraform.tfstate" -) - -if [ -n "${bootstrap_ip}" ] -then - for service in bootkube openshift kubelet crio - do - curl \ - --insecure \ - --silent \ - --connect-timeout 5 \ - --retry 3 \ - --cert ${ARTIFACT_DIR}/installer/tls/journal-gatewayd.crt \ - --key ${ARTIFACT_DIR}/installer/tls/journal-gatewayd.key \ - --url "https://${bootstrap_ip}:19531/entries?_SYSTEMD_UNIT=${service}.service" > "${ARTIFACT_DIR}/bootstrap/${service}.service" - done - if ! whoami &> /dev/null; then - if [ -w /etc/passwd ]; then - echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd - fi - fi - eval "$(ssh-agent)" - ssh-add /etc/openshift-installer/ssh-privatekey - ssh -A -o PreferredAuthentications=publickey -o StrictHostKeyChecking=false -o UserKnownHostsFile=/dev/null core@${bootstrap_ip} /bin/bash -x /usr/local/bin/installer-gather.sh - scp -o PreferredAuthentications=publickey -o StrictHostKeyChecking=false -o UserKnownHostsFile=/dev/null core@${bootstrap_ip}:log-bundle.tar.gz ${ARTIFACT_DIR}/installer/bootstrap-logs.tar.gz -fi diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-ref.yaml b/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-ref.yaml deleted file mode 100644 index 6c7d30e83eb6..000000000000 --- a/ci-operator/step-registry/ipi/deprovision/artifacts/bootstrap/ipi-deprovision-artifacts-bootstrap-ref.yaml +++ /dev/null @@ -1,10 +0,0 @@ -ref: - as: ipi-deprovision-artifacts-bootstrap - from: stable:cli # TODO(skuznets): need an image with ssh+jq+curl - commands: ipi-deprovision-artifacts-bootstrap-commands.sh - resources: - requests: - cpu: 300m - memory: 300Mi - documentation: |- - The pre-deprivison bootstrap artifacts step collects artifacts from the installer. diff --git a/ci-operator/step-registry/ipi/deprovision/artifacts/ipi-deprovision-artifacts-chain.yaml b/ci-operator/step-registry/ipi/deprovision/artifacts/ipi-deprovision-artifacts-chain.yaml index 8a99172a64c2..6efb27458895 100644 --- a/ci-operator/step-registry/ipi/deprovision/artifacts/ipi-deprovision-artifacts-chain.yaml +++ b/ci-operator/step-registry/ipi/deprovision/artifacts/ipi-deprovision-artifacts-chain.yaml @@ -2,7 +2,6 @@ chain: as: ipi-deprovision-artifacts steps: - ref: ipi-deprovision-artifacts-artifacts - - ref: ipi-deprovision-artifacts-bootstrap - ref: ipi-deprovision-artifacts-must-gather documentation: |- - The IPI deprovision artifacts step chain contains all the individual steps necessary to collect artifacts from a cluster. \ No newline at end of file + The IPI deprovision artifacts step chain contains all the individual steps necessary to collect artifacts from a cluster.