Remove ODH from skodjob infra system (#382)

Signed-off-by: David Kornel <[email protected]>
skodjob · Jan 8, 2025 · ddb9fe0 · ddb9fe0
1 parent 9fdfcad
commit ddb9fe0
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 479 deletions.
diff --git a/install/ansible-navigator.yml b/install/ansible-navigator.yml
@@ -11,7 +11,7 @@ ansible-navigator:
         - "--platform linux/amd64"
     environment-variables:
       set:
-        ANSIBLE_RUN_TAGS: 'infra,strimzi-infra,odh'
+        ANSIBLE_RUN_TAGS: 'infra,strimzi-infra'
 
   app: run
   mode: stdout

diff --git a/install/roles/automation-hub/tasks/infra-setup/prepare_access.yaml b/install/roles/automation-hub/tasks/infra-setup/prepare_access.yaml
@@ -106,37 +106,3 @@
     verify_ssl: no
     apply: true
     src: "{{ quay_io_secret_path }}"
-
-- name: "Create ODH data connection secret"
-  kubernetes.core.k8s:
-    state: present
-    kubeconfig: "{{ kubeconfig_path }}/{{ clusterName }}"
-    namespace: "default"
-    apply: true
-    definition:
-      apiVersion: v1
-      kind: Secret
-      type: Opaque
-      metadata:
-        name: "odh-s3-data-connection"
-        annotations:
-          replicator.v1.mittwald.de/replicate-to-matching: "app=open-data-hub"
-          opendatahub.io/connection-type: s3
-          openshift.io/display-name: "{{ bucketname }}"
-        labels:
-          app: open-data-hub
-          project: skodjob
-          opendatahub.io/dashboard: 'true'
-          opendatahub.io/managed: 'true'
-      data:
-        AWS_ACCESS_KEY_ID: "{{ aws_access_key_id | b64encode }}"
-        AWS_SECRET_ACCESS_KEY: "{{ aws_access_key_secret | b64encode }}"
-        AWS_S3_ENDPOINT: "{{ aws_endpoint | b64encode }}"
-        AWS_DEFAULT_REGION: "{{ aws_region | b64encode }}"
-        AWS_S3_BUCKET: "{{ bucketname | b64encode }}"
-  vars:
-    bucketname: "tealc-models"
-  loop:
-    - "worker-03"
-  loop_control:
-    loop_var: clusterName
diff --git a/install/roles/automation-hub/tasks/main.yml b/install/roles/automation-hub/tasks/main.yml
@@ -122,9 +122,6 @@
 - import_tasks: scenario-deployment/tekton/strimzi-tkn-pipelines.yaml
   tags: [tekton-pipelines, strimzi-infra, never]
 
-- import_tasks: scenario-deployment/tekton/odh-tkn-pipelines.yaml
-  tags: [tekton-pipelines, odh, never]
-
 - import_tasks: scenario-deployment/workflows/infra-argo-workflows.yaml
   tags: [workflow, infra, never]
 

diff --git a/install/roles/automation-hub/tasks/scenario-deployment/tekton/odh-tkn-pipelines.yaml b/install/roles/automation-hub/tasks/scenario-deployment/tekton/odh-tkn-pipelines.yaml
diff --git a/install/roles/automation-hub/templates/acm/08-extend-default-metrics-allowlist.yaml.j2 b/install/roles/automation-hub/templates/acm/08-extend-default-metrics-allowlist.yaml.j2
@@ -11,12 +11,12 @@ data:
       - container_cpu_usage_seconds_total
       - container_memory_usage_bytes
     matches:
-      - __name__=~".*(kafka|zookeeper|strimzi|jvm|argo|loki|tealc|thor|strimzi-e2e|odh-e2e).*"
+      - __name__=~".*(kafka|zookeeper|strimzi|jvm|argo|loki|tealc|thor|strimzi-e2e).*"
   uwl_metrics_list.yaml: |
     names: 
       - container_memory_usage_bytes
       - container_cpu_usage_seconds_total
       - process_open_fds
     matches:
-      - __name__=~".*(kafka|zookeeper|strimzi|jvm|argo|loki|debezium|tealc|thor|strimzi-e2e|odh-e2e).*"
+      - __name__=~".*(kafka|zookeeper|strimzi|jvm|argo|loki|debezium|tealc|thor|strimzi-e2e).*"
       - container=~".*(dmt|kafka|strimzi).*"
diff --git a/...es/automation-hub/templates/argo-workflows/workflows/infra/automation-hub-install.yaml.j2 b/...es/automation-hub/templates/argo-workflows/workflows/infra/automation-hub-install.yaml.j2
@@ -39,7 +39,7 @@ spec:
           git clone https://github.com/skodjob/automation-hub.git $CURRENT_DIR
           echo $GIT_CRYPT_SECRET | base64 -d > "$CURRENT_DIR/crypt-key"
           cd $CURRENT_DIR && git crypt unlock crypt-key
-          cd $CURRENT_DIR && ansible-playbook install/automation-hub-play.yaml --tags="infra,strimzi-infra,odh" -v
+          cd $CURRENT_DIR && ansible-playbook install/automation-hub-play.yaml --tags="infra,strimzi-infra" -v
         env:
           - name: GIT_CRYPT_SECRET
             valueFrom:

diff --git a/install/roles/automation-hub/templates/argo/app-project/app-project.yaml b/install/roles/automation-hub/templates/argo/app-project/app-project.yaml
@@ -71,18 +71,3 @@ spec:
       server: '*'
   sourceRepos:
     - '*'
-
----
-apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  name: open-data-hub
-spec:
-  clusterResourceWhitelist:
-    - group: '*'
-      kind: '*'
-  destinations:
-    - namespace: '*'
-      server: '*'
-  sourceRepos:
-    - '*'
diff --git a/...tomation-hub/templates/argo/applications/open-data-hub/open-data-hub-dependencies.yaml.j2 b/...tomation-hub/templates/argo/applications/open-data-hub/open-data-hub-dependencies.yaml.j2
diff --git a/...s/automation-hub/templates/argo/applications/open-data-hub/open-data-hub-operator.yaml.j2 b/...s/automation-hub/templates/argo/applications/open-data-hub/open-data-hub-operator.yaml.j2
diff --git a/.../automation-hub/templates/argo/applications/open-data-hub/open-data-hub-resources.yaml.j2 b/.../automation-hub/templates/argo/applications/open-data-hub/open-data-hub-resources.yaml.j2
diff --git a/...omation-hub/templates/logging/install/cluster-logging/02-cluster-logging-instance.yaml.j2 b/...omation-hub/templates/logging/install/cluster-logging/02-cluster-logging-instance.yaml.j2
@@ -14,9 +14,6 @@ spec:
       - effect: NoSchedule
         key: nodetype
         value: connect
-      - effect: NoSchedule
-        key: nodetype
-        value: odh
       - effect: NoSchedule
         key: nodetype
         value: logging

diff --git a/.../roles/automation-hub/templates/tekton/pipelines/open-data-hub/image-changer-trigger.yaml b/.../roles/automation-hub/templates/tekton/pipelines/open-data-hub/image-changer-trigger.yaml