Anubis more services

kubernetes/helm_charts/local/argo-cd/values/preprod/values-argocd-applications.yaml

@@ -157,7 +157,7 @@ applications:
     config:
       namespace: outline
       repoURL: 'https://github.com/opentelekomcloud-infra/system-config.git'
-      targetRevision: 'preprod'
+      targetRevision: 'anubis-more-services'
       path: kubernetes/helm_charts/upstream/outline
       pluginName: argocd-vault-plugin-helm
       pluginEnv: '-f values-preprod.yaml'
@@ -310,7 +310,7 @@ applications:
 ########## KUSTOMIZE APPS ###########
 #####################################
 
-  - name: anubis
+  - name: anubis-cpn
     clusters: [preprod]
     config:
       namespace: circle-partner-navigator
@@ -327,6 +327,40 @@ applications:
         syncOptions:
           - CreateNamespace=true
 
+  - name: anubis-umami
+    clusters: [preprod]
+    config:
+      namespace: analytics
+      repoURL: 'https://github.com/opentelekomcloud-infra/system-config.git'
+      targetRevision: 'anubis-more-services'
+      path: kubernetes/kustomize/anubis/overlays/preprod/umami/
+      pluginName: argocd-vault-plugin-kustomize
+      pluginEnv: '.'
+      project: infra
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
+
+  - name: anubis-outline
+    clusters: [preprod]
+    config:
+      namespace: outline
+      repoURL: 'https://github.com/opentelekomcloud-infra/system-config.git'
+      targetRevision: 'anubis-more-services'
+      path: kubernetes/kustomize/anubis/overlays/preprod/outline/
+      pluginName: argocd-vault-plugin-kustomize
+      pluginEnv: '.'
+      project: infra
+      syncPolicy:
+        automated:
+          prune: true
+          selfHeal: true
+        syncOptions:
+          - CreateNamespace=true
+
   - name: kustomize-backstage-dev
     clusters: [preprod]
     config:
@@ -382,7 +416,7 @@ applications:
     config:
       namespace: analytics
       repoURL: 'https://github.com/opentelekomcloud-infra/system-config.git'
-      targetRevision: 'preprod'
+      targetRevision: 'anubis-more-services'
       path: kubernetes/kustomize/umami/overlays/preprod/
       pluginName: argocd-vault-plugin-kustomize
       pluginEnv: '.'

kubernetes/helm_charts/upstream/outline/values-preprod.yaml

@@ -65,24 +65,24 @@ outline:
     type: ClusterIP
     port: 3000
 
-  # Ingress with TLS
-  ingress:
-    enabled: true
-    className: "nginx"
-    annotations:
-      cert-manager.io/cluster-issuer: letsencrypt-prod
-      nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
-      nginx.ingress.kubernetes.io/proxy-body-size: "50m"
-      nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
-    hosts:
-      - host: outline.eco-preprod.tsi-dev.otc-service.com
-        paths:
-          - path: /
-            pathType: Prefix
-    tls:
-      - secretName: outline-tls
-        hosts:
-          - outline.eco-preprod.tsi-dev.otc-service.com
+  # # Ingress with TLS
+  # ingress:
+  #   enabled: true
+  #   className: "nginx"
+  #   annotations:
+  #     cert-manager.io/cluster-issuer: letsencrypt-prod
+  #     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+  #     nginx.ingress.kubernetes.io/proxy-body-size: "50m"
+  #     nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+  #   hosts:
+  #     - host: outline.eco-preprod.tsi-dev.otc-service.com
+  #       paths:
+  #         - path: /
+  #           pathType: Prefix
+  #   tls:
+  #     - secretName: outline-tls
+  #       hosts:
+  #         - outline.eco-preprod.tsi-dev.otc-service.com
 
   # Resource limits
   resources:

kubernetes/kustomize/anubis/overlays/preprod/outline/kustomization.yaml

@@ -0,0 +1,12 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: outline
+
+resources:
+  - ../../../base
+  - outline-anubis-ingress.yaml
+  - outline-websockets-direct.yaml
+
+patchesStrategicMerge:
+  - patch-target.yaml

kubernetes/kustomize/anubis/overlays/preprod/outline/outline-anubis-ingress.yaml

@@ -0,0 +1,27 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: outline-anubis
+  namespace: outline
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/proxy-body-size: "50m"
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+spec:
+  ingressClassName: nginx
+  tls:
+    - secretName: outline-tls
+      hosts:
+        - outline.eco-preprod.tsi-dev.otc-service.com
+  rules:
+    - host: outline.eco-preprod.tsi-dev.otc-service.com
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: anubis
+                port:
+                  number: 80

kubernetes/kustomize/anubis/overlays/preprod/outline/outline-websockets-direct.yaml

@@ -0,0 +1,28 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: outline-websockets-direct
+  namespace: outline
+  annotations:
+    nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
+    nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: outline.eco-preprod.tsi-dev.otc-service.com
+      http:
+        paths:
+          - path: /realtime
+            pathType: Prefix
+            backend:
+              service:
+                name: outline-wiki-preprod
+                port:
+                  number: 3000
+          - path: /collaboration
+            pathType: Prefix
+            backend:
+              service:
+                name: outline-wiki-preprod
+                port:
+                  number: 3000

kubernetes/kustomize/anubis/overlays/preprod/outline/patch-target.yaml

@@ -0,0 +1,14 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: anubis
+spec:
+  template:
+    spec:
+      containers:
+        - name: anubis
+          env:
+            - name: TARGET
+              value: "http://outline-wiki-preprod:3000"
+            - name: REDIRECT_DOMAINS
+              value: "https://outline.eco-preprod.tsi-dev.otc-service.com"

kubernetes/kustomize/anubis/overlays/preprod/umami/kustomization.yaml

@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: analytics
+
+resources:
+  - ../../../base
+
+patchesStrategicMerge:
+  - patch-target.yaml

kubernetes/kustomize/anubis/overlays/preprod/umami/patch-target.yaml

@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: anubis
+spec:
+  template:
+    spec:
+      containers:
+        - name: anubis
+          env:
+            - name: TARGET
+              value: "http://umami:3000"

kubernetes/kustomize/umami/overlays/preprod/ingress-patch.yaml

@@ -18,9 +18,9 @@ spec:
             pathType: Prefix
             backend:
               service:
-                name: umami
+                name: anubis
                 port:
-                  number: 3000
+                  number: 80
   tls:
     - hosts:
         - analytics.eco-preprod.tsi-dev.otc-service.com