Merge remote-tracking branch 'gerrit/master'
Change-Id: If8fa36a6a409e6c1e6191111d3ef626ed4595dce
diff --git a/foswiki/Dockerfile b/foswiki/Dockerfile
new file mode 100644
index 0000000..f654de5
--- /dev/null
+++ b/foswiki/Dockerfile
@@ -0,0 +1 @@
+FROM docker.io/timlegge/docker-foswiki:v1.29
diff --git a/foswiki/foswiki.yaml b/foswiki/foswiki.yaml
new file mode 100644
index 0000000..ae42ce3
--- /dev/null
+++ b/foswiki/foswiki.yaml
@@ -0,0 +1,114 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: foswiki
+ namespace: mulk
+ labels:
+ name: foswiki
+ k8s-app: foswiki
+spec:
+ selector:
+ name: foswiki
+ type: ClusterIP
+ ports:
+ - name: http
+ port: 80
+ targetPort: http
+ protocol: TCP
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ name: foswiki
+ namespace: mulk
+ labels:
+ name: foswiki
+ k8s-app: foswiki
+ annotations:
+ ingress.kubernetes.io/ssl-proxy-headers: X-Forwarded-Proto:https
+ ingress.kubernetes.io/custom-request-headers: X-Forwarded-Proto:https||X-Forwarded-Port:443
+ kubernetes.io/ingress.class: nginx
+ cert-manager.io/cluster-issuer: letsencrypt-prod
+spec:
+ rules:
+ - host: foswiki.benkard.de
+ http:
+ paths:
+ - path: /
+ pathType: ImplementationSpecific
+ backend:
+ service:
+ name: foswiki
+ port:
+ name: http
+ tls:
+ - hosts:
+ - foswiki.benkard.de
+ secretName: foswiki-tls
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: foswiki
+ namespace: mulk
+ labels:
+ name: foswiki
+ k8s-app: foswiki
+spec:
+ replicas: 1
+ strategy:
+ type: Recreate
+ selector:
+ matchLabels:
+ k8s-app: foswiki
+ name: foswiki
+ template:
+ metadata:
+ labels:
+ name: foswiki
+ k8s-app: foswiki
+ spec:
+ imagePullSecrets:
+ - name: portus-token
+ volumes:
+ - name: data
+ persistentVolumeClaim:
+ claimName: foswiki-data
+ containers:
+ - name: master
+ image: docker.benkard.de/mulk/foswiki:1.29-1
+ imagePullPolicy: IfNotPresent
+ resources:
+ limits:
+ cpu: 2000m
+ memory: 2000Mi
+ requests:
+ cpu: 10m
+ memory: 300Mi
+ volumeMounts:
+ - name: data
+ mountPath: /var/www/foswiki
+ ports:
+ - containerPort: 80
+ name: http
+ protocol: TCP
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ name: foswiki-data
+ namespace: mulk
+ labels:
+ name: foswiki-data
+ k8s-app: foswiki
+ annotations:
+ volume.beta.kubernetes.io/storage-provisioner: rancher.io/local-path
+spec:
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 50Gi
+ storageClassName: local-path
+---
diff --git a/gitlab-system/gitlab.yaml b/gitlab-system/gitlab.yaml
index 4b934fc..82e4012 100644
--- a/gitlab-system/gitlab.yaml
+++ b/gitlab-system/gitlab.yaml
@@ -5,7 +5,7 @@
namespace: gitlab-system
spec:
chart:
- version: "6.10.2"
+ version: "6.11.2"
values:
global:
appConfig: