From 4ce45324337d5a9295e1b6134b6a226e4c0db61f Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Tue, 6 Aug 2024 13:24:22 +0200 Subject: [PATCH] chore: remove ocp 3.11 provisioning after Cent OS 7 EOL (#1340) --- chart/infra-server/static/flavors.yaml | 71 --------- .../static/workflow-openshift-multi.yaml | 149 ------------------ chart/infra-server/templates/secrets.yaml | 3 - 3 files changed, 223 deletions(-) delete mode 100644 chart/infra-server/static/workflow-openshift-multi.yaml diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index eb326ca58..f03e71eea 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -198,77 +198,6 @@ - name: SSH_ACCESS description: Instructions for obtaining SSH access to instances in your cluster -##################### -# openshift-multi # -##################### -- id: openshift-multi - name: OpenShift 3.11 - description: OpenShift 3.11 cluster - availability: stable - workflow: configuration/workflow-openshift-multi.yaml - aliases: - - openshift-3 - - ocp-3 - parameters: - - name: name - description: cluster name - value: example1 - - - name: crio - description: should CRI-O be used as the container runtime - value: true - kind: optional - - - name: nodes - description: number of worker nodes - value: "2" - kind: optional - - - name: machine-type - description: node machine type - value: e2-standard-4 - kind: optional - - - name: zone - description: Google Cloud zone to deploy infrastructure into. - value: us-east1-d - kind: optional - - - name: install-monitoring - description: Install the OpenShift monitoring stack - help: This is a prometheus/grafana/alertmanager stack. See the logs/artifacts for access info. - value: true - kind: optional - - - name: install-metrics - description: Install metrics - help: For example to get the output of `oc adm top pods` - value: false - kind: optional - - artifacts: - - name: kubeconfig - description: Kube config for connecting to this cluster - - - name: console_url - description: The URL for the openshift console - tags: [url] - - - name: console_password - description: The password for the console admin account - - - name: grafana_url - description: The URL for the grafana instance (if monitoring is enabled) - - - name: prometheus_url - description: The URL for the prometheus instance (if monitoring is enabled) - - - name: SSH_ACCESS - description: Instructions for obtaining SSH access to instances in your cluster - - - name: data - description: An archive with various bits - #################### # openshift-4 # #################### diff --git a/chart/infra-server/static/workflow-openshift-multi.yaml b/chart/infra-server/static/workflow-openshift-multi.yaml deleted file mode 100644 index 3521abef3..000000000 --- a/chart/infra-server/static/workflow-openshift-multi.yaml +++ /dev/null @@ -1,149 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Workflow -metadata: - generateName: openshift-multi- -spec: - entrypoint: start - arguments: - parameters: - - name: name - - name: crio - - name: nodes - - name: machine-type - - name: zone - value: "" - - name: install-monitoring - - name: install-metrics - volumes: - - name: credentials - secret: - secretName: google-credentials-openshift - - templates: - - name: start - steps: - - - name: create - template: create - arguments: - parameters: - - name: name - value: '{{ "{{" }}workflow.parameters.name{{ "}}" }}' - - name: crio - value: '{{ "{{" }}workflow.parameters.crio{{ "}}" }}' - - name: nodes - value: '{{ "{{" }}workflow.parameters.nodes{{ "}}" }}' - - name: machine-type - value: '{{ "{{" }}workflow.parameters.machine-type{{ "}}" }}' - - name: zone - value: '{{ "{{" }}workflow.parameters.zone{{ "}}" }}' - - name: install-monitoring - value: '{{ "{{" }}workflow.parameters.install-monitoring{{ "}}" }}' - - name: install-metrics - value: '{{ "{{" }}workflow.parameters.install-metrics{{ "}}" }}' - - - - name: wait - template: wait - - - name: destroy - template: destroy - arguments: - parameters: - - name: name - value: '{{ "{{" }}workflow.parameters.name{{ "}}" }}' - artifacts: - - name: terraform-destroy-plan - from: '{{ "{{" }}steps.create.outputs.artifacts.terraform-destroy-plan{{ "}}" }}' - - - name: create - activeDeadlineSeconds: 7200 - inputs: - parameters: - - name: name - - name: crio - - name: nodes - - name: machine-type - - name: zone - - name: install-monitoring - - name: install-metrics - outputs: - artifacts: - - name: kubeconfig - path: /well-known/artifacts/config - archive: - none: {} - - name: console_url - path: /well-known/artifacts/console_url - archive: - none: {} - - name: console_password - path: /well-known/artifacts/console_passwd - archive: - none: {} - - name: grafana_url - path: /well-known/artifacts/grafana_url - archive: - none: {} - - name: prometheus_url - path: /well-known/artifacts/prometheus_url - archive: - none: {} - - name: SSH_ACCESS - path: /well-known/artifacts/SSH_ACCESS.md - archive: - none: {} - - name: data - path: /well-known - archive: - tar: {} - # internal use - - name: terraform-destroy-plan - path: /well-known/artifacts/terraform-destroy.tfplan - - container: - # TODO(ROX-25537): Fix build for openshift-multi - image: quay.io/stackrox-io/ci:automation-flavors-openshift-multi-0.10.12 - command: - - /usr/bin/entrypoint - args: - - create - - '--name={{ "{{" }}inputs.parameters.name{{ "}}" }}' - - '--crio={{ "{{" }}inputs.parameters.crio{{ "}}" }}' - - --creation-source=infra - - '--zone={{ "{{" }}inputs.parameters.zone{{ "}}" }}' - - '--nodes={{ "{{" }}inputs.parameters.nodes{{ "}}" }}' - - '--machine-type={{ "{{" }}inputs.parameters.machine-type{{ "}}" }}' - - '--install-metrics={{ "{{" }}inputs.parameters.install-metrics{{ "}}" }}' - - '--install-monitoring={{ "{{" }}inputs.parameters.install-monitoring{{ "}}" }}' - - --gcp-project=acs-team-temp-dev - - --dns-project=acs-team-temp-dev - - --dns-zone=ocp-infra-rox-systems - env: - - name: GOOGLE_CREDENTIALS - valueFrom: - secretKeyRef: - name: openshift-4-gcp-service-account - key: google-credentials.json - - - name: wait - suspend: {} - - - name: destroy - activeDeadlineSeconds: 3600 - inputs: - parameters: - - name: name - artifacts: - - name: terraform-destroy-plan - path: /well-known/artifacts/terraform-destroy.tfplan - container: - # TODO(ROX-25537): Fix build for openshift-multi - image: quay.io/stackrox-io/ci:automation-flavors-openshift-multi-0.10.12 - command: - - /usr/bin/entrypoint - args: - - destroy - env: - - name: GOOGLE_CREDENTIALS - valueFrom: - secretKeyRef: - name: openshift-4-gcp-service-account - key: google-credentials.json diff --git a/chart/infra-server/templates/secrets.yaml b/chart/infra-server/templates/secrets.yaml index a9bb58ef3..9fc6da501 100644 --- a/chart/infra-server/templates/secrets.yaml +++ b/chart/infra-server/templates/secrets.yaml @@ -40,9 +40,6 @@ data: workflow-qa-demo.yaml: |- {{- tpl (.Files.Get "static/workflow-qa-demo.yaml" ) . | b64enc | nindent 4 }} - workflow-openshift-multi.yaml: |- - {{- tpl (.Files.Get "static/workflow-openshift-multi.yaml" ) . | b64enc | nindent 4 }} - workflow-openshift-4.yaml: |- {{- tpl (.Files.Get "static/workflow-openshift-4.yaml" ) . | b64enc | nindent 4 }}