🔨 Template the Helm chart versions into Docker tags

This commit is contained in:
M. Mert Yildiran 2023-10-16 23:19:44 +03:00
parent bdff836040
commit a3383ee6cc
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
9 changed files with 55 additions and 59 deletions

View File

@ -70,7 +70,7 @@ type ProxyConfig struct {
type DockerConfig struct {
Registry string `yaml:"registry" json:"registry" default:"docker.io/kubeshark"`
Tag string `yaml:"tag" json:"tag" default:"latest"`
Tag string `yaml:"tag" json:"tag" default:""`
ImagePullPolicy string `yaml:"imagepullpolicy" json:"imagepullpolicy" default:"Always"`
ImagePullSecrets []string `yaml:"imagepullsecrets" json:"imagepullsecrets"`
}

View File

@ -1,5 +1,6 @@
apiVersion: v2
appVersion: "50.4"
name: kubeshark
version: "51.0.0"
description: The API Traffic Analyzer for Kubernetes
home: https://kubeshark.co
keywords:
@ -18,9 +19,7 @@ maintainers:
- email: info@kubeshark.co
name: Kubeshark
url: https://kubeshark.co
name: kubeshark
sources:
- https://github.com/kubeshark/kubeshark/tree/master/helm-chart
type: application
version: "50.4"
icon: https://raw.githubusercontent.com/kubeshark/assets/master/logo/vector/logo.svg

View File

@ -46,7 +46,7 @@ spec:
name: kubeshark-config-map
- secretRef:
name: kubeshark-secret
image: '{{ .Values.tap.docker.registry }}/hub:{{ .Values.tap.docker.tag }}'
image: '{{ .Values.tap.docker.registry }}/hub:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag .Chart.Version }}'
imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }}
readinessProbe:
periodSeconds: 1

View File

@ -30,7 +30,7 @@ spec:
value: ' '
- name: REACT_APP_HUB_PORT
value: '{{ .Values.tap.ingress.enabled | ternary "/api" (print ":" .Values.tap.proxy.front.port "/api") }}'
image: '{{ .Values.tap.docker.registry }}/front:{{ .Values.tap.docker.tag }}'
image: '{{ .Values.tap.docker.registry }}/front:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag .Chart.Version }}'
imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }}
name: kubeshark-front
livenessProbe:

View File

@ -43,7 +43,7 @@ spec:
{{- if .Values.tap.nokernelmodule }}
- -no-kernel-module
{{- end }}
image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.tag }}'
image: '{{ .Values.tap.docker.registry }}/worker:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag .Chart.Version }}'
imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }}
name: sniffer
env:
@ -107,7 +107,7 @@ spec:
{{- if .Values.tap.debug }}
- -debug
{{- end }}
image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.tag }}'
image: '{{ .Values.tap.docker.registry }}/worker:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag .Chart.Version }}'
imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }}
name: tracer
env:

View File

@ -1,6 +1,9 @@
Thank you for installing {{ title .Chart.Name }}.
Your deployment has been successful. The release is named {{ .Release.Name }} and it has been deployed in the {{ .Release.Namespace }} namespace.
Registry: {{ .Values.tap.docker.registry }}
Tag: {{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag .Chart.Version }}
Your deployment has been successful. The release is named `{{ .Release.Name }}` and it has been deployed in the `{{ .Release.Namespace }}` namespace.
{{- if .Values.tap.telemetry.enabled }}
Notice: Telemetry is enabled. Kubeshark will collect anonymous usage statistics.

View File

