merge master into Lumi

helm/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

helm/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v2
+name: helm
+description: Deploys docs-preview in Kubernetes
+type: application
+version: 0.2.0
+appVersion: "1.2.0"

helm/README.md

@@ -0,0 +1,30 @@
+# Helm chart to deploy `docs-preview`
+
+> Original repository is <https://github.com/cscfi/docs-preview>
+
+This chart deploys docs-preview, which will clone a given repository (by default <https://github.com/cscfi/csc-user-guide>),
+and build every single branch in the repository. The branches will be available via a web interface. It also offers a API that understands
+GitHub hooks and rebuilds the given branch by the hook.
+
+## Parameters
+
+* `values.yaml`:
+```yaml
+git:
+  source: https://github.com/cscfi/docs-preview
+  docs: https://github.com/cscfi/csc-user-guide
+secret:
+
+host: csc-guide-preview.rahtiapp.fi
+
+replicas: 1
+```
+
+|Key|Description|Default|
+|:-:|:-:|:-:|
+|git.source|The source (including `app.py`) to deploy|https://github.com/cscfi/docs-preview|
+|git.docs|The repository hosting the documentation to build|https://github.com/cscfi/csc-user-guide|
+|secret|Secret to be used in the web-hook|<empty>|
+|host|URL to deploy the public web interface|`csc-guide-review.rahtiapp.fi`|
+|replicas|Number of replicas for the Pod|1|
+

helm/templates/csc-guide-preview-hook-route.yaml

@@ -0,0 +1,17 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: docs-preview-build-hook
+spec:
+  host: {{ .Release.Namespace }}-hook.2.rahtiapp.fi
+  port:
+    targetPort: 8081
+  tls:
+    insecureEdgeTerminationPolicy: Redirect
+    termination: edge
+  to:
+    kind: Service
+    name: docs-preview-hook
+    weight: 100
+  wildcardPolicy: None
+status: {}

helm/templates/csc-guide-preview-route.yaml

@@ -0,0 +1,19 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  labels:
+    app: docs-preview
+  name: docs-preview-route
+spec:
+  host: {{ .Values.host }}
+  port:
+    targetPort: 8080-tcp
+  tls:
+    insecureEdgeTerminationPolicy: Redirect
+    termination: edge
+  to:
+    kind: Service
+    name: docs-preview
+    weight: 100
+  wildcardPolicy: None
+status: {}

helm/templates/docs-preview-build.yaml

@@ -0,0 +1,30 @@
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  labels:
+    app: docs-preview
+  name: docs-preview
+spec:
+  failedBuildsHistoryLimit: 2
+  output:
+    to:
+      kind: ImageStreamTag
+      name: docs-preview:latest
+  postCommit: {}
+  resources: {}
+  runPolicy: Serial
+  source:
+    git:
+      uri: {{ .Values.git.source }}
+    type: Git
+  strategy:
+    sourceStrategy:
+      from:
+        kind: DockerImage
+        name: registry.fedoraproject.org/f33/python3
+    type: Source
+  successfulBuildsHistoryLimit: 1
+  triggers:
+  - type: ImageChange
+  - type: ConfigChange
+status: {}

helm/templates/docs-preview-deploy.yaml

@@ -0,0 +1,87 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"docs-preview:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"docs-preview\")].image"}]'
+  labels:
+    app: docs-preview
+  name: docs-preview
+spec:
+  progressDeadlineSeconds: 600
+  replicas: {{ .Values.replicas }}
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      deployment: docs-preview
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        deployment: docs-preview
+    spec:
+      containers:
+      - image: bitnami/nginx:1.16-centos-7
+        imagePullPolicy: IfNotPresent
+        name: web-server
+        ports:
+        - containerPort: 8080
+          protocol: TCP
+        resources:
+          limits:
+            cpu: "1"
+            memory: 1G
+          requests:
+            cpu: 200m
+            memory: 200M
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /app
+          name: content-vol
+        - mountPath: /opt/bitnami/nginx/conf/server_blocks
+          name: nginx-conf
+      - env:
+        - name: BUILDSECRET
+          value: {{ .Values.secret }}
+        - name: BUILDROOT
+          value: /builds
+        - name: WORKPATH
+          value: /work
+        - name: REMOTEURL
+          value: {{ .Values.git.docs }}
+        image: ' ' # image-registry.openshift-image-registry.svc:5000/{{ .Release.Namespace }}/docs-preview:latest
+        imagePullPolicy: IfNotPresent
+        name: docs-preview
+        ports:
+        - containerPort: 8081
+          protocol: TCP
+        resources:
+          limits:
+            cpu: "1"
+            memory: 1G
+          requests:
+            cpu: 200m
+            memory: 200M
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /builds
+          name: content-vol
+        - mountPath: /work
+          name: workpath
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - emptyDir: {}
+        name: content-vol
+      - emptyDir: {}
+        name: workpath
+      - configMap:
+          defaultMode: 420
+          name: nginx-config
+        name: nginx-conf
+status: {}

helm/templates/docs-preview-hook-service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: docs-preview-hook
+spec:
+  internalTrafficPolicy: Cluster
+  ipFamilies:
+  - IPv4
+  ipFamilyPolicy: SingleStack
+  ports:
+  - port: 8081
+    protocol: TCP
+    targetPort: 8081
+  selector:
+    deployment: docs-preview
+  sessionAffinity: None
+  type: ClusterIP
+status:
+  loadBalancer: {}

helm/templates/docs-preview-is.yaml

@@ -0,0 +1,5 @@
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: docs-preview
+status: {}

helm/templates/docs-preview-service.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: docs-preview
+  name: docs-preview
+spec:
+  internalTrafficPolicy: Cluster
+  ipFamilies:
+  - IPv4
+  ipFamilyPolicy: SingleStack
+  ports:
+  - name: 8080-tcp
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    deployment: docs-preview
+  sessionAffinity: None
+  type: ClusterIP
+status:
+  loadBalancer: {}

helm/templates/nginx-conf-configmap.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+data:
+  my_server_block.conf: |
+    server {
+      listen 8080;
+      location / {
+        root /app;
+        index index.html;
+        autoindex on;
+      }
+      #rewrite ^/(.*[^/])$ $scheme://$http_host/$1/ permanent;
+      port_in_redirect off;
+    }
+kind: ConfigMap
+metadata:
+  name: nginx-config

helm/values.yaml

@@ -0,0 +1,8 @@
+git:
+  source: https://github.com/cscfi/docs-preview
+  docs: https://github.com/cscfi/csc-user-guide
+secret:
+
+host: csc-guide-preview.rahtiapp.fi
+
+replicas: 1

requirements.txt

@@ -1,7 +1,7 @@
 # Additional packages for preview
 Flask==2.2.5
 itsdangerous==2.1.2
-werkzeug==3.0.3
+werkzeug==3.0.6
 
 # Packages for building the static pages
 babel==2.16.0
@@ -14,7 +14,7 @@ ghp-import==2.1.0
 gitdb==4.0.11
 GitPython==3.1.43
 idna==3.7
-Jinja2==3.1.4
+Jinja2==3.1.5
 Markdown==3.6
 MarkupSafe==2.1.5
 mergedeep==1.3.4
@@ -42,3 +42,4 @@ six==1.16.0
 smmap==5.0.1
 urllib3==2.2.2
 watchdog==4.0.2
+