feat: use the app version for tag in admission controller

stable/anchore-admission-controller/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: anchore-admission-controller
-version: 0.8.3
+version: 0.8.4
 appVersion: 0.8.3
 description: A kubernetes admission controller for validating and mutating webhooks that operates against Anchore Engine to make access decisions and annotations
 home: https://github.com/anchore/kubernetes-admission-controller

stable/anchore-admission-controller/templates/_helpers.tpl

@@ -37,3 +37,20 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
+
+{{/*
+Resolve the image, replacing "latest" tag with AppVersion for the default upstream image.
+Existing customers pinning a specific tag are unaffected.
+*/}}
+{{- define "anchore-admission-controller.image" -}}
+{{- $parts := splitList ":" .Values.image -}}
+{{- $repo := first $parts -}}
+{{- $tag := last $parts -}}
+{{- $defaultRepo := "anchore/kubernetes-admission-controller" -}}
+{{- $isDefault := or (eq $repo $defaultRepo) (eq $repo (printf "docker.io/%s" $defaultRepo)) (eq $repo (printf "docker.io/library/%s" $defaultRepo)) -}}
+{{- if and $isDefault (or (eq $tag "latest") (eq $tag $repo)) -}}
+{{- printf "%s:v%s" $repo .Chart.AppVersion -}}
+{{- else -}}
+{{- .Values.image -}}
+{{- end -}}
+{{- end -}}

stable/anchore-admission-controller/templates/deployment.yaml

@@ -44,7 +44,7 @@ spec:
       {{- end }}
       containers:
       - name: {{ .Chart.Name }}
-        image: "{{ .Values.image }}"
+        image: {{ include "anchore-admission-controller.image" . }}
         imagePullPolicy: {{ .Values.imagePullPolicy }}
       {{- with .Values.containerSecurityContext }}
         securityContext: {{- toYaml . | nindent 10 }}

stable/anchore-admission-controller/values.yaml

@@ -5,7 +5,7 @@ fullnameOverride: Null
 replicaCount: 1
 logVerbosity: 3
 
-image: "anchore/kubernetes-admission-controller:v0.8.3"
+image: "anchore/kubernetes-admission-controller:latest"
 imagePullPolicy: IfNotPresent
 # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
 imagePullSecrets: []

stable/ecs-inventory/Chart.yaml

@@ -20,7 +20,7 @@ maintainers:
     email: hung.nguyen@anchore.com
 
 type: application
-version: 0.0.16
+version: 0.0.17
 appVersion: "1.4.1"
 
 icon: https://anchore.com/wp-content/uploads/2016/08/anchore.png

stable/ecs-inventory/templates/_helpers.tpl

@@ -24,3 +24,20 @@ app: {{ include "ecsInventory.fullname" . }}
 release: {{ .Release.Name }}
 heritage: {{ .Release.Service }}
 {{- end }}
+
+{{/*
+Resolve the image, replacing "latest" tag with AppVersion for the default upstream image.
+Existing customers pinning a specific tag are unaffected.
+*/}}
+{{- define "ecsInventory.image" -}}
+{{- $parts := splitList ":" .Values.image -}}
+{{- $repo := first $parts -}}
+{{- $tag := last $parts -}}
+{{- $defaultRepo := "anchore/ecs-inventory" -}}
+{{- $isDefault := or (eq $repo $defaultRepo) (eq $repo (printf "docker.io/%s" $defaultRepo)) (eq $repo (printf "docker.io/library/%s" $defaultRepo)) -}}
+{{- if and $isDefault (or (eq $tag "latest") (eq $tag $repo)) -}}
+{{- printf "%s:v%s" $repo .Chart.AppVersion -}}
+{{- else -}}
+{{- .Values.image -}}
+{{- end -}}
+{{- end -}}

stable/ecs-inventory/templates/deployment.yaml

@@ -38,7 +38,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.containerSecurityContext | nindent 12 }}
-          image: {{ .Values.image }}
+          image: {{ include "ecsInventory.image" . }}
           imagePullPolicy: {{ .Values.imagePullPolicy }}
           livenessProbe:
             exec:

stable/ecs-inventory/values.yaml

@@ -10,7 +10,7 @@ replicaCount: 1
 ## @param image Image used for all Ecs Inventory deployment deployments
 ## use docker.io/anchore/ecs-inventory:v1.4.1-fips-amd64 if you want an image built for fips use
 ##
-image: "docker.io/anchore/ecs-inventory:v1.4.1"
+image: "docker.io/anchore/ecs-inventory:latest"
 
 ## @param imagePullPolicy Image pull policy used by all deployments
 ## ref: https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy

stable/k8s-inventory/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: k8s-inventory
-version: 0.6.3
+version: 0.6.4
 appVersion: "1.8.2"
 description: A Helm chart for Kubernetes Automated Inventory, which describes which images are in use in a given Kubernetes Cluster
 keywords:

stable/k8s-inventory/templates/_helpers.tpl

@@ -68,6 +68,22 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
+{{/*
+Resolve the image, replacing "latest" tag with AppVersion for the default upstream image.
+Existing customers pinning a specific tag are unaffected.
+*/}}
+{{- define "k8sInventory.image" -}}
+{{- $repo := .Values.image.repository -}}
+{{- $tag := .Values.image.tag | default "latest" -}}
+{{- $defaultRepo := "anchore/k8s-inventory" -}}
+{{- $isDefault := or (eq $repo $defaultRepo) (eq $repo (printf "docker.io/%s" $defaultRepo)) (eq $repo (printf "docker.io/library/%s" $defaultRepo)) -}}
+{{- if and $isDefault (eq $tag "latest") -}}
+{{- printf "%s:v%s" $repo .Chart.AppVersion -}}
+{{- else -}}
+{{- printf "%s:%s" $repo $tag -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Require Anchore endpoint and Anchore credentials
 */}}

stable/k8s-inventory/templates/deployment.yaml

@@ -43,7 +43,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: {{ include "k8sInventory.image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["/anchore-k8s-inventory"]
           ports:

stable/k8s-inventory/values.yaml

@@ -15,7 +15,7 @@ replicaCount: 1
 image:
   pullPolicy: "IfNotPresent"
   repository: "anchore/k8s-inventory"
-  tag: "v1.8.2"
+  tag: "latest"
 
 ## @param imagePullSecrets secrets where Kubernetes should get the credentials for pulling private images
 ##