@ -36,9 +36,7 @@ Common labels
{{- define "kubeshark.labels" -}}
helm.sh/chart: {{ include "kubeshark.chart" . }}
{{ include "kubeshark.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/version: {{ .Chart.Version | quote }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- with .Values.additionalLabels }}
{{ toYaml . }}

View File

@ -1,7 +1,7 @@
tap:
docker:
registry: docker.io/kubeshark
tag: latest
tag: ""
imagepullpolicy: Always
imagepullsecrets: []
proxy:

View File

@ -4,10 +4,10 @@ apiVersion: v1
kind: ServiceAccount
metadata:
labels:
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-service-account
@ -21,10 +21,10 @@ metadata:
namespace: default
labels:
app.kubeshark.co/app: hub
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
stringData:
LICENSE: ''
@ -36,10 +36,10 @@ metadata:
name: kubeshark-nginx-config-map
namespace: default
labels:
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
data:
default.conf: |
@ -85,10 +85,10 @@ metadata:
namespace: default
labels:
app.kubeshark.co/app: hub
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
data:
POD_REGEX: '.*'
@ -105,10 +105,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-cluster-role
@ -133,10 +133,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-cluster-role-binding
@ -155,10 +155,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-self-config-role
@ -183,10 +183,10 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-self-config-role-binding
@ -206,10 +206,10 @@ kind: Service
metadata:
labels:
app.kubeshark.co/app: hub
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-hub
@ -228,10 +228,10 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-front
@ -252,10 +252,10 @@ metadata:
labels:
app.kubeshark.co/app: worker
sidecar.istio.io/inject: "false"
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-worker-daemon-set
@ -264,19 +264,19 @@ spec:
selector:
matchLabels:
app.kubeshark.co/app: worker
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
template:
metadata:
labels:
app.kubeshark.co/app: worker
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
name: kubeshark-worker-daemon-set
namespace: kubeshark
@ -291,9 +291,7 @@ spec:
- -servicemesh
- -procfs
- /hostproc
image: 'docker.io/kubeshark/worker:latest'
image: 'docker.io/kubeshark/worker:51.0.0'
imagePullPolicy: Always
name: sniffer
env:
@ -353,8 +351,7 @@ spec:
- ./tracer
- -procfs
- /hostproc
image: 'docker.io/kubeshark/worker:latest'
image: 'docker.io/kubeshark/worker:51.0.0'
imagePullPolicy: Always
name: tracer
env:
@ -424,10 +421,10 @@ kind: Deployment
metadata:
labels:
app.kubeshark.co/app: hub
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-hub
@ -437,19 +434,19 @@ spec:
selector:
matchLabels:
app.kubeshark.co/app: hub
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
template:
metadata:
labels:
app.kubeshark.co/app: hub
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
spec:
dnsPolicy: ClusterFirstWithHostNet
@ -458,7 +455,6 @@ spec:
- name: kubeshark-hub
command:
- ./hub
env:
- name: POD_NAME
valueFrom:
@ -473,7 +469,7 @@ spec:
name: kubeshark-config-map
- secretRef:
name: kubeshark-secret
image: 'docker.io/kubeshark/hub:latest'
image: 'docker.io/kubeshark/hub:51.0.0'
imagePullPolicy: Always
readinessProbe:
periodSeconds: 1
@ -503,10 +499,10 @@ kind: Deployment
metadata:
labels:
app.kubeshark.co/app: front
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
annotations:
name: kubeshark-front
@ -516,19 +512,19 @@ spec:
selector:
matchLabels:
app.kubeshark.co/app: front
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
template:
metadata:
labels:
app.kubeshark.co/app: front
helm.sh/chart: kubeshark-50.4
helm.sh/chart: kubeshark-51.0.0
app.kubernetes.io/name: kubeshark
app.kubernetes.io/instance: kubeshark
app.kubernetes.io/version: "50.4"
app.kubernetes.io/version: "51.0.0"
app.kubernetes.io/managed-by: Helm
spec:
containers:
@ -539,7 +535,7 @@ spec:
value: ' '
- name: REACT_APP_HUB_PORT
value: ':8899/api'
image: 'docker.io/kubeshark/front:latest'
image: 'docker.io/kubeshark/front:51.0.0'
imagePullPolicy: Always
name: kubeshark-front
livenessProbe: