diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml index 5285211c7c..533733dbb6 100644 --- a/playbooks/openshift-apps/openscanhub.yml +++ b/playbooks/openshift-apps/openscanhub.yml @@ -84,18 +84,18 @@ objectname: pvc-var-lib-redis-data - role: openshift/object app: openscanhub - file: deployment-redis-6-c9s.yml - objectname: deployment-redis-6-c9s + file: deployment-redis.yml + objectname: deployment-redis when: env == "staging" - role: openshift/object app: openscanhub - file: route-redis-6-c9s.yml - objectname: route-redis-6-c9s + file: route-redis.yml + objectname: route-redis when: env == "staging" - role: openshift/object app: openscanhub - file: service-redis-6-c9s.yml - objectname: service-redis-6-c9s + file: service-redis.yml + objectname: service-redis when: env == "staging" # Configurations for resalloc-server. diff --git a/roles/openshift-apps/openscanhub/files/deployment-redis-6-c9s.yml b/roles/openshift-apps/openscanhub/files/deployment-redis.yml similarity index 79% rename from roles/openshift-apps/openscanhub/files/deployment-redis-6-c9s.yml rename to roles/openshift-apps/openscanhub/files/deployment-redis.yml index fb399a27c7..ed0c0adf04 100644 --- a/roles/openshift-apps/openscanhub/files/deployment-redis-6-c9s.yml +++ b/roles/openshift-apps/openscanhub/files/deployment-redis.yml @@ -5,18 +5,18 @@ metadata: alpha.image.policy.openshift.io/resolve-names: '*' app.openshift.io/route-disabled: "false" deployment.kubernetes.io/revision: "1" - image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"redis-6-c9s:c9s","namespace":"openscanhub"},"fieldPath":"spec.template.spec.containers[?(@.name==\"redis-6-c9s\")].image","pause":"false"}]' + image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"redis:c9s","namespace":"openscanhub"},"fieldPath":"spec.template.spec.containers[?(@.name==\"redis\")].image","pause":"false"}]' openshift.io/generated-by: OpenShiftWebConsole creationTimestamp: "2024-03-07T13:22:42Z" generation: 1 labels: - app: redis-6-c9s - app.kubernetes.io/component: redis-6-c9s - app.kubernetes.io/instance: redis-6-c9s - app.kubernetes.io/name: redis-6-c9s + app: redis + app.kubernetes.io/component: redis + app.kubernetes.io/instance: redis + app.kubernetes.io/name: redis app.kubernetes.io/part-of: openscanhub app.openshift.io/runtime-namespace: openscanhub - name: redis-6-c9s + name: redis namespace: openscanhub resourceVersion: "772873714" uid: 1cb2c91a-fa3d-4d27-8911-d66254fb9881 @@ -26,7 +26,7 @@ spec: revisionHistoryLimit: 10 selector: matchLabels: - app: redis-6-c9s + app: redis strategy: rollingUpdate: maxSurge: 25% @@ -38,13 +38,13 @@ spec: openshift.io/generated-by: OpenShiftWebConsole creationTimestamp: null labels: - app: redis-6-c9s - deployment: redis-6-c9s + app: redis + deployment: redis spec: containers: - image: quay.io/sclorg/redis-6-c9s:c9s imagePullPolicy: IfNotPresent - name: redis-6-c9s + name: redis ports: - containerPort: 6379 protocol: TCP diff --git a/roles/openshift-apps/openscanhub/files/route-redis-6-c9s.yml b/roles/openshift-apps/openscanhub/files/route-redis.yml similarity index 71% rename from roles/openshift-apps/openscanhub/files/route-redis-6-c9s.yml rename to roles/openshift-apps/openscanhub/files/route-redis.yml index e501203018..7100e379fc 100644 --- a/roles/openshift-apps/openscanhub/files/route-redis-6-c9s.yml +++ b/roles/openshift-apps/openscanhub/files/route-redis.yml @@ -3,13 +3,13 @@ kind: Route metadata: creationTimestamp: "2024-03-07T13:22:42Z" labels: - app: redis-6-c9s - app.kubernetes.io/component: redis-6-c9s - app.kubernetes.io/instance: redis-6-c9s - app.kubernetes.io/name: redis-6-c9s + app: redis + app.kubernetes.io/component: redis + app.kubernetes.io/instance: redis + app.kubernetes.io/name: redis app.kubernetes.io/part-of: openscanhub app.openshift.io/runtime-version: c9s - name: redis-6-c9s + name: redis namespace: openscanhub resourceVersion: "772873091" uid: acfbf57f-c945-44f9-86a8-a7726955f37b @@ -22,6 +22,6 @@ spec: termination: edge to: kind: Service - name: redis-6-c9s + name: redis weight: 100 wildcardPolicy: None diff --git a/roles/openshift-apps/openscanhub/files/service-redis-6-c9s.yml b/roles/openshift-apps/openscanhub/files/service-redis.yml similarity index 74% rename from roles/openshift-apps/openscanhub/files/service-redis-6-c9s.yml rename to roles/openshift-apps/openscanhub/files/service-redis.yml index f1c27bd1a3..e3862f14d4 100644 --- a/roles/openshift-apps/openscanhub/files/service-redis-6-c9s.yml +++ b/roles/openshift-apps/openscanhub/files/service-redis.yml @@ -5,13 +5,13 @@ metadata: openshift.io/generated-by: OpenShiftWebConsole creationTimestamp: "2024-03-07T13:22:42Z" labels: - app: redis-6-c9s - app.kubernetes.io/component: redis-6-c9s - app.kubernetes.io/instance: redis-6-c9s - app.kubernetes.io/name: redis-6-c9s + app: redis + app.kubernetes.io/component: redis + app.kubernetes.io/instance: redis + app.kubernetes.io/name: redis app.kubernetes.io/part-of: openscanhub app.openshift.io/runtime-version: c9s - name: redis-6-c9s + name: redis namespace: openscanhub resourceVersion: "772873089" uid: c72c04f9-939d-417d-867e-e29dea2afbfa @@ -29,7 +29,7 @@ spec: protocol: TCP targetPort: 6379 selector: - app: redis-6-c9s - deployment: redis-6-c9s + app: redis + deployment: redis sessionAffinity: None type: ClusterIP