Set default/recommended minimal requests/resource limits.

dkorunic · dkorunic · commit e1f51d5b4e7b · 2019-12-20T20:01:10.000+01:00
Rename defaultCertSecret.fullname template to defaultTLSSecret.fullname.
Make defaultTLSSecret into section and make it possible to
enable/disable it, controlling do we pass default-ssl-certificate
controller parameter.

CI: Make sure to log which charts have been detected with changes.
diff --git a/.circleci/install_charts.sh b/.circleci/install_charts.sh
@@ -66,6 +66,8 @@ main() {
     if [[ -z "${changed}" ]]; then
         echo "No chart changes detected"
         return
+    else
+        echo "Detected changes in charts: ${changed}"
     fi
 
     create_kind_cluster
diff --git a/kubernetes-ingress/Chart.yaml b/kubernetes-ingress/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kubernetes-ingress
-version: 0.2.6
+version: 0.3.0
 kubeVersion: ">=1.12.0-0"
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 keywords:
diff --git a/kubernetes-ingress/ci/daemonset-customsecretconfig-values.yaml b/kubernetes-ingress/ci/daemonset-customsecretconfig-values.yaml
@@ -0,0 +1,4 @@
+controller:
+  kind: DaemonSet
+  defaultTLSSecret:
+    secret: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURBakNDQWVxZ0F3SUJBZ0lSQU1QaEZQbnZLeG1HQXRpSVlsM3J2dmd3RFFZSktvWklodmNOQVFFTEJRQXcKSURFZU1Cd0dBMVVFQXhNVmEzVmlaWEp1WlhSbGN5MXBibWR5WlhOekxXTmhNQjRYRFRFNU1USXhPVEl4TWpRdwpNVm9YRFRJd01USXhPREl4TWpRd01Wb3dHREVXTUJRR0ExVUVBeE1OYlhsb1lYQXVaR1ZtWVhWc2REQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFMMzZXcy9PY0VVWHZHMm5KdXNmVzFqbW92SDgKcThzQ01uUWQ1by9rU3dUTVlKUERZUCtYVDUvakc2Rks1RFVLWUpzWklLaCtTSnlsUGI1dTh3eUxuOThJNWx4MwoxVzRHcUhOalJodGthYk5ad3NqTmtPL2JETWxpem13ZndNblBwcWRNeWJERUhkUlZVM2dFYmRqSlRiV3FXakNmCkt4am5PUHZMaFY4WWZibHhYZlpibGlwcTl1VkdhUWpoeVNVNDB4Z25JdUdBclo0WmNQcHhlWHJHY3luMlAweDcKSUh5djNCYTY1WWs2WHo1V0xXS1A4NURjSUQyWk1WRlEvYTNVRUQ4NXdRYXFrMmorSWRUbEQyNXVraFVzVGEzZwo4MldWcjRic1krb0VRRTBkM2o5dzAyQzBraG5zOThTWkZuTmM4Zm03aXNud3BWMDg5R3FYbTVGdmNITUNBd0VBCkFhTS9NRDB3RGdZRFZSMFBBUUgvQkFRREFnV2dNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01CQmdnckJnRUYKQlFjREFqQU1CZ05WSFJNQkFmOEVBakFBTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBN0dmTzlJMVg2Q1d3NApTR0RPdDE4OURkeE4zd1JVeU90NDVWT0xmTE5BeDBBR2ZxOURJYVEyNUR1RG8vZkpCczhtODZIMmd3Njc3SzNZCmpkYm1wa29Qd2ZVR3VoZitKN3hpNzJIeVBvNkp0MWFnTDBiQkZqeTZwcU9xVTExa2Eyekc2WGdZY0J0VVAzUjIKeXJXa2o3aUJiR1Yyc3NtRS9pODkrRk90NXZ3SG0relhZWTRJN0M5L0phWFBLTEVRMllLeWs4SUtNYkpxNXRGRgpVaEd0NnMrR1hWK3RhdXhOY2ZQY1VIUTAxSTJ4M0dRdlpqRUVOWU55VE16Yk8vdGhVU0dMK0hhZU1HS3FFSXBXCjZIdWF6UjQvUjAxUW5FeXd4bXEwSVlFRmYvRG9YUm8zUmZaOEUyVEY2eVZGakUwd3p2dlpVRFlGNSs2djJ4Ty8KYkRvbzdBZEoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
diff --git a/kubernetes-ingress/ci/daemonset-disabledsecretconfig-values.yaml b/kubernetes-ingress/ci/daemonset-disabledsecretconfig-values.yaml
@@ -0,0 +1,4 @@
+controller:
+  kind: DaemonSet
+  defaultTLSSecret:
+    enabled: false
diff --git a/kubernetes-ingress/ci/deployment-customsecretconfig-values.yaml b/kubernetes-ingress/ci/deployment-customsecretconfig-values.yaml
@@ -0,0 +1,3 @@
+controller:
+  defaultTLSSecret:
+    secret: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURBakNDQWVxZ0F3SUJBZ0lSQU1QaEZQbnZLeG1HQXRpSVlsM3J2dmd3RFFZSktvWklodmNOQVFFTEJRQXcKSURFZU1Cd0dBMVVFQXhNVmEzVmlaWEp1WlhSbGN5MXBibWR5WlhOekxXTmhNQjRYRFRFNU1USXhPVEl4TWpRdwpNVm9YRFRJd01USXhPREl4TWpRd01Wb3dHREVXTUJRR0ExVUVBeE1OYlhsb1lYQXVaR1ZtWVhWc2REQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFMMzZXcy9PY0VVWHZHMm5KdXNmVzFqbW92SDgKcThzQ01uUWQ1by9rU3dUTVlKUERZUCtYVDUvakc2Rks1RFVLWUpzWklLaCtTSnlsUGI1dTh3eUxuOThJNWx4MwoxVzRHcUhOalJodGthYk5ad3NqTmtPL2JETWxpem13ZndNblBwcWRNeWJERUhkUlZVM2dFYmRqSlRiV3FXakNmCkt4am5PUHZMaFY4WWZibHhYZlpibGlwcTl1VkdhUWpoeVNVNDB4Z25JdUdBclo0WmNQcHhlWHJHY3luMlAweDcKSUh5djNCYTY1WWs2WHo1V0xXS1A4NURjSUQyWk1WRlEvYTNVRUQ4NXdRYXFrMmorSWRUbEQyNXVraFVzVGEzZwo4MldWcjRic1krb0VRRTBkM2o5dzAyQzBraG5zOThTWkZuTmM4Zm03aXNud3BWMDg5R3FYbTVGdmNITUNBd0VBCkFhTS9NRDB3RGdZRFZSMFBBUUgvQkFRREFnV2dNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01CQmdnckJnRUYKQlFjREFqQU1CZ05WSFJNQkFmOEVBakFBTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBN0dmTzlJMVg2Q1d3NApTR0RPdDE4OURkeE4zd1JVeU90NDVWT0xmTE5BeDBBR2ZxOURJYVEyNUR1RG8vZkpCczhtODZIMmd3Njc3SzNZCmpkYm1wa29Qd2ZVR3VoZitKN3hpNzJIeVBvNkp0MWFnTDBiQkZqeTZwcU9xVTExa2Eyekc2WGdZY0J0VVAzUjIKeXJXa2o3aUJiR1Yyc3NtRS9pODkrRk90NXZ3SG0relhZWTRJN0M5L0phWFBLTEVRMllLeWs4SUtNYkpxNXRGRgpVaEd0NnMrR1hWK3RhdXhOY2ZQY1VIUTAxSTJ4M0dRdlpqRUVOWU55VE16Yk8vdGhVU0dMK0hhZU1HS3FFSXBXCjZIdWF6UjQvUjAxUW5FeXd4bXEwSVlFRmYvRG9YUm8zUmZaOEUyVEY2eVZGakUwd3p2dlpVRFlGNSs2djJ4Ty8KYkRvbzdBZEoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
diff --git a/kubernetes-ingress/ci/deployment-disabledsecretconfig-values.yaml b/kubernetes-ingress/ci/deployment-disabledsecretconfig-values.yaml
@@ -0,0 +1,3 @@
+controller:
+  defaultTLSSecret:
+    enabled: false
diff --git a/kubernetes-ingress/templates/_helpers.tpl b/kubernetes-ingress/templates/_helpers.tpl
@@ -70,6 +70,6 @@ Create a default fully qualified default backend name.
 {{/*
 Create a default fully qualified default cert secret name.
 */}}
-{{- define "kubernetes-ingress.defaultCertSecret.fullname" -}}
+{{- define "kubernetes-ingress.defaultTLSSecret.fullname" -}}
 {{- printf "%s-%s" (include "kubernetes-ingress.fullname" .) "default-cert" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/kubernetes-ingress/templates/controller-daemonset.yaml b/kubernetes-ingress/templates/controller-daemonset.yaml
@@ -37,10 +37,12 @@ spec:
           image: "{{ .Values.controller.image.repository }}:{{ tpl .Values.controller.image.tag . }}"
           imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
           args:
-{{- if .Values.controller.defaultTLSSecret }}
-          - --default-ssl-certificate={{ .Values.controller.defaultTLSSecret }}
+{{- if and .Values.controller.defaultTLSSecret.enabled -}}
+{{- if .Values.controller.defaultTLSSecret.secret }}
+          - --default-ssl-certificate={{ .Values.controller.defaultTLSSecret.secret }}
 {{- else }}
-          - --default-ssl-certificate={{ .Release.Namespace }}/{{ template "kubernetes-ingress.defaultCertSecret.fullname" . }}
+          - --default-ssl-certificate={{ .Release.Namespace }}/{{ template "kubernetes-ingress.defaultTLSSecret.fullname" . }}
+{{- end }}
 {{- end }}
           - --configmap={{ .Release.Namespace }}/{{ template "kubernetes-ingress.fullname" . }}
           - --default-backend-service={{ .Release.Namespace }}/{{ template "kubernetes-ingress.defaultBackend.fullname" . }}
diff --git a/kubernetes-ingress/templates/controller-defaultcertsecret.yaml b/kubernetes-ingress/templates/controller-defaultcertsecret.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 type: kubernetes.io/tls
 metadata:
-  name: {{ template "kubernetes-ingress.defaultCertSecret.fullname" . }}
+  name: {{ template "kubernetes-ingress.defaultTLSSecret.fullname" . }}
   labels:
     app.kubernetes.io/name: {{ template "kubernetes-ingress.name" . }}
     helm.sh/chart: {{ template "kubernetes-ingress.chart" . }}
diff --git a/kubernetes-ingress/templates/controller-deployment.yaml b/kubernetes-ingress/templates/controller-deployment.yaml
@@ -31,10 +31,10 @@ spec:
           image: "{{ .Values.controller.image.repository }}:{{ tpl .Values.controller.image.tag . }}"
           imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
           args:
-{{- if .Values.controller.defaultTLSSecret }}
-          - --default-ssl-certificate={{ .Values.controller.defaultTLSSecret }}
+{{- if .Values.controller.defaultTLSSecret.secret }}
+          - --default-ssl-certificate={{ .Values.controller.defaultTLSSecret.secret }}
 {{- else }}
-          - --default-ssl-certificate={{ .Release.Namespace }}/{{ template "kubernetes-ingress.defaultCertSecret.fullname" . }}
+          - --default-ssl-certificate={{ .Release.Namespace }}/{{ template "kubernetes-ingress.defaultTLSSecret.fullname" . }}
 {{- end }}
           - --configmap={{ .Release.Namespace }}/{{ template "kubernetes-ingress.fullname" . }}
           - --default-backend-service={{ .Release.Namespace }}/{{ template "kubernetes-ingress.defaultBackend.fullname" . }}
diff --git a/kubernetes-ingress/values.yaml b/kubernetes-ingress/values.yaml
@@ -48,19 +48,21 @@ controller:
   ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/#using-multiple-ingress-controllers
   ingressClass: null   # typically "haproxy" or null to receive all events
 
-  ## Ingress TLS secret, if left null then controller will use auto-generated TLS secret
+  ## Ingress TLS secret, if enabled is true and secret is null then controller will use auto-generated secret otherwise provided secret is used
   ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
-  defaultTLSSecret: null
+  defaultTLSSecret:
+    enabled: true
+    secret: null
 
   ## Compute Resources for controller container
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
-  resources: {}
+  resources:
   #  limits:
   #    cpu: 100m
   #    memory: 64Mi
-  #  requests:
-  #    cpu: 100m
-  #    memory: 64Mi
+    requests:
+      cpu: 100m
+      memory: 64Mi
 
   ## Pod Node assignment
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
@@ -141,13 +143,13 @@ defaultBackend:
 
   ## Compute Resources
   ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
-  resources: {}
+  resources:
   #  limits:
-  #    cpu: 100m
-  #    memory: 64Mi
-  #  requests:
-  #    cpu: 100m
-  #    memory: 64Mi
+  #    cpu: 10m
+  #    memory: 16Mi
+    requests:
+      cpu: 10m
+      memory: 16Mi
 
   ## Listener port configuration
   ## ref: https://kubernetes.io/docs/concepts/services-networking/connect-applications-service/

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+controller:`
	`2`	`+ defaultTLSSecret:`
	`3`	+ secret: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURBakNDQWVxZ0F3SUJBZ0lSQU1QaEZQbnZLeG1HQXRpSVlsM3J2dmd3RFFZSktvWklodmNOQVFFTEJRQXcKSURFZU1Cd0dBMVVFQXhNVmEzVmlaWEp1WlhSbGN5MXBibWR5WlhOekxXTmhNQjRYRFRFNU1USXhPVEl4TWpRdwpNVm9YRFRJd01USXhPREl4TWpRd01Wb3dHREVXTUJRR0ExVUVBeE1OYlhsb1lYQXVaR1ZtWVhWc2REQ0NBU0l3CkRRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFMMzZXcy9PY0VVWHZHMm5KdXNmVzFqbW92SDgKcThzQ01uUWQ1by9rU3dUTVlKUERZUCtYVDUvakc2Rks1RFVLWUpzWklLaCtTSnlsUGI1dTh3eUxuOThJNWx4MwoxVzRHcUhOalJodGthYk5ad3NqTmtPL2JETWxpem13ZndNblBwcWRNeWJERUhkUlZVM2dFYmRqSlRiV3FXakNmCkt4am5PUHZMaFY4WWZibHhYZlpibGlwcTl1VkdhUWpoeVNVNDB4Z25JdUdBclo0WmNQcHhlWHJHY3luMlAweDcKSUh5djNCYTY1WWs2WHo1V0xXS1A4NURjSUQyWk1WRlEvYTNVRUQ4NXdRYXFrMmorSWRUbEQyNXVraFVzVGEzZwo4MldWcjRic1krb0VRRTBkM2o5dzAyQzBraG5zOThTWkZuTmM4Zm03aXNud3BWMDg5R3FYbTVGdmNITUNBd0VBCkFhTS9NRDB3RGdZRFZSMFBBUUgvQkFRREFnV2dNQjBHQTFVZEpRUVdNQlFHQ0NzR0FRVUZCd01CQmdnckJnRUYKQlFjREFqQU1CZ05WSFJNQkFmOEVBakFBTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBN0dmTzlJMVg2Q1d3NApTR0RPdDE4OURkeE4zd1JVeU90NDVWT0xmTE5BeDBBR2ZxOURJYVEyNUR1RG8vZkpCczhtODZIMmd3Njc3SzNZCmpkYm1wa29Qd2ZVR3VoZitKN3hpNzJIeVBvNkp0MWFnTDBiQkZqeTZwcU9xVTExa2Eyekc2WGdZY0J0VVAzUjIKeXJXa2o3aUJiR1Yyc3NtRS9pODkrRk90NXZ3SG0relhZWTRJN0M5L0phWFBLTEVRMllLeWs4SUtNYkpxNXRGRgpVaEd0NnMrR1hWK3RhdXhOY2ZQY1VIUTAxSTJ4M0dRdlpqRUVOWU55VE16Yk8vdGhVU0dMK0hhZU1HS3FFSXBXCjZIdWF6UjQvUjAxUW5FeXd4bXEwSVlFRmYvRG9YUm8zUmZaOEUyVEY2eVZGakUwd3p2dlpVRFlGNSs2djJ4Ty8KYkRvbzdBZEoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="