From 77fc8e6347fdedafd844e6078be9f4b1144b62a6 Mon Sep 17 00:00:00 2001 From: Akos Eros Date: Fri, 29 Nov 2024 09:04:21 +0100 Subject: [PATCH] Remove leftovers of the old anomaly-detection These were used by the SeldonDeployment, which we are not using in IE 2.0. --- Makefile | 4 --- charts/datacenter/manuela-tst/values.yaml | 8 ----- charts/datacenter/pipelines/README.md | 1 - .../build-and-test-iot-anomaly-detection.yaml | 29 ------------------- .../templates/configmaps/environment.yaml | 26 ----------------- charts/datacenter/pipelines/values.yaml | 11 ------- .../anomaly-detection-is.yaml | 27 ----------------- charts/factory/manuela-stormshift/values.yaml | 8 ----- tests/interop/test_validate_pipelineruns.py | 1 - 9 files changed, 115 deletions(-) delete mode 100644 charts/datacenter/pipelines/extra/build-and-test-iot-anomaly-detection.yaml delete mode 100644 charts/factory/manuela-stormshift/templates/anomaly-detection/anomaly-detection-is.yaml diff --git a/Makefile b/Makefile index 06b16c841..d57e38821 100644 --- a/Makefile +++ b/Makefile @@ -28,10 +28,6 @@ check-pipeline-resources: ## wait for all seed resources to be present seed: check-pipeline-resources ## run the seed pipeline (build all component, push to all env, no pr) oc create -f charts/datacenter/pipelines/extra/seed-run.yaml -.PHONY: build-and-test-iot-anomaly-detection -build-and-test-iot-anomaly-detection: ## run iot anomaly detection pipeline (build, test, push to manuela-tst-all, pr for prod) - oc create -f charts/datacenter/pipelines/extra/build-and-test-iot-anomaly-detection.yaml - .PHONY: build-and-test-iot-consumer build-and-test-iot-consumer: ## run iot consumer pipeline (build, test, push to manuela-tst-all, pr for prod) oc create -f charts/datacenter/pipelines/extra/build-and-test-iot-consumer.yaml diff --git a/charts/datacenter/manuela-tst/values.yaml b/charts/datacenter/manuela-tst/values.yaml index 1ade04b50..be8d37bd0 100644 --- a/charts/datacenter/manuela-tst/values.yaml +++ b/charts/datacenter/manuela-tst/values.yaml @@ -54,14 +54,6 @@ machine_sensor: tag: 0.4.0 built_tags: [] -iot_anomaly_detection: - bootstrap_image: quay.io/hybridcloudpatterns/iot-anomaly-detection:0.4.0 - bootstrap_tag: 0.4.0 - image_location: image-registry.openshift-image-registry.svc:5000/manuela-tst-all/anomaly-detection - repo_name: iot-anomaly-detection - tag: 0.4.0 - built_tags: [] - iot_consumer: bootstrap_image: quay.io/hybridcloudpatterns/iot-consumer:0.4.0 bootstrap_tag: 0.4.0 diff --git a/charts/datacenter/pipelines/README.md b/charts/datacenter/pipelines/README.md index 29cb8ac5a..088df3980 100644 --- a/charts/datacenter/pipelines/README.md +++ b/charts/datacenter/pipelines/README.md @@ -47,7 +47,6 @@ There are four pipelines: The pipelines expect a set of parameters and workspaces to be in place. To make it easier to create such PipelineRuns, there are a number of OpenShift templates. These templates contain all the required configuration and ensure the PipelineRuns contain the name of the component in question: -- [build-iot-anomaly-detection](templates/build-iot-anomaly-detection.yaml): Start the pipeline for the iot-anomaly-detection component - [build-iot-consumer](templates/build-iot-consumer.yaml): Start the pipeline for the iot-consumer component - [build-iot-frontend](templates/build-iot-frontend.yaml): Start the pipeline for the iot-frontend component - [build-iot-software-sensor](templates/build-iot-software-sensor.yaml): Start the pipeline for the iot-software-sensor component diff --git a/charts/datacenter/pipelines/extra/build-and-test-iot-anomaly-detection.yaml b/charts/datacenter/pipelines/extra/build-and-test-iot-anomaly-detection.yaml deleted file mode 100644 index 98755749e..000000000 --- a/charts/datacenter/pipelines/extra/build-and-test-iot-anomaly-detection.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: tekton.dev/v1beta1 -kind: PipelineRun -metadata: - generateName: build-and-test-run-iot-anomaly-detection- - namespace: manuela-ci - labels: - argocd.argoproj.io/instance: pipelines-industrial-edge-datacenter - tekton.dev/pipeline: build-and-test-iot-anomaly-detection -spec: - pipelineRef: - name: build-and-test-iot-anomaly-detection - serviceAccountName: pipeline - timeout: 1h0m0s - workspaces: - - name: gitrepos - persistentVolumeClaim: - claimName: gitrepos-rwo - - configMap: - name: environment - name: config - - name: argocd-env-secret - secret: - secretName: argocd-env - - name: build-artifacts - persistentVolumeClaim: - claimName: build-artifacts-rwo - - name: github-secret - secret: - secretName: gitea-admin-secret diff --git a/charts/datacenter/pipelines/templates/configmaps/environment.yaml b/charts/datacenter/pipelines/templates/configmaps/environment.yaml index 5d2d02bcf..f2e5fed91 100644 --- a/charts/datacenter/pipelines/templates/configmaps/environment.yaml +++ b/charts/datacenter/pipelines/templates/configmaps/environment.yaml @@ -31,29 +31,3 @@ data: IOT_SWSENSOR_BUILT_TAGS_PATH: {{ .Values.machine_sensor.built_tags_path }} IOT_SWSENSOR_TEST_VALUES_PATH: {{ .Values.machine_sensor.test_values_path }} IOT_SWSENSOR_PROD_VALUES_PATH: {{ .Values.machine_sensor.prod_values_path }} - IOT_ANOMALY_IMAGE: {{ .Values.iot_anomaly_detection.image }} - IOT_ANOMALY_YAML_PATH: {{ .Values.iot_anomaly_detection.yaml_path | quote }} - IOT_ANOMALY_BUILT_TAGS_PATH: {{ .Values.iot_anomaly_detection.built_tags_path }} - IOT_ANOMALY_TEST_VALUES_PATH: {{ .Values.iot_anomaly_detection.test_values_path }} - IOT_ANOMALY_PROD_VALUES_PATH: {{ .Values.iot_anomaly_detection.prod_values_path }} - -# IOT_CONSUMER_IMAGE: iot-consumer -# IOT_CONSUMER_YAML_PATH: 'images(name==messaging).newTag' -# IOT_CONSUMER_TEST_VALUES_PATH: charts/datacenter/manuela-tst/kustomization.yaml -# IOT_CONSUMER_PROD_VALUES_PATH: charts/factory/manuela-stormshift/kustomization.yaml -# IOT_CONSUMER_PROD_IMAGESTREAM_PATH: charts/factory/manuela-stormshift/templates/messaging/messaging-is.yaml -# IOT_FRONTEND_IMAGE: iot-frontend -# IOT_FRONTEND_YAML_PATH: 'images(name==line-dashboard).newTag' -# IOT_FRONTEND_TEST_VALUES_PATH: charts/datacenter/manuela-tst/kustomization.yaml -# IOT_FRONTEND_PROD_VALUES_PATH: charts/factory/manuela-stormshift/kustomization.yaml -# IOT_FRONTEND_PROD_IMAGESTREAM_PATH: charts/factory/manuela-stormshift/templates/line-dashboard/line-dashboard-is.yaml -# IOT_SWSENSOR_IMAGE: iot-software-sensor -# IOT_SWSENSOR_YAML_PATH: 'images(name==machine-sensor).newTag' -# IOT_SWSENSOR_TEST_VALUES_PATH: charts/datacenter/manuela-tst/kustomization.yaml -# IOT_SWSENSOR_PROD_VALUES_PATH: charts/factory/manuela-stormshift/kustomization.yaml -# IOT_SWSENSOR_PROD_IMAGESTREAM_PATH: charts/factory/manuela-stormshift/templates/machine-sensor/machine-sensor-is.yaml -# IOT_ANOMALY_IMAGE: iot-anomaly-detection -# IOT_ANOMALY_YAML_PATH: 'images(name==anomaly-detection).newTag' -# IOT_ANOMALY_TEST_VALUES_PATH: charts/datacenter/manuela-tst/kustomization.yaml -# IOT_ANOMALY_PROD_VALUES_PATH: charts/factory/manuela-stormshift/kustomization.yaml -# IOT_ANOMALY_PROD_IMAGESTREAM_PATH: charts/factory/manuela-stormshift/templates/anomaly-detection/anomaly-detection-is.yaml diff --git a/charts/datacenter/pipelines/values.yaml b/charts/datacenter/pipelines/values.yaml index 72380c73a..5d41cca8d 100644 --- a/charts/datacenter/pipelines/values.yaml +++ b/charts/datacenter/pipelines/values.yaml @@ -52,21 +52,10 @@ machine_sensor: test_values_path: overrides/values-test-imagedata.yaml prod_values_path: overrides/values-prod-imagedata.yaml -iot_anomaly_detection: - image: iot-anomaly-detection - yaml_path: '.iot_anomaly_detection.tag' - built_tags_path: '.iot_anomaly_detection.built_tags' - test_values_path: overrides/values-test-imagedata.yaml - prod_values_path: overrides/values-prod-imagedata.yaml - yq: image: quay.io/hybridcloudpatterns/yq:latest pipeline_components: - - component_name: iot-anomaly-detection - builder_image: quay.io/hybridcloudpatterns/python-38-rhel7 - output_image_name: anomaly-detection - configmap_prefix: IOT_ANOMALY - component_name: iot-consumer builder_image: registry.access.redhat.com/rhscl/nodejs-10-rhel7 output_image_name: messaging diff --git a/charts/factory/manuela-stormshift/templates/anomaly-detection/anomaly-detection-is.yaml b/charts/factory/manuela-stormshift/templates/anomaly-detection/anomaly-detection-is.yaml deleted file mode 100644 index dce211932..000000000 --- a/charts/factory/manuela-stormshift/templates/anomaly-detection/anomaly-detection-is.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: image.openshift.io/v1 -kind: ImageStream -metadata: - labels: - app: anomaly-detection - name: anomaly-detection - namespace: manuela-stormshift-messaging -spec: - lookupPolicy: - local: false - tags: - - name: {{ .Values.iot_anomaly_detection.bootstrap_tag }} - from: - kind: DockerImage - name: {{ .Values.iot_anomaly_detection.bootstrap_image }} - importPolicy: {} - referencePolicy: - type: Local -{{- range .Values.iot_anomaly_detection.built_tags }} - - name: {{ . | quote }} - from: - kind: DockerImage - name: "{{ $.Values.global.imageregistry.hostname }}/{{ $.Values.global.imageregistry.account }}/{{ $.Values.iot_anomaly_detection.repo_name }}:{{ . }}" - importPolicy: {} - referencePolicy: - type: Local -{{- end }} diff --git a/charts/factory/manuela-stormshift/values.yaml b/charts/factory/manuela-stormshift/values.yaml index 006644325..b1651819a 100644 --- a/charts/factory/manuela-stormshift/values.yaml +++ b/charts/factory/manuela-stormshift/values.yaml @@ -56,14 +56,6 @@ machine_sensor: tag: 0.4.0 built_tags: [] -iot_anomaly_detection: - bootstrap_image: quay.io/hybridcloudpatterns/iot-anomaly-detection:0.4.0 - bootstrap_tag: 0.4.0 - image_location: image-registry.openshift-image-registry.svc:5000/manuela-stormshift-messaging/anomaly-detection - repo_name: iot-anomaly-detection - tag: 0.4.0 - built_tags: [] - iot_consumer: bootstrap_image: quay.io/hybridcloudpatterns/iot-consumer:0.4.0 bootstrap_tag: 0.4.0 diff --git a/tests/interop/test_validate_pipelineruns.py b/tests/interop/test_validate_pipelineruns.py index adf8fd932..9d7da8bfd 100644 --- a/tests/interop/test_validate_pipelineruns.py +++ b/tests/interop/test_validate_pipelineruns.py @@ -18,7 +18,6 @@ def test_validate_pipelineruns(openshift_dyn_client): expected_pipelines = [ "seed", - "build-and-test-iot-anomaly-detection", "build-and-test-iot-consumer", "build-and-test-iot-frontend", "build-and-test-iot-software-sensor",