Use repo

This reverts commit 55ffd9497e.

argocd-nginx/overlays/prod/argocd-ingress.yaml

@@ -0,0 +1,27 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: argocd-ingress
+  namespace: argocd
+spec:
+  defaultBackend:
+    service:
+      name: argocd-server
+      port:
+        number: 80
+  ingressClassName: nginx
+  tls:
+    - hosts:
+        - argocd.streams.sunet.se 
+      secretName: tls-secret
+  rules:
+  - host: argocd.streams.sunet.se
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: argocd-server
+            port:
+              number: 80

argocd-nginx/overlays/prod/kustomization.yaml

@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources: [../../base]
+patches:
+  - path: argocd-ingress.yaml

argocd/overlays/prod/argocd-cm.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app.kubernetes.io/instance: argocd
+    app.kubernetes.io/name: argocd-cm
+    app.kubernetes.io/part-of: argocd
+  name: argocd-cm
+  namespace: argocd
+data:
+  resource.customizations: |
+    networking.k8s.io/Ingress:
+        health.lua: |
+          hs = {}
+          hs.status = "Healthy"
+          return hs
+  kustomize.buildOptions: --enable-helm

argocd/overlays/prod/argocd-repo-server-deployment.yaml

@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: repo-server
+    app.kubernetes.io/name: argocd-repo-server
+    app.kubernetes.io/part-of: argocd
+  name: argocd-repo-server
+  namespace: argocd
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: argocd-repo-server
+    spec:
+      containers:
+      - name: argocd-repo-server
+        env:
+        - name: ARGOCD_EXEC_TIMEOUT
+          value: "300s"
+

argocd/overlays/prod/argocd-server-deployment.yaml

@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app.kubernetes.io/component: server
+    app.kubernetes.io/name: argocd-server
+    app.kubernetes.io/part-of: argocd
+  name: argocd-server
+  namespace: argocd
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: argocd-server
+    spec:
+      containers:
+      - args:
+        - /usr/local/bin/argocd-server
+        - --insecure
+        - --redis
+        - "argocd-redis-ha-haproxy:6379"
+        name: argocd-server

argocd/overlays/prod/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base
+patches:
+- path: argocd-server-deployment.yaml
+- path: argocd-repo-server-deployment.yaml
+- path: argocd-cm.yaml

spark/base/kustomization.yaml

@@ -3,6 +3,8 @@ resources:
   - spark-master-controller.yml
   - spark-master-service.yml
   - spark-ui-proxy-controller.yml
+  - spark-ui-proxy-ingress.yml
+  - spark-ui-proxy-service.yml
   - spark-worker-controller.yml
   - spark-cert-issuer.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1

spark/base/spark-ui-proxy-ingress.yml

@@ -0,0 +1,32 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: spark-ui-proxy-ingress
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    # nginx.ingress.kubernetes.io/auth-type: basic
+    # nginx.ingress.kubernetes.io/auth-secret: htpasswd
+    # nginx.ingress.kubernetes.io/auth-realm: Enter your credentials
+    cert-manager.io/issuer: "letsencrypt"
+spec:
+  ingressClassName: nginx
+  defaultBackend:
+    service:
+      name: spark-ui-proxy
+      port:
+        number: 80
+  tls:
+    - hosts: [spark-test.streams.sunet.se]
+      secretName: tls-secret
+  rules:
+    - host: spark-test.streams.sunet.se
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: spark-ui-proxy
+                port:
+                  number: 80

spark/base/spark-ui-proxy-service.yml

@@ -0,0 +1,12 @@
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: spark-ui-proxy
+spec:
+  ports:
+    - port: 80
+      targetPort: 80
+  selector:
+    component: spark-ui-proxy
+  type: LoadBalancer

spark/overlays/test/kustomization.yaml

@@ -11,3 +11,5 @@ helmCharts:
     namespace: spark
 helmGlobals:
   chartHome: ../../base/charts/
+patches:
+  - path: spark-ui-proxy-ingress.yml

spark/overlays/test/spark-ui-proxy-ingress.yml

@@ -0,0 +1,32 @@
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: spark-ui-proxy-ingress
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    # nginx.ingress.kubernetes.io/auth-type: basic
+    # nginx.ingress.kubernetes.io/auth-secret: htpasswd
+    # nginx.ingress.kubernetes.io/auth-realm: Enter your credentials
+    cert-manager.io/issuer: "letsencrypt"
+spec:
+  ingressClassName: nginx
+  defaultBackend:
+    service:
+      name: spark-ui-proxy
+      port:
+        number: 80
+  tls:
+    - hosts: [spark-test.streams.sunet.se]
+      secretName: tls-secret
+  rules:
+    - host: spark-test.streams.sunet.se
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: spark-ui-proxy
+                port:
+                  number: 80