Merge branch 'stakater:master' into master

Author: msiegenthaler

bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml

@@ -18,7 +18,7 @@ metadata:
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v1.18.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-  name: ingressmonitorcontroller.v2.1.21
+  name: ingressmonitorcontroller.v2.1.23
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -151,7 +151,7 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
-                image: stakater/ingressmonitorcontroller:v2.1.21
+                image: stakater/ingressmonitorcontroller:v2.1.23
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -251,4 +251,4 @@ spec:
   provider:
     name: stakater
     url: https://stakater.com
-  version: 2.1.21
+  version: 2.1.23

charts/ingressmonitorcontroller/Chart.yaml

@@ -3,10 +3,10 @@ name: ingressmonitorcontroller
 description: IngressMonitorController Operator chart that runs on kubernetes
 
 # Helm chart Version
-version: 2.1.21
+version: 2.1.23
 
 # Application version to be deployed
-appVersion: 2.1.21
+appVersion: 2.1.23
 
 keywords:
   - IngressMonitorController

charts/ingressmonitorcontroller/templates/_helpers.tpl

@@ -8,18 +8,14 @@ Expand the name of the chart.
 {{/*
 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 "ingress-monitor-controller.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else if .Values.nameOverride }}
+{{- .Values.nameOverride | 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 }}
+{{- .Chart.Name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 {{- end }}
 
@@ -39,7 +35,7 @@ helm.sh/chart: {{ include "ingress-monitor-controller.chart" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/managed-by: {{ .Values.serviceManagedBy }}
 {{- if .Values.global.labels }}
 {{ toYaml .Values.global.labels }}
 {{- end }}
@@ -50,7 +46,7 @@ Selector labels
 */}}
 {{- define "ingress-monitor-controller.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "ingress-monitor-controller.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/instance: {{ .Values.name | default .Release.Name }}
 {{- end }}
 
 {{/*
@@ -65,10 +61,10 @@ Create the name of the service account to use
 {{- end }}
 
 {{/*
-Verify that CRDs are installed 
+Verify that CRDs are installed
 */}}
 {{- define "verify_crds_exist" -}}
   {{- if .Capabilities.APIVersions.Has "endpointmonitor.stakater.com/v1alpha1" -}}
     true
   {{- end -}}
-{{- end -}}
+{{- end -}}

charts/ingressmonitorcontroller/templates/clusterrolebinding.yaml

@@ -13,7 +13,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "ingress-monitor-controller.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
 
 ---
@@ -29,7 +29,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "ingress-monitor-controller.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
 
 ---
@@ -45,7 +45,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "ingress-monitor-controller.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
-  
+
 {{- end }}

charts/ingressmonitorcontroller/templates/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "ingress-monitor-controller.labels" . | nindent 4 }}
     control-plane: controller-manager

charts/ingressmonitorcontroller/templates/namespace.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    stakater.com/tenant: alpha
+  name: {{ .Values.namespace | default .Release.Namespace }}

charts/ingressmonitorcontroller/templates/role.yaml

@@ -78,7 +78,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-leader-election-role
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 rules:
 - apiGroups:
   - ""
@@ -109,7 +109,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-secret-viewer-role
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 rules:
 - apiGroups:
   - ""

charts/ingressmonitorcontroller/templates/rolebinding.yaml

@@ -23,15 +23,15 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-leader-election-rolebinding
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ include "ingress-monitor-controller.fullname" . }}-leader-election-role
 subjects:
 - kind: ServiceAccount
   name: {{ include "ingress-monitor-controller.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
 
 {{- if .Values.rbac.secretViewerRole }}
@@ -40,15 +40,15 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-secret-viewer-rolebinding
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: {{ include "ingress-monitor-controller.fullname" . }}-secret-viewer-role
 subjects:
 - kind: ServiceAccount
   name: {{ include "ingress-monitor-controller.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- end }}
 
 {{- end }}

charts/ingressmonitorcontroller/templates/service.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "ingress-monitor-controller.fullname" . }}-metrics-service
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "ingress-monitor-controller.labels" . | nindent 4 }}
 spec:
@@ -12,4 +12,4 @@ spec:
     port: 8443
     targetPort: https
   selector:
-    {{- include "ingress-monitor-controller.selectorLabels" . | nindent 4 }}
+    {{- include "ingress-monitor-controller.selectorLabels" . | nindent 4 }}

charts/ingressmonitorcontroller/templates/serviceaccount.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "ingress-monitor-controller.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "ingress-monitor-controller.labels" . | nindent 4 }}
     {{- if .Values.serviceAccount.labels }}