Merge pull request #21 from startechnica/adminer

[adminer] Release v0.1.3
startechnica · Jun 9, 2022 · ea1c9f0 · ea1c9f0
2 parents 2735d76 + 72a77fd
commit ea1c9f0
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 28 deletions.
diff --git a/charts/adminer/Chart.yaml b/charts/adminer/Chart.yaml
@@ -13,7 +13,7 @@ description: Adminer is a full-featured database management tool written in PHP.
   is available for MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, Firebird, SimpleDB,
   Elasticsearch and MongoDB
 home: https://github.com/startechnica/apps/tree/main/charts/adminer
-icon: https://raw.githubusercontent.com/Kong/docker-official-docs/master/adminer/logo.png
+icon: https://www.adminer.org/static/images/logo.png
 keywords:
   - adminer
   - postgres
@@ -31,4 +31,4 @@ name: adminer
 sources:
   - https://www.adminer.org
 type: application
-version: 0.1.2
+version: 0.1.3
diff --git a/charts/adminer/templates/Certificate.yaml b/charts/adminer/templates/Certificate.yaml
@@ -1,5 +1,5 @@
 {{- if .Capabilities.APIVersions.Has "cert-manager.io/v1" }}
-{{- if and .Values.ingress.tls .Values.ingress.certManager.create (not .Values.ingress.selfSigned)}}
+{{- if and .Values.ingress.tls .Values.ingress.certManager.create (not .Values.ingress.selfSigned) }}
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
@@ -44,7 +44,7 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ include "common.names.fullname" . }}
-  namespace: {{ .Values.istio.namespace | quote }}
+  namespace: {{ .Values.istio.ingressNamespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
       {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}

diff --git a/charts/adminer/templates/Deployment.yaml b/charts/adminer/templates/Deployment.yaml
@@ -4,8 +4,9 @@ metadata:
   name: {{ include "common.names.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: adminer
     {{- if .Values.commonLabels }}
-        {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+      {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
@@ -17,16 +18,17 @@ spec:
   template:
     metadata:
       labels: {{- include "common.labels.standard" . | nindent 8 }}
+        app.kubernetes.io/component: adminer
         {{- if .Values.podLabels }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
         {{- end }}
       annotations:
         checksum/secrets: {{ include (print $.Template.BasePath "/Secret.yaml") . | sha256sum }}
         {{- if .Values.podAnnotations }}
-            {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
+          {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
         {{- end }}
     spec:
-      serviceAccountName: {{ .Values.serviceAccountName }}
+      serviceAccountName: {{ include "adminer.serviceAccountName" . }}
       {{- include "adminer.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.hostAliases }}
       hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}

diff --git a/charts/adminer/templates/Secret-tls.yaml b/charts/adminer/templates/Secret-tls.yaml
@@ -46,7 +46,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ printf "%s-tls" .Values.ingress.hostname }}
-  namespace: {{ .Values.istio.namespace | quote }}
+  namespace: {{ .Values.istio.ingressNamespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
       {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}

diff --git a/charts/adminer/templates/Service.yaml b/charts/adminer/templates/Service.yaml
@@ -47,7 +47,7 @@ spec:
   ports:
     - name: http
       port: {{ .Values.service.ports.http }}
-      protocol: UDP
+      protocol: TCP
       targetPort: {{ .Values.containerPorts.http }}
       {{- if (and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (coalesce .Values.service.nodePorts.http .Values.service.nodePort)) }}
       nodePort: {{ coalesce .Values.service.nodePorts.http .Values.service.nodePort }}

diff --git a/charts/adminer/values.yaml b/charts/adminer/values.yaml
@@ -141,6 +141,10 @@ config:
   externalserver: ""
   base_url: ""
 
+## @section Traffic Exposure Parameters
+
+## Adminer service parameters
+##
 service:
   ## @param service.type Adminer Kubernetes service type
   ##
@@ -350,12 +354,12 @@ containerSecurityContext:
   #   memory: 128Mi
 resources:
   limits:
-    cpu: 2000m
+    cpu: 1000m
     memory: 1Gi
   requests:
     cpu: 50m
     memory: 64Mi
-## Configure extra options for FreeRADIUS containers' liveness, readiness and startup probes
+## Configure extra options for Adminer containers' liveness, readiness and startup probes
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes)
 ## @param startupProbe.enabled Enable startupProbe
 ## @param startupProbe.initialDelaySeconds Initial delay seconds for startupProbe
@@ -401,18 +405,18 @@ readinessProbe:
   timeoutSeconds: 1
   failureThreshold: 3
   successThreshold: 1
-## @param customStartupProbe Override default startup probe for FreeRADIUS containers
+## @param customStartupProbe Override default startup probe for Adminer containers
 ##
 customStartupProbe: {}
-## @param customLivenessProbe Override default liveness probe for FreeRADIUS containers
+## @param customLivenessProbe Override default liveness probe for Adminer containers
 ##
 customLivenessProbe: {}
-## @param customReadinessProbe Override default readiness probe for FreeRADIUS containers
+## @param customReadinessProbe Override default readiness probe for Adminer containers
 ##
 customReadinessProbe: {}
-## @param startupWaitOptions Override default builtin startup wait check options for FreeRADIUS containers
+## @param startupWaitOptions Override default builtin startup wait check options for Adminer containers
 ## `bitnami/mariadb` Docker image has built-in startup check mechanism,
-## which periodically checks if FreeRADIUS service has started up and stops it
+## which periodically checks if Adminer service has started up and stops it
 ## if all checks have failed after X tries. Use these to control these checks.
 ## ref: https://github.com/bitnami/bitnami-docker-mariadb/pull/240
 ## Example (with default options):
@@ -421,26 +425,48 @@ customReadinessProbe: {}
 ##   waitTime: 2
 ##
 startupWaitOptions: {}
-## @param extraFlags FreeRADIUS additional command line flags
+## @param extraFlags Adminer additional command line flags
 ## Can be used to specify command line flags, for example:
 ## E.g.
 ## extraFlags: "--max-connect-errors=1000 --max_connections=155"
 ##
 extraFlags: ""
-## @param extraEnvVars Extra environment variables to be set on FreeRADIUS containers
+## @param extraEnvVars Extra environment variables to be set on Adminer containers
 ## E.g.
 ## extraEnvVars:
 ##  - name: TZ
 ##    value: "Europe/Paris"
 ##
 extraEnvVars: []
-## @param extraEnvVarsCM Name of existing ConfigMap containing extra env vars for FreeRADIUS containers
+## @param extraEnvVarsCM Name of existing ConfigMap containing extra env vars for Adminer containers
 ##
 extraEnvVarsCM: ""
-## @param extraEnvVarsSecret Name of existing Secret containing extra env vars for FreeRADIUS containers
+## @param extraEnvVarsSecret Name of existing Secret containing extra env vars for Adminer containers
 ##
 extraEnvVarsSecret: ""
 
+## @param affinity Affinity for Adminer pods assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+## Note: podAffinityPreset, podAntiAffinityPreset, and  nodeAffinityPreset will be ignored when it's set
+##
+affinity: {}
+## @param nodeSelector Node labels for Adminer pods assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+## @param tolerations Tolerations for Adminer pods assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+##
+tolerations: []
+## @param topologySpreadConstraints Topology Spread Constraints for Adminer pods assignment
+## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
+## E.g.
+## topologySpreadConstraints:
+##   - maxSkew: 1
+##     topologyKey: topology.kubernetes.io/zone
+##     whenUnsatisfiable: DoNotSchedule
+##
+topologySpreadConstraints: {}
 
 ## @section RBAC parameter
 #
@@ -481,12 +507,6 @@ rbac:
   ##
   rules: []
 
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
 istio:
   enabled: false
   clusterName: cluster.local
@@ -508,4 +528,4 @@ istio:
     enabled: true
     existingVirtualService: ~
 
-organization: Adminer
+organization: Startechnica