postgresql/values.yaml

@@ -12,8 +12,7 @@ fullnameOverride: ""
 volume: |-
   emptyDir: {}
 
-# if left empty, one will be auto-generated
-postgresPassword: ""
+postgresPassword: "hunter2"
 
 tls:
   enabled: false
@@ -29,6 +28,12 @@ securityContext:
   runAsUser: 70
   runAsGroup: 70
 
+exporter:
+  enabled: true
+  repository: quay.io/prometheuscommunity/postgres-exporter
+  tag: "v0.12.0"
+  resources: {}
+
 resources: {}
 #  limits:
 #    cpu: 500m

powerdns/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: powerdns
 description: Helm Chart for powerdns-Core
 type: application
-version: 1.0.2
-appVersion: "4.7.3"
+version: 1.0.3
+appVersion: "4.7.4"

quassel-search/Chart.yaml

+apiVersion: v2
+name: quassel-search
+description: Helm Chart for quassel-search
+type: application
+version: 1.0.0
+appVersion: "014d624e"

quassel-search/pipeline.yml

+lint-quassel-search:
+  stage: lint
+  rules:
+    - changes:
+        - quassel-search/**/*
+  script:
+    - helm lint quassel-search
+
+release-quassel-search:
+  stage: release
+  needs:
+    - lint-quassel-search
+  rules:
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+      changes:
+        - quassel-search/**/*
+  script:
+    - apk add --no-cache git
+    - helm plugin install https://github.com/chartmuseum/helm-push.git
+    - helm repo add --username gitlab-ci-token --password $CI_JOB_TOKEN repo ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/stable
+    - helm cm-push quassel-search repo

quassel-search/templates/_helpers.tpl

+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "quassel-search-helm.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "quassel-search-helm.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "quassel-search-helm.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "quassel-search-helm.labels" -}}
+helm.sh/chart: {{ include "quassel-search-helm.chart" . }}
+{{ include "quassel-search-helm.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "quassel-search-helm.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "quassel-search-helm.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+
+{{- define "quassel-search-helm.sslPath" -}}
+/certs
+{{- end }}

quassel-search/templates/deployment.yaml

+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "quassel-search-helm.fullname" . }}
+  labels:
+    {{- include "quassel-search-helm.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "quassel-search-helm.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "quassel-search-helm.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      volumes:
+        - name: tmp
+          emptyDir: {}
+        - name: config
+          secret:
+            secretName: {{ include "quassel-search-helm.fullname" . }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          startupProbe:
+            exec:
+              command:
+                - curl
+                - "--fail"
+                - http://127.0.0.1:8080/fpm-ping
+          livenessProbe:
+            exec:
+              command:
+                - curl
+                - "--fail"
+                - http://127.0.0.1:8080/fpm-ping
+          readinessProbe:
+            exec:
+              command:
+                - curl
+                - "--fail"
+                - http://127.0.0.1:8080/fpm-ping
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - mountPath: "/run"
+              name: tmp
+            - mountPath: "/var/www/html/qrs_config.php"
+              name: config
+              subPath: "config.php"
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

actual/templates/ingress.yaml → quassel-search/templates/ingress.yaml

 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "actual-helm.fullname" . }}
+  name: {{ include "quassel-search-helm.fullname" . }}
   labels:
-    {{- include "actual-helm.labels" . | nindent 4 }}
+    {{- include "quassel-search-helm.labels" . | nindent 4 }}
   annotations:
     {{- .Values.ingress.annotations | toYaml | nindent 4 }}
 spec:
@@ -14,7 +14,7 @@ spec:
           - path: "{{ .Values.ingress.path }}"
             backend:
               service:
-                name: {{ include "actual-helm.fullname" . }}
+                name: {{ include "quassel-search-helm.fullname" . }}
                 port:
                   name: http
             pathType: Prefix

quassel-search/templates/secret.yaml

+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "quassel-search-helm.fullname" . }}
+  labels:
+    {{- include "quassel-search-helm.labels" . | nindent 4 }}
+stringData:
+  "config.php": |-
+    <?php
+      define('qrs_db_host', '{{ .Values.config.postgres.hostname }}');
+      define('qrs_db_port', {{ .Values.config.postgres.port }});
+      define('qrs_db_name', '{{ .Values.config.postgres.database }}');
+
+      // Only change this if you know what you are doing
+      define('qrs_db_connector', null);
+
+      define('qrs_db_user', '{{ .Values.config.postgres.username }}');
+      define('qrs_db_pass', '{{ .Values.config.postgres.password }}');
+
+      define('qrs_db_option_tsqueryfunction', "websearchto_tsquery_multilang(:query)");
+      // Timeout in milliseconds
+      define('qrs_db_option_timeout', 5000);
+
+      define('qrs_backend', 'pgsql-smart');
+      define('qrs_enable_ranking', false);
+
+      define('qrs_path_prefix', '{{ .Values.ingress.path }}');
+

quassel-search/templates/service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "quassel-search-helm.fullname" . }}
+  labels:
+    {{- include "quassel-search-helm.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: 80
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "quassel-search-helm.selectorLabels" . | nindent 4 }}

actual/values.yaml → quassel-search/values.yaml

 replicaCount: 1
 
 image:
-  repository: jlongster/actual-server
+  repository: k8r.eu/justjanne/quassel-rest-search
   pullPolicy: IfNotPresent
   tag: ""
 
@@ -9,10 +9,13 @@ imagePullSecrets: [ ]
 nameOverride: ""
 fullnameOverride: ""
 
-syncMode: simple
-
-volume: |-
-  emptyDir: {}
+config:
+  postgres:
+    hostname: "localhost"
+    port: 5432
+    database: "quassel"
+    username: "quassel"
+    password: "hunter2"
 
 service:
   type: ClusterIP
@@ -20,6 +23,7 @@ service:
 ingress:
   host: "example.com"
   path: "/"
+  origins: [ ]
   annotations: { }
 
 podAnnotations: { }
@@ -36,11 +40,11 @@ securityContext:
 
 resources:
   limits:
-    cpu: 500m
-    memory: 512Mi
+    cpu: 200m
+    memory: 128M
   requests:
-    cpu: 10m
-    memory: 64Mi
+    cpu: 50m
+    memory: 64M
 
 nodeSelector: { }