From d04426d6c345dc66763f2e9823eb28f209564978 Mon Sep 17 00:00:00 2001 From: prakhar Date: Wed, 10 Dec 2025 20:06:05 +1100 Subject: [PATCH] Remove demo content from OLS workload - Remove RAG and broken pod variables - Remove demo task execution - Remove RAG configuration from OLSConfig templates - Delete deploy_broken_pod task and template - Focus role on core OLS operator setup only --- roles/ocp4_workload_ols/defaults/main.yaml | 6 --- .../tasks/deploy_broken_pod.yaml | 28 ----------- roles/ocp4_workload_ols/tasks/workload.yaml | 5 -- .../templates/deploy_broken_pod.yaml.j2 | 46 ------------------- .../install_azure_app_sp_olsconfig.yaml.j2 | 4 -- .../templates/install_azure_olsconfig.yaml.j2 | 6 +-- 6 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 roles/ocp4_workload_ols/tasks/deploy_broken_pod.yaml delete mode 100644 roles/ocp4_workload_ols/templates/deploy_broken_pod.yaml.j2 diff --git a/roles/ocp4_workload_ols/defaults/main.yaml b/roles/ocp4_workload_ols/defaults/main.yaml index 1116de6..29600e1 100644 --- a/roles/ocp4_workload_ols/defaults/main.yaml +++ b/roles/ocp4_workload_ols/defaults/main.yaml @@ -50,8 +50,6 @@ ocp4_workload_ols_catalog_snapshot_image_tag: "stable-v0.1.0" ocp4_workload_ai_platform: azure ocp4_workload_ols_introspection_enabled: true -ocp4_workload_ols_enable_rag: false -ocp4_workload_ols_rag_image: 'quay.io/dialvare/acme-byok:latest' # -------------------------------- # Authentication Configuration @@ -105,7 +103,3 @@ ocp4_workload_ols_loglevel: DEBUG # Enable debug output (shows sensitive token information) # Set to true only for troubleshooting ocp4_workload_ols_debug: false - -# Create broken pod for demo/testing purposes -# Set to true only in demo/training environments -ocp4_workload_ols_create_broken_pod: false diff --git a/roles/ocp4_workload_ols/tasks/deploy_broken_pod.yaml b/roles/ocp4_workload_ols/tasks/deploy_broken_pod.yaml deleted file mode 100644 index 29ef107..0000000 --- a/roles/ocp4_workload_ols/tasks/deploy_broken_pod.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -# Create namespace first to avoid race condition -- name: Create broken namespace - kubernetes.core.k8s: - api_version: v1 - kind: Namespace - name: broken - state: present - wait: true - wait_timeout: 60 - -# Wait for default service account to be created in the namespace -- name: Wait for default service account to be created - kubernetes.core.k8s_info: - api_version: v1 - kind: ServiceAccount - name: default - namespace: broken - register: sa_result - until: sa_result.resources | length > 0 - retries: 10 - delay: 3 - -# Deploy the faulty pod after namespace is confirmed created -- name: Deploy broken pod - kubernetes.core.k8s: - template: deploy_broken_pod.yaml.j2 - wait: false diff --git a/roles/ocp4_workload_ols/tasks/workload.yaml b/roles/ocp4_workload_ols/tasks/workload.yaml index 3fa2ea6..d5882a1 100644 --- a/roles/ocp4_workload_ols/tasks/workload.yaml +++ b/roles/ocp4_workload_ols/tasks/workload.yaml @@ -81,8 +81,3 @@ _olsconfig_template: >- {{ 'install_azure_app_sp_olsconfig.yaml.j2' if ocp4_workload_ols_get_token else 'install_' + ocp4_workload_ai_platform + '_olsconfig.yaml.j2' }} - -# Create broken pod for demo/testing purposes -- name: Create broken pod for demo - when: ocp4_workload_ols_create_broken_pod | default(false) - ansible.builtin.include_tasks: deploy_broken_pod.yaml diff --git a/roles/ocp4_workload_ols/templates/deploy_broken_pod.yaml.j2 b/roles/ocp4_workload_ols/templates/deploy_broken_pod.yaml.j2 deleted file mode 100644 index b08b4e4..0000000 --- a/roles/ocp4_workload_ols/templates/deploy_broken_pod.yaml.j2 +++ /dev/null @@ -1,46 +0,0 @@ ---- -apiVersion: v1 -kind: Pod -metadata: - name: broken-pod - namespace: broken -spec: - containers: - - image: quay.io/sclorg/httpd-24-micro-c9s - imagePullPolicy: IfNotPresent - name: broken-container - ports: - - containerPort: 8080 - protocol: TCP - resources: {} - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - runAsNonRoot: true - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsPolicy: ClusterFirst - enableServiceLinks: true - nodeSelector: - node-role.kubernetes.io/wrker: "" - preemptionPolicy: PreemptLowerPriority - priority: 0 - restartPolicy: Always - schedulerName: default-scheduler - securityContext: - seccompProfile: - type: RuntimeDefault - serviceAccount: default - serviceAccountName: default - terminationGracePeriodSeconds: 30 - tolerations: - - effect: NoExecute - key: node.kubernetes.io/not-ready - operator: Exists - tolerationSeconds: 300 - - effect: NoExecute - key: node.kubernetes.io/unreachable - operator: Exists - tolerationSeconds: 300 diff --git a/roles/ocp4_workload_ols/templates/install_azure_app_sp_olsconfig.yaml.j2 b/roles/ocp4_workload_ols/templates/install_azure_app_sp_olsconfig.yaml.j2 index e70ed7a..7c22da7 100644 --- a/roles/ocp4_workload_ols/templates/install_azure_app_sp_olsconfig.yaml.j2 +++ b/roles/ocp4_workload_ols/templates/install_azure_app_sp_olsconfig.yaml.j2 @@ -25,7 +25,3 @@ spec: defaultProvider: "{{ ocp4_workload_ols_defaultprovider }}" logLevel: "{{ ocp4_workload_ols_loglevel }}" introspectionEnabled: {{ ocp4_workload_ols_introspection_enabled | bool }} -{% if ocp4_workload_ols_enable_rag | bool %} - rag: - - image: "{{ ocp4_workload_ols_rag_image }}" -{% endif %} diff --git a/roles/ocp4_workload_ols/templates/install_azure_olsconfig.yaml.j2 b/roles/ocp4_workload_ols/templates/install_azure_olsconfig.yaml.j2 index ad97611..43610dc 100644 --- a/roles/ocp4_workload_ols/templates/install_azure_olsconfig.yaml.j2 +++ b/roles/ocp4_workload_ols/templates/install_azure_olsconfig.yaml.j2 @@ -24,8 +24,4 @@ spec: defaultModel: "{{ ocp4_workload_ols_defaultmodel }}" defaultProvider: "{{ ocp4_workload_ols_defaultprovider }}" logLevel: "{{ ocp4_workload_ols_loglevel }}" - introspectionEnabled: {{ ocp4_workload_ols_introspection_enabled | bool }} -{% if ocp4_workload_ols_enable_rag | bool %} - rag: - - image: "{{ ocp4_workload_ols_rag_image }}" -{% endif %} \ No newline at end of file + introspectionEnabled: {{ ocp4_workload_ols_introspection_enabled | bool }} \ No newline at end of file