fix: 🐛 lot of things

cloud-pi-native · May 9, 2023 · eab1629 · eab1629
1 parent d2a5f8a
commit eab1629
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 22 deletions.
diff --git a/roles/argocd/tasks/main.yaml b/roles/argocd/tasks/main.yaml
@@ -20,13 +20,13 @@
         name: system:openshift:scc:privileged
       subjects:
         - kind: ServiceAccount
-          namespace: argo-system
+          namespace: "{{ ARGOCD_NAMESPACE }}"
           name: argo-argo-cd-argocd-repo-server
         - kind: ServiceAccount
-          namespace: argo-system
+          namespace: "{{ ARGOCD_NAMESPACE }}"
           name: argo-argo-cd-argocd-server
         - kind: ServiceAccount
-          namespace: argo-system
+          namespace: "{{ ARGOCD_NAMESPACE }}"
           name: argo-redis
 
 - name: Add helm repo
@@ -104,13 +104,13 @@
           kind: ConfigMap
           metadata:
             name: argocd-rbac-cm
-            namespace: argo-system
+            namespace: {{ ARGOCD_NAMESPACE }}
 
 - name: Deploy helm
   kubernetes.core.helm:
     name: argo
     chart_ref: bitnami/argo-cd
-    release_namespace: argo-system
+    release_namespace: "{{ ARGOCD_NAMESPACE }}"
     create_namespace: true
     values: "{{ helm_values | from_yaml }}"
 
@@ -133,7 +133,7 @@
         labels:
           argocd.argoproj.io/secret-type: repo-creds
         name: gitlab
-        namespace: argo-system
+        namespace: "{{ ARGOCD_NAMESPACE }}"
       type: Opaque
 
 - name: Install routes

diff --git a/roles/argocd/templates/ingress.yaml.j2 b/roles/argocd/templates/ingress.yaml.j2
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: argo-ingress
-  namespace: argo-system
+  namespace: {{ ARGOCD_NAMESPACE }}
   annotations:
 {% for key, val in ingress.annotations.items() %}
     {{ key }}: {{ val }}

diff --git a/roles/console-dso/tasks/main.yaml b/roles/console-dso/tasks/main.yaml
@@ -21,7 +21,7 @@
 - name: Get old app.yaml
   kubernetes.core.k8s_info:
     kind: Application
-    namespace: argo-system
+    namespace: "{{ ARGOCD_NAMESPACE }}"
     name: console-pi-native
   register: console_app
 

diff --git a/roles/console-dso/templates/app.yaml.j2 b/roles/console-dso/templates/app.yaml.j2
@@ -4,10 +4,10 @@ metadata:
   annotations:
     kubectl.kubernetes.io/last-applied-configuration:
   name: console-pi-native
-  namespace: argo-system
+  namespace: {{ ARGOCD_NAMESPACE }}
 spec:
   destination:
-    namespace: console-pi-system
+    namespace: {{ CONSOLE_NAMESPACE }}
     server: https://kubernetes.default.svc
   project: console-pi-native
   source: 

diff --git a/roles/console-dso/templates/project.j2 b/roles/console-dso/templates/project.j2
@@ -2,14 +2,14 @@ apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
   name: console-pi-native
-  namespace: argo-system
+  namespace: {{ ARGOCD_NAMESPACE }}
 spec:
   clusterResourceWhitelist:
   - group: '*'
     kind: '*'
   destinations:
   - name: '*'
-    namespace: "{{ CONSOLE_NAMESPACE }}"
+    namespace: {{ CONSOLE_NAMESPACE }}
     server: '*'
   namespaceResourceWhitelist:
   - group: '*'

diff --git a/roles/keycloak/templates/keycloak-ingress.yaml.j2 b/roles/keycloak/templates/keycloak-ingress.yaml.j2
@@ -7,6 +7,7 @@ metadata:
 {% for key, val in ingress.annotations.items() %}
     {{ key }}: {{ val }}
 {% endfor %}
+    route.openshift.io/termination: reencrypt
   labels:
     app: keycloak
 {% for key, val in ingress.labels.items() %}

diff --git a/roles/sonarqube/templates/postgres-deployment.yaml.j2 b/roles/sonarqube/templates/postgres-deployment.yaml.j2
@@ -4,7 +4,7 @@ metadata:
   labels:
     service: postgres-dso
   name: sonar-postgres-dso
-  namespace: sonar-system
+  namespace: {{ SONAR_NAMESPACE }}
 spec:
   replicas: 1
   selector:

diff --git a/roles/sonarqube/templates/postgres-pv-claim.yaml.j2 b/roles/sonarqube/templates/postgres-pv-claim.yaml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim # Create PVC
 metadata:
-  namespace: sonar-system
+  namespace: {{ SONAR_NAMESPACE }}
   name: postgres-sonar-data-claim # Sets name of PV
 spec:
   accessModes:

diff --git a/roles/sonarqube/templates/postgres-service.yaml.j2 b/roles/sonarqube/templates/postgres-service.yaml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: sonar-system
+  namespace: {{ SONAR_NAMESPACE }}
   name: postgres # Sets service name
   labels:
     app: postgres # Labels and Selectors

diff --git a/roles/sonarqube/templates/sonar-deployment.yaml.j2 b/roles/sonarqube/templates/sonar-deployment.yaml.j2
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  namespace: sonar-system
+  namespace: {{ SONAR_NAMESPACE }}
   name: sonar-dso  # Sets Deployment name
 spec:
   replicas: 1

diff --git a/roles/sonarqube/templates/sonar-ingress.yaml.j2 b/roles/sonarqube/templates/sonar-ingress.yaml.j2
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: sonar-ingress
-  namespace: sonar-system
+  namespace: {{ SONAR_NAMESPACE }}
   annotations:
 {% for key, val in ingress.annotations.items() %}
     {{ key }}: {{ val }}
@@ -16,7 +16,7 @@ spec:
   tls:
     - hosts:
         - {{ SONAR_DOMAIN }}
-      secretName: sonar-system-issuer-account-key
+      secretName: {{ SONAR_NAMESPACE }}-issuer-account-key
 {% endif %}
   rules:
     - host: {{ SONAR_DOMAIN }}

diff --git a/roles/sonarqube/templates/sonar-pv-claim.yaml.j2 b/roles/sonarqube/templates/sonar-pv-claim.yaml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim # Create PVC
 metadata:
-  namespace: sonar-system
+  namespace: {{ SONAR_NAMESPACE }}
   name: sonar-data-claim # Sets name of PV
 spec:
   accessModes:

diff --git a/roles/sonarqube/templates/sonar-service.yaml.j2 b/roles/sonarqube/templates/sonar-service.yaml.j2
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: sonar-system
+  namespace: {{ SONAR_NAMESPACE }}
   name: sonar # Sets service name
   labels:
     app: sonar # Labels and Selectors

diff --git a/roles/vault/templates/ingress.yaml.j2 b/roles/vault/templates/ingress.yaml.j2
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: vault-ingress
-  namespace: vault-system
+  namespace: {{ VAULT_NAMESPACE }}
   annotations:
 {% for key, val in ingress.annotations.items() %}
     {{ key }}: {{ val }}
@@ -17,7 +17,7 @@ spec:
   tls:
     - hosts:
         - {{ VAULT_DOMAIN }}
-      secretName: vault-system-issuer-account-key
+      secretName: vault-issuer-account-key
 {% endif %}
   rules:
     - host: {{ VAULT_DOMAIN }}