Merge pull request #38 from bunkerity/dev

Dev

Author: Anadris

charts/bunkerweb/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.3
+version: 1.0.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.6.4"
+appVersion: "1.6.5"

charts/bunkerweb/templates/_helpers.tpl

@@ -53,8 +53,10 @@ spec:
               {{- if .Values.bunkerweb.hostPorts }}
               hostPort: 443
               {{- end }}
+            {{- if and .Values.bunkerweb.usePrometheusExporter }}
             - containerPort: 9113
               name: metrics
+            {{- end }}
           env:
             # Mandatory for k8s integration
             - name: KUBERNETES_MODE
@@ -76,6 +78,10 @@ spec:
           readinessProbe:
             {{- toYaml . | nindent 12}}
           {{- end }}
+          {{- with .Values.bunkerweb.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
     {{- if .Values.bunkerweb.nodeSelector }}
       {{- with .Values.bunkerweb.nodeSelector }}
       nodeSelector:
@@ -107,4 +113,8 @@ spec:
       topologySpreadConstraints:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.bunkerweb.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}

charts/bunkerweb/templates/bunkerweb-daemonset.yaml

@@ -11,6 +11,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bunkerweb.selectorLabels" . | nindent 6 }}
+      bunkerweb.io/component: "bunkerweb"
   template:
     metadata:
       annotations:
@@ -66,10 +67,14 @@ spec:
             {{- toYaml . | nindent 12}}
           {{- end }}
           ports:
+            - containerPort: 5000
+              name: bwapi
             - containerPort: 8080
             - containerPort: 8443
+            {{- if and .Values.bunkerweb.usePrometheusExporter }}
             - containerPort: 9113
               name: metrics
+            {{- end }}
           env:
             # Mandatory for k8s integration
             - name: KUBERNETES_MODE
@@ -91,6 +96,10 @@ spec:
           readinessProbe:
             {{- toYaml . | nindent 12}}
           {{- end }}
+          {{- with .Values.bunkerweb.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
     {{- if .Values.bunkerweb.nodeSelector }}
       {{- with .Values.bunkerweb.nodeSelector }}
       nodeSelector:
@@ -122,4 +131,8 @@ spec:
       topologySpreadConstraints:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.bunkerweb.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}

charts/bunkerweb/templates/bunkerweb-deployment.yaml

@@ -0,0 +1,37 @@
+{{- if .Values.bunkerweb.hpa.enabled }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "bunkerweb.fullname" . }}-hpa
+  namespace: {{ .Release.Namespace }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: {{ .Values.bunkerweb.hpa.targetKind | default "Deployment" }}
+    {{- if and .Values.bunkerweb.hpa.nameOverride (ne .Values.bunkerweb.hpa.nameOverride "") }}
+    name: {{ .Values.bunkerweb.hpa.nameOverride }}
+    {{- else }}
+    name: {{ include "bunkerweb.fullname" . }}
+    {{- end }}
+  {{- if ne .Values.bunkerweb.hpa.targetKind "DaemonSet" }}
+  minReplicas: {{ .Values.bunkerweb.hpa.minReplicas | default 2 }}
+  maxReplicas: {{ .Values.bunkerweb.hpa.maxReplicas | default 10 }}
+  {{- end }}
+  metrics:
+    {{- if .Values.bunkerweb.hpa.cpu.enabled }}
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.bunkerweb.hpa.cpu.targetAverageUtilization | default 60 }}
+    {{- end }}
+    {{- if .Values.bunkerweb.hpa.memory.enabled }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.bunkerweb.hpa.memory.targetAverageUtilization | default 70 }}
+    {{- end }}
+{{- end }}

charts/bunkerweb/templates/bunkerweb-hpa.yaml

@@ -1,5 +1,5 @@
-{{- $replicaCount := int .Values.bunkerweb.replicaCount }}
-{{- if and .Values.bunkerweb.pdb.create  (gt $replicaCount 1) }}
+{{- $replicas := int .Values.bunkerweb.replicas }}
+{{- if and .Values.bunkerweb.pdb.create  (gt $replicas 1) }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:

charts/bunkerweb/templates/bunkerweb-poddisruptionbudget.yaml

@@ -6,12 +6,20 @@ metadata:
   labels:
     {{- include "bunkerweb.labels" . | nindent 4 }}
 spec:
-  clusterIP: None
   selector:
     bunkerweb.io/component: "bunkerweb"
-
+  {{- if and .Values.bunkerweb.service.headless (ne .Values.bunkerweb.service.headless false) }}
+  clusterIP: None
+  {{- else }}
+  type: ClusterIP
+  ports:
+    - name: bwapi
+      protocol: TCP
+      port: 5000
+      targetPort: 5000
+  {{- end }}
 ---
-
+{{- if .Values.scheduler.usePrometheusExporter -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -28,4 +36,5 @@ spec:
     - name: metrics
       protocol: TCP
       port: 9113
-      targetPort: 9113
+      targetPort: 9113
+{{- end }}

charts/bunkerweb/templates/bunkerweb-service-internal.yaml

@@ -12,6 +12,7 @@ spec:
   selector:
     matchLabels:
       {{- include "bunkerweb.selectorLabels" . | nindent 6 }}
+      bunkerweb.io/component: "bunkerweb"
   template:
     metadata:
       annotations:
@@ -43,8 +44,10 @@ spec:
           ports:
             - containerPort: 8080
             - containerPort: 8443
+            {{- if and .Values.bunkerweb.usePrometheusExporter }}
             - containerPort: 9113
               name: metrics
+            {{- end }}
           env:
             - name: KUBERNETES_MODE
               value: "yes"
@@ -63,6 +66,10 @@ spec:
           readinessProbe:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with .Values.bunkerweb.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -71,4 +78,8 @@ spec:
       topologySpreadConstraints:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.bunkerweb.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}

charts/bunkerweb/templates/bunkerweb-statefulset.yaml

@@ -58,10 +58,6 @@ spec:
               value: "{{ .Values.settings.kubernetes.ingressClass }}"
             - name: KUBERNETES_DOMAIN_NAME
               value: "{{ .Values.settings.kubernetes.domainName }}"
-            - name: BUNKERWEB_NAMESPACE
-              value: "{{ include "bunkerweb.namespace" . }}"
-            - name: BUNKERWEB_SERVICE_NAME
-              value: "{{ include "bunkerweb.fullname" . }}-external"
     {{- if .Values.controller.nodeSelector }}
       {{- with .Values.controller.nodeSelector }}
       nodeSelector:

charts/bunkerweb/templates/controller-deployment.yaml

@@ -0,0 +1,34 @@
+{{- if and .Values.grafana.enabled .Values.grafana.ingress.enabled -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: grafana-{{ include "bunkerweb.fullname" . }}
+  namespace: {{ include "bunkerweb.namespace" . }}
+  labels:
+    {{- include "bunkerweb.labels" . | nindent 4 }}
+  annotations:
+    {{- with .Values.grafana.ingress.annotations }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if .Values.grafana.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.grafana.ingress.ingressClassName }}
+  {{- end}}
+  {{- if .Values.grafana.ingress.tlsSecretName }}
+  tls:
+    - hosts:
+      - {{ .Values.grafana.ingress.serverName }}
+      secretName: {{ .Values.grafana.ingress.tlsSecretName }}
+  {{- end }}
+  rules:
+    - host: {{ .Values.grafana.ingress.serverName }}
+      http:
+        paths:
+          - path: {{ .Values.grafana.ingress.serverPath }}
+            pathType: Prefix
+            backend:
+              service:
+                name: grafana-{{ include "bunkerweb.fullname" . }}
+                port:
+                  number: 3000
+{{- end }}