Ingresses update

cyberchef/templates/ingress.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "cyberchef.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -31,6 +31,7 @@ spec:
       http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: Prefix
             backend:
               serviceName: {{ $fullName }}
               servicePort: http

devopsworks-website/templates/ingress.yaml

@@ -1,11 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "devopsworks-website.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -33,6 +29,7 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ . }}
+            pathType: Prefix
             backend:
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}

echoip/templates/ingress.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "echoip.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -31,6 +31,7 @@ spec:
       http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: Prefix
             backend:
               serviceName: {{ $fullName }}
               servicePort: http

phpsecscan/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: phpsecscan
 description: A Helm chart to deploy phpsecscan in Kubernetes
 type: application
-version: 0.0.9
-appVersion: "0.0.9"
+version: 0.0.14
+appVersion: "0.0.14"
 home: https://github.com/devops-works/phpsecscan
 sources:
   - https://github.com/devops-works/phpsecscan

phpsecscan/templates/deployment.yaml

@@ -1,35 +1,38 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-    annotations:
-      {{ toYaml .Values.deployment.annotations }}
-    name: {{ include "phpsecscan.fullname" . }}
-    labels:
-        {{- include "phpsecscan.labels" . | nindent 8 }}
+  name: {{ include "phpsecscan.fullname" . }}
+  labels:
+    {{- include "phpsecscan.labels" . | nindent 8 }}
+{{- with .Values.deployment.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
-    replicas: {{ .Values.replicaCount }}
-    selector:
-        matchLabels:
-          {{- include "phpsecscan.labels" . | nindent 10 }}
-    template:
-        metadata:
-            labels:
-                app: {{ include "phpsecscan.fullname" . }}
-        spec:
-            containers:
-                - name: {{ include "phpsecscan.fullname" . }}
-                  image: {{ .Values.container.image }}
-                  args: ["-port", "{{ .Values.container.port }}"]
-                  imagePullPolicy: {{ .Values.container.imagePullPolicy }}
-                  resources:
-{{ toYaml .Values.resources | indent 20 }}
-                  livenessProbe:
-                      httpGet:
-                          path: {{ .Values.liveness.path }}
-                          port: {{ .Values.container.port }}
-                      initialDelaySeconds: {{ .Values.liveness.initialDelay }}
-                      periodSeconds: {{ .Values.liveness.period }}
-                  ports:
-                      - name: "http"
-                        containerPort: {{ .Values.container.port }}
-
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "phpsecscan.labels" . | nindent 10 }}
+  template:
+    metadata:
+      labels:
+        {{- include "phpsecscan.labels" . | nindent 10 }}
+    spec:
+      containers:
+        - name: {{ include "phpsecscan.fullname" . }}
+          image: {{ .Values.container.image }}
+          args: ["-port", "{{ .Values.container.port }}", "-logformat", "json"]
+          imagePullPolicy: {{ .Values.container.imagePullPolicy }}
+          ports:
+            - name: "http"
+              containerPort: {{ .Values.container.port }}
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.liveness.path }}
+              port: {{ .Values.container.port }}
+            initialDelaySeconds: {{ .Values.liveness.initialDelay }}
+            periodSeconds: {{ .Values.liveness.period }}
+          resources:
+{{ toYaml .Values.resources | indent 12 }}

phpsecscan/templates/ingress.yaml

@@ -29,6 +29,7 @@ spec:
       http:
         paths:
           - path: {{ $ingressPath }}
+            pathType: Prefix
             backend:
               service:
                 name: {{ $fullName }}

phpsecscan/values.yaml

@@ -1,27 +1,31 @@
 name: phpsecscan
+
 replicaCount: 1
+
 liveness:
   period: 3
   path: /status
-  initialDelay: 0
+  initialDelay: 120
+
 container:
-  image: devopsworks/phpsecscan:v0.0.9
+  image: devopsworks/phpsecscan:v0.0.14
   imagePullPolicy: Always
   port: 8000
+
 resources:
   requests:
-    memory: "100Mi"
-    cpu: "200m"
+    memory: "180Mi"
+    cpu: "50m"
   limits:
-    memory: "150Mi"
-    cpu: "375m"
+    memory: "260Mi"
+    cpu: "150m"
 
 nameOverride: ""
 fullnameOverride: ""
 
-podMonitor: 
-    enabled: false
-    path: /metrics
+podMonitor:
+  enabled: false
+  path: /metrics
 
 service:
   type: ClusterIP