Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove leftovers of the old anomaly-detection #319

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions charts/datacenter/manuela-tst/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion charts/datacenter/pipelines/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

This file was deleted.

26 changes: 0 additions & 26 deletions charts/datacenter/pipelines/templates/configmaps/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 0 additions & 11 deletions charts/datacenter/pipelines/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

This file was deleted.

8 changes: 0 additions & 8 deletions charts/factory/manuela-stormshift/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/interop/test_validate_pipelineruns.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down