From 56643ed60bc5b62ee28f8c8cdff8cfb470a1ae94 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Fri, 18 Oct 2024 23:00:36 +0200 Subject: [PATCH] fix(mpp): tag resources Signed-off-by: Matej Focko --- openshift/dashboard.yml.j2 | 6 ++++++ openshift/flower.yml.j2 | 6 ++++++ openshift/nginx.yml.j2 | 6 ++++++ openshift/packit-service-beat.yml.j2 | 6 ++++++ openshift/packit-service-fedmsg.yml.j2 | 6 ++++++ openshift/packit-service.yml.j2 | 6 ++++++ openshift/packit-worker.yml.j2 | 6 ++++++ openshift/postgres.yml.j2 | 6 ++++++ openshift/pushgateway.yml.j2 | 6 ++++++ openshift/redict.yml.j2 | 6 ++++++ openshift/redis-commander.yml.j2 | 6 ++++++ openshift/redis.yml.j2 | 6 ++++++ openshift/tokman.yml.j2 | 6 ++++++ openshift/valkey.yml.j2 | 6 ++++++ playbooks/deploy.yml | 2 ++ playbooks/roles/deploy/defaults/main.yml | 2 ++ playbooks/tasks/set-facts.yml | 14 ++++++++++++++ 17 files changed, 102 insertions(+) diff --git a/openshift/dashboard.yml.j2 b/openshift/dashboard.yml.j2 index 5eada3dc..b9846f03 100644 --- a/openshift/dashboard.yml.j2 +++ b/openshift/dashboard.yml.j2 @@ -10,6 +10,12 @@ metadata: # https://docs.openshift.com/container-platform/4.11/openshift_images/triggering-updates-on-imagestream-changes.html image.openshift.io/triggers: >- [{"from":{"kind":"ImageStreamTag","name":"packit-dashboard:{{ deployment }}"},"fieldPath":"spec.template.spec.containers[?(@.name==\"packit-dashboard\")].image"}] +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/flower.yml.j2 b/openshift/flower.yml.j2 index a1c566bc..a1175a47 100644 --- a/openshift/flower.yml.j2 +++ b/openshift/flower.yml.j2 @@ -6,6 +6,12 @@ kind: Deployment apiVersion: apps/v1 metadata: name: flower +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/nginx.yml.j2 b/openshift/nginx.yml.j2 index 73b3d062..faef227a 100644 --- a/openshift/nginx.yml.j2 +++ b/openshift/nginx.yml.j2 @@ -10,6 +10,12 @@ metadata: # https://docs.openshift.com/container-platform/4.11/openshift_images/triggering-updates-on-imagestream-changes.html image.openshift.io/triggers: >- [{"from":{"kind":"ImageStreamTag","name":"nginx:{{ deployment }}"},"fieldPath":"spec.template.spec.containers[?(@.name==\"nginx\")].image"}] +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/packit-service-beat.yml.j2 b/openshift/packit-service-beat.yml.j2 index cf6eb28a..2057f03f 100644 --- a/openshift/packit-service-beat.yml.j2 +++ b/openshift/packit-service-beat.yml.j2 @@ -10,6 +10,12 @@ metadata: # https://docs.openshift.com/container-platform/4.11/openshift_images/triggering-updates-on-imagestream-changes.html image.openshift.io/triggers: >- [{"from":{"kind":"ImageStreamTag","name":"packit-worker:{{ deployment }}"},"fieldPath":"spec.template.spec.containers[?(@.name==\"packit-service-beat\")].image"}] +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/packit-service-fedmsg.yml.j2 b/openshift/packit-service-fedmsg.yml.j2 index 871dab03..7cdbdb5f 100644 --- a/openshift/packit-service-fedmsg.yml.j2 +++ b/openshift/packit-service-fedmsg.yml.j2 @@ -10,6 +10,12 @@ metadata: # https://docs.openshift.com/container-platform/4.11/openshift_images/triggering-updates-on-imagestream-changes.html image.openshift.io/triggers: >- [{"from":{"kind":"ImageStreamTag","name":"packit-service-fedmsg:{{ deployment }}"},"fieldPath":"spec.template.spec.containers[?(@.name==\"packit-service-fedmsg\")].image"}] +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/packit-service.yml.j2 b/openshift/packit-service.yml.j2 index 9961f22e..ca6fc67e 100644 --- a/openshift/packit-service.yml.j2 +++ b/openshift/packit-service.yml.j2 @@ -10,6 +10,12 @@ metadata: # https://docs.openshift.com/container-platform/4.11/openshift_images/triggering-updates-on-imagestream-changes.html image.openshift.io/triggers: >- [{"from":{"kind":"ImageStreamTag","name":"packit-service:{{ deployment }}"},"fieldPath":"spec.template.spec.containers[?(@.name==\"packit-service\")].image"}] +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/packit-worker.yml.j2 b/openshift/packit-worker.yml.j2 index 3b81ac71..9269e0da 100644 --- a/openshift/packit-worker.yml.j2 +++ b/openshift/packit-worker.yml.j2 @@ -11,6 +11,12 @@ metadata: # https://docs.openshift.com/container-platform/4.11/openshift_images/triggering-updates-on-imagestream-changes.html image.openshift.io/triggers: >- [{"from":{"kind":"ImageStreamTag","name":"packit-worker:{{ deployment }}"},"fieldPath":"spec.template.spec.containers[?(@.name==\"packit-worker\")].image"}] +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/postgres.yml.j2 b/openshift/postgres.yml.j2 index d3a1ddf8..541ef120 100644 --- a/openshift/postgres.yml.j2 +++ b/openshift/postgres.yml.j2 @@ -6,6 +6,12 @@ kind: Deployment apiVersion: apps/v1 metadata: name: postgres-{{ postgres_version }} +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/pushgateway.yml.j2 b/openshift/pushgateway.yml.j2 index 7be20b7c..6bdab578 100644 --- a/openshift/pushgateway.yml.j2 +++ b/openshift/pushgateway.yml.j2 @@ -10,6 +10,12 @@ metadata: # https://docs.openshift.com/container-platform/4.11/openshift_images/triggering-updates-on-imagestream-changes.html image.openshift.io/triggers: >- [{"from":{"kind":"ImageStreamTag","name":"pushgateway:{{ deployment }}"},"fieldPath":"spec.template.spec.containers[?(@.name==\"pushgateway\")].image"}] +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/redict.yml.j2 b/openshift/redict.yml.j2 index 80889f90..4be86ecb 100644 --- a/openshift/redict.yml.j2 +++ b/openshift/redict.yml.j2 @@ -6,6 +6,12 @@ kind: Deployment apiVersion: apps/v1 metadata: name: redict +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/redis-commander.yml.j2 b/openshift/redis-commander.yml.j2 index 608abf20..0274e233 100644 --- a/openshift/redis-commander.yml.j2 +++ b/openshift/redis-commander.yml.j2 @@ -6,6 +6,12 @@ kind: Deployment apiVersion: apps/v1 metadata: name: redis-commander +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/redis.yml.j2 b/openshift/redis.yml.j2 index d459fd90..dfd9c627 100644 --- a/openshift/redis.yml.j2 +++ b/openshift/redis.yml.j2 @@ -6,6 +6,12 @@ kind: Deployment apiVersion: apps/v1 metadata: name: redis +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/tokman.yml.j2 b/openshift/tokman.yml.j2 index a6abe8be..30b26f6c 100644 --- a/openshift/tokman.yml.j2 +++ b/openshift/tokman.yml.j2 @@ -10,6 +10,12 @@ metadata: # https://docs.openshift.com/container-platform/4.11/openshift_images/triggering-updates-on-imagestream-changes.html image.openshift.io/triggers: >- [{"from":{"kind":"ImageStreamTag","name":"tokman:{{ deployment }}"},"fieldPath":"spec.template.spec.containers[?(@.name==\"tokman\")].image"}] +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/openshift/valkey.yml.j2 b/openshift/valkey.yml.j2 index 12e95c22..fc29ca57 100644 --- a/openshift/valkey.yml.j2 +++ b/openshift/valkey.yml.j2 @@ -6,6 +6,12 @@ kind: Deployment apiVersion: apps/v1 metadata: name: valkey +{% if managed_platform %} + labels: + app-code: "{{ appcode }}" + service-phase: "{{ servicephase }}" + cost-center: "{{ costcenter }}" +{% endif %} spec: selector: matchLabels: diff --git a/playbooks/deploy.yml b/playbooks/deploy.yml index 6e427bdc..77007c99 100644 --- a/playbooks/deploy.yml +++ b/playbooks/deploy.yml @@ -65,6 +65,8 @@ memory: "128Mi" cpu: "50m" appcode: PCKT-002 + servicephase: lab + costcenter: "700" registry: 172.30.1.1:5000 registry_user: developer tasks: diff --git a/playbooks/roles/deploy/defaults/main.yml b/playbooks/roles/deploy/defaults/main.yml index 8dc3c11c..0b50bb2b 100644 --- a/playbooks/roles/deploy/defaults/main.yml +++ b/playbooks/roles/deploy/defaults/main.yml @@ -58,5 +58,7 @@ tokman: # noqa: var-naming[no-role-prefix] memory: "128Mi" cpu: "50m" appcode: PCKT-002 # noqa: var-naming[no-role-prefix] +servicephase: lab # noqa: var-naming[no-role-prefix] +costcenter: "700" # noqa: var-naming[no-role-prefix] registry: 172.30.1.1:5000 # noqa: var-naming[no-role-prefix] registry_user: developer # noqa: var-naming[no-role-prefix] diff --git a/playbooks/tasks/set-facts.yml b/playbooks/tasks/set-facts.yml index a66ba25c..25be2915 100644 --- a/playbooks/tasks/set-facts.yml +++ b/playbooks/tasks/set-facts.yml @@ -28,6 +28,20 @@ sandbox_namespace: "{{ service }}-{{ deployment }}-sandbox" when: not managed_platform +- name: Set servicephase + when: managed_platform + tags: + - always + block: + - name: Set servicephase for staging + ansible.builtin.set_fact: + servicephase: preprod + when: deployment == "stg" + - name: Set servicephase for production + ansible.builtin.set_fact: + servicephase: prod + when: deployment == "prod" + - name: Set Redis-like hostname tags: - always