From 0caf7aaf2a850c92333be48f6fbcf6fd9204d46c Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Jan 13 2025 22:37:32 +0000
Subject: discourse2fedmsg - rename yml templates to .j2


Signed-off-by: Ryan Lerch <rlerch@redhat.com>

---

diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml
index 13579a0..6a7c46e 100644
--- a/playbooks/openshift-apps/discourse2fedmsg.yml
+++ b/playbooks/openshift-apps/discourse2fedmsg.yml
@@ -46,12 +46,12 @@
 
   - role: openshift/object
     object_app: discourse2fedmsg
-    object_template: buildconfig.yml
+    object_template: buildconfig.yml.j2
     object_objectname: buildconfig.yml
 
   - role: openshift/object
     object_app: discourse2fedmsg
-    object_template: configmap.yml
+    object_template: configmap.yml.j2
     object_objectname: configmap.yml
 
   - role: openshift/object
@@ -68,7 +68,7 @@
 
   - role: openshift/object
     object_app: discourse2fedmsg
-    object_template: deploymentconfig.yml
+    object_template: deploymentconfig.yml.j2
     object_objectname: deploymentconfig.yml
 
   # - role: openshift/start-build
diff --git a/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml b/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml
deleted file mode 100644
index dc45453..0000000
--- a/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-apiVersion: build.openshift.io/v1
-kind: BuildConfig
-metadata:
-  name: discourse2fedmsg
-  labels:
-    app: discourse2fedmsg
-    build: discourse2fedmsg
-spec:
-  output:
-    to:
-      kind: ImageStreamTag
-      name: discourse2fedmsg:latest
-  source:
-    type: Git
-    git:
-      uri: https://github.com/fedora-infra/discourse2fedmsg.git
-{% if env == "staging" %}
-      ref: staging
-{% else %}
-      ref: stable
-{% endif %}
-  strategy:
-    type: Source
-    sourceStrategy:
-      from:
-        kind: ImageStreamTag
-        namespace: openshift
-        name: python:3.9-ubi8
-  triggers:
-  - type: ConfigChange
-  - type: ImageChange
-{% if discourse2fedmsg_stg_webhook_secret is defined and env == 'staging' %}
-  - type: GitHub
-    github:
-      secret: "{{ discourse2fedmsg_stg_webhook_secret }}"
-{% endif %}
diff --git a/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml.j2 b/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml.j2
new file mode 100644
index 0000000..dc45453
--- /dev/null
+++ b/roles/openshift-apps/discourse2fedmsg/templates/buildconfig.yml.j2
@@ -0,0 +1,37 @@
+---
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: discourse2fedmsg
+  labels:
+    app: discourse2fedmsg
+    build: discourse2fedmsg
+spec:
+  output:
+    to:
+      kind: ImageStreamTag
+      name: discourse2fedmsg:latest
+  source:
+    type: Git
+    git:
+      uri: https://github.com/fedora-infra/discourse2fedmsg.git
+{% if env == "staging" %}
+      ref: staging
+{% else %}
+      ref: stable
+{% endif %}
+  strategy:
+    type: Source
+    sourceStrategy:
+      from:
+        kind: ImageStreamTag
+        namespace: openshift
+        name: python:3.9-ubi8
+  triggers:
+  - type: ConfigChange
+  - type: ImageChange
+{% if discourse2fedmsg_stg_webhook_secret is defined and env == 'staging' %}
+  - type: GitHub
+    github:
+      secret: "{{ discourse2fedmsg_stg_webhook_secret }}"
+{% endif %}
diff --git a/roles/openshift-apps/discourse2fedmsg/templates/configmap.yml b/roles/openshift-apps/discourse2fedmsg/templates/configmap.yml
deleted file mode 100644
index d86e36e..0000000
--- a/roles/openshift-apps/discourse2fedmsg/templates/configmap.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
----
-apiVersion: v1
-kind: List
-metadata: {}
-items:
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: discourse2fedmsg-config
-    labels:
-      app: discourse2fedmsg
-  data:
-    discourse2fedmsg.cfg: |-
-      {{ load_file('discourse2fedmsg.cfg.py') | indent(6) }}
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: wsgi-script
-    labels:
-      app: discourse2fedmsg
-  data:
-    wsgi.py: |-
-      {{ load_file('wsgi.py') | indent(6) }}
-  __init__.py: ""
-- apiVersion: v1
-  kind: ConfigMap
-  metadata:
-    name: fedora-messaging-config
-    labels:
-      app: discourse2fedmsg
-  data:
-    config.toml: |-
-      {{ load_file('fedora-messaging.toml') | indent(6) }}
diff --git a/roles/openshift-apps/discourse2fedmsg/templates/configmap.yml.j2 b/roles/openshift-apps/discourse2fedmsg/templates/configmap.yml.j2
new file mode 100644
index 0000000..d86e36e
--- /dev/null
+++ b/roles/openshift-apps/discourse2fedmsg/templates/configmap.yml.j2
@@ -0,0 +1,34 @@
+{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
+---
+apiVersion: v1
+kind: List
+metadata: {}
+items:
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    name: discourse2fedmsg-config
+    labels:
+      app: discourse2fedmsg
+  data:
+    discourse2fedmsg.cfg: |-
+      {{ load_file('discourse2fedmsg.cfg.py') | indent(6) }}
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    name: wsgi-script
+    labels:
+      app: discourse2fedmsg
+  data:
+    wsgi.py: |-
+      {{ load_file('wsgi.py') | indent(6) }}
+  __init__.py: ""
+- apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    name: fedora-messaging-config
+    labels:
+      app: discourse2fedmsg
+  data:
+    config.toml: |-
+      {{ load_file('fedora-messaging.toml') | indent(6) }}
diff --git a/roles/openshift-apps/discourse2fedmsg/templates/deploymentconfig.yml b/roles/openshift-apps/discourse2fedmsg/templates/deploymentconfig.yml
deleted file mode 100644
index fd82f72..0000000
--- a/roles/openshift-apps/discourse2fedmsg/templates/deploymentconfig.yml
+++ /dev/null
@@ -1,98 +0,0 @@
----
-apiVersion: apps.openshift.io/v1
-kind: DeploymentConfig
-metadata:
-  labels:
-    app: discourse2fedmsg
-    service: discourse2fedmsg
-  name: discourse2fedmsg
-spec:
-  replicas: 1
-  selector:
-    app: discourse2fedmsg
-    deploymentconfig: discourse2fedmsg
-  strategy:
-    resources: {}
-  template:
-    metadata:
-      labels:
-        app: discourse2fedmsg
-        deploymentconfig: discourse2fedmsg
-    spec:
-      containers:
-      - image: discourse2fedmsg:latest
-        name: discourse2fedmsg
-        env:
-        - name: APP_MODULE
-          value: "deploy.wsgi"
-        - name: FLASK_CONFIG
-          value: "/etc/discourse2fedmsg/discourse2fedmsg.cfg"
-        ports:
-        - containerPort: 8080
-          protocol: TCP
-        volumeMounts:
-        - name: discourse2fedmsg-config-volume
-          mountPath: "/etc/discourse2fedmsg"
-          readOnly: true
-        - name: wsgi-script-volume
-          mountPath: "/opt/app-root/src/deploy"
-          readOnly: true
-        - name: fedora-messaging-config-volume
-          mountPath: "/etc/fedora-messaging"
-          readOnly: true
-        - name: fedora-messaging-ca-volume
-          mountPath: /etc/pki/fedora-messaging/cacert.pem
-          subPath: cacert.pem
-          readOnly: true
-        - name: fedora-messaging-crt-volume
-          mountPath: /etc/pki/fedora-messaging/discourse2fedmsg-cert.pem
-          subPath: discourse2fedmsg-cert.pem
-          readOnly: true
-        - name: fedora-messaging-key-volume
-          mountPath: /etc/pki/fedora-messaging/discourse2fedmsg-key.pem
-          subPath: discourse2fedmsg-key.pem
-          readOnly: true
-        readinessProbe:
-          timeoutSeconds: 10
-          initialDelaySeconds: 5
-          periodSeconds: 60
-          httpGet:
-            path: "/healthz/ready"
-            port: 8080
-        livenessProbe:
-          timeoutSeconds: 10
-          initialDelaySeconds: 3
-          periodSeconds: 60
-          httpGet:
-            path: "/healthz/live"
-            port: 8080
-      volumes:
-      - name: discourse2fedmsg-config-volume
-        configMap:
-          name: discourse2fedmsg-config
-      - name: wsgi-script-volume
-        configMap:
-          name: wsgi-script
-      - name: fedora-messaging-config-volume
-        configMap:
-          name: fedora-messaging-config
-      - name: fedora-messaging-ca-volume
-        secret:
-          secretName: fedora-messaging-ca
-      - name: fedora-messaging-crt-volume
-        secret:
-          secretName: fedora-messaging-crt
-      - name: fedora-messaging-key-volume
-        secret:
-          secretName: fedora-messaging-key
-
-  triggers:
-  - type: ConfigChange
-  - type: ImageChange
-    imageChangeParams:
-      automatic: true
-      containerNames:
-      - discourse2fedmsg
-      from:
-        kind: ImageStreamTag
-        name: discourse2fedmsg:latest
diff --git a/roles/openshift-apps/discourse2fedmsg/templates/deploymentconfig.yml.j2 b/roles/openshift-apps/discourse2fedmsg/templates/deploymentconfig.yml.j2
new file mode 100644
index 0000000..fd82f72
--- /dev/null
+++ b/roles/openshift-apps/discourse2fedmsg/templates/deploymentconfig.yml.j2
@@ -0,0 +1,98 @@
+---
+apiVersion: apps.openshift.io/v1
+kind: DeploymentConfig
+metadata:
+  labels:
+    app: discourse2fedmsg
+    service: discourse2fedmsg
+  name: discourse2fedmsg
+spec:
+  replicas: 1
+  selector:
+    app: discourse2fedmsg
+    deploymentconfig: discourse2fedmsg
+  strategy:
+    resources: {}
+  template:
+    metadata:
+      labels:
+        app: discourse2fedmsg
+        deploymentconfig: discourse2fedmsg
+    spec:
+      containers:
+      - image: discourse2fedmsg:latest
+        name: discourse2fedmsg
+        env:
+        - name: APP_MODULE
+          value: "deploy.wsgi"
+        - name: FLASK_CONFIG
+          value: "/etc/discourse2fedmsg/discourse2fedmsg.cfg"
+        ports:
+        - containerPort: 8080
+          protocol: TCP
+        volumeMounts:
+        - name: discourse2fedmsg-config-volume
+          mountPath: "/etc/discourse2fedmsg"
+          readOnly: true
+        - name: wsgi-script-volume
+          mountPath: "/opt/app-root/src/deploy"
+          readOnly: true
+        - name: fedora-messaging-config-volume
+          mountPath: "/etc/fedora-messaging"
+          readOnly: true
+        - name: fedora-messaging-ca-volume
+          mountPath: /etc/pki/fedora-messaging/cacert.pem
+          subPath: cacert.pem
+          readOnly: true
+        - name: fedora-messaging-crt-volume
+          mountPath: /etc/pki/fedora-messaging/discourse2fedmsg-cert.pem
+          subPath: discourse2fedmsg-cert.pem
+          readOnly: true
+        - name: fedora-messaging-key-volume
+          mountPath: /etc/pki/fedora-messaging/discourse2fedmsg-key.pem
+          subPath: discourse2fedmsg-key.pem
+          readOnly: true
+        readinessProbe:
+          timeoutSeconds: 10
+          initialDelaySeconds: 5
+          periodSeconds: 60
+          httpGet:
+            path: "/healthz/ready"
+            port: 8080
+        livenessProbe:
+          timeoutSeconds: 10
+          initialDelaySeconds: 3
+          periodSeconds: 60
+          httpGet:
+            path: "/healthz/live"
+            port: 8080
+      volumes:
+      - name: discourse2fedmsg-config-volume
+        configMap:
+          name: discourse2fedmsg-config
+      - name: wsgi-script-volume
+        configMap:
+          name: wsgi-script
+      - name: fedora-messaging-config-volume
+        configMap:
+          name: fedora-messaging-config
+      - name: fedora-messaging-ca-volume
+        secret:
+          secretName: fedora-messaging-ca
+      - name: fedora-messaging-crt-volume
+        secret:
+          secretName: fedora-messaging-crt
+      - name: fedora-messaging-key-volume
+        secret:
+          secretName: fedora-messaging-key
+
+  triggers:
+  - type: ConfigChange
+  - type: ImageChange
+    imageChangeParams:
+      automatic: true
+      containerNames:
+      - discourse2fedmsg
+      from:
+        kind: ImageStreamTag
+        name: discourse2fedmsg:latest