mirror of
https://github.com/kubeshark/kubeshark.git
synced 2025-06-22 22:39:40 +00:00
✨ Add OverrideTagConfig
field to DockerConfig
This commit is contained in:
parent
39c5df64e6
commit
487f0b9332
@ -69,11 +69,18 @@ type ProxyConfig struct {
|
|||||||
Host string `yaml:"host" json:"host" default:"127.0.0.1"`
|
Host string `yaml:"host" json:"host" default:"127.0.0.1"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type OverrideTagConfig struct {
|
||||||
|
Worker string `yaml:"worker" json:"worker"`
|
||||||
|
Hub string `yaml:"hub" json:"hub"`
|
||||||
|
Front string `yaml:"front" json:"front"`
|
||||||
|
}
|
||||||
|
|
||||||
type DockerConfig struct {
|
type DockerConfig struct {
|
||||||
Registry string `yaml:"registry" json:"registry" default:"docker.io/kubeshark"`
|
Registry string `yaml:"registry" json:"registry" default:"docker.io/kubeshark"`
|
||||||
Tag string `yaml:"tag" json:"tag" default:""`
|
Tag string `yaml:"tag" json:"tag" default:""`
|
||||||
ImagePullPolicy string `yaml:"imagePullPolicy" json:"imagePullPolicy" default:"Always"`
|
ImagePullPolicy string `yaml:"imagePullPolicy" json:"imagePullPolicy" default:"Always"`
|
||||||
ImagePullSecrets []string `yaml:"imagePullSecrets" json:"imagePullSecrets"`
|
ImagePullSecrets []string `yaml:"imagePullSecrets" json:"imagePullSecrets"`
|
||||||
|
OverrideTag OverrideTagConfig `yaml:"overrideTag" json:"overrideTag"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ResourcesConfig struct {
|
type ResourcesConfig struct {
|
||||||
|
@ -45,7 +45,11 @@ spec:
|
|||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: KUBESHARK_CLOUD_API_URL
|
- name: KUBESHARK_CLOUD_API_URL
|
||||||
value: 'https://api.kubeshark.co'
|
value: 'https://api.kubeshark.co'
|
||||||
|
{{- if .Values.tap.docker.overrideTag.hub }}
|
||||||
|
image: '{{ .Values.tap.docker.registry }}/hub:{{ .Values.tap.docker.overrideTag.hub }}'
|
||||||
|
{{ else }}
|
||||||
image: '{{ .Values.tap.docker.registry }}/hub:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (printf "v%s" .Chart.Version) }}'
|
image: '{{ .Values.tap.docker.registry }}/hub:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (printf "v%s" .Chart.Version) }}'
|
||||||
|
{{- end }}
|
||||||
imagePullPolicy: {{ .Values.tap.docker.imagePullPolicy }}
|
imagePullPolicy: {{ .Values.tap.docker.imagePullPolicy }}
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
periodSeconds: 1
|
periodSeconds: 1
|
||||||
|
@ -52,7 +52,11 @@ spec:
|
|||||||
{{- else -}}
|
{{- else -}}
|
||||||
{{ .Values.cloudLicenseEnabled }}
|
{{ .Values.cloudLicenseEnabled }}
|
||||||
{{- end }}'
|
{{- end }}'
|
||||||
|
{{- if .Values.tap.docker.overrideTag.front }}
|
||||||
|
image: '{{ .Values.tap.docker.registry }}/front:{{ .Values.tap.docker.overrideTag.front }}'
|
||||||
|
{{ else }}
|
||||||
image: '{{ .Values.tap.docker.registry }}/front:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (printf "v%s" .Chart.Version) }}'
|
image: '{{ .Values.tap.docker.registry }}/front:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (printf "v%s" .Chart.Version) }}'
|
||||||
|
{{- end }}
|
||||||
imagePullPolicy: {{ .Values.tap.docker.imagePullPolicy }}
|
imagePullPolicy: {{ .Values.tap.docker.imagePullPolicy }}
|
||||||
name: kubeshark-front
|
name: kubeshark-front
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
|
@ -154,7 +154,11 @@ spec:
|
|||||||
{{- if .Values.tap.debug }}
|
{{- if .Values.tap.debug }}
|
||||||
- -debug
|
- -debug
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if .Values.tap.docker.overrideTag.worker }}
|
||||||
|
image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.overrideTag.worker }}'
|
||||||
|
{{ else }}
|
||||||
image: '{{ .Values.tap.docker.registry }}/worker:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (printf "v%s" .Chart.Version) }}'
|
image: '{{ .Values.tap.docker.registry }}/worker:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (printf "v%s" .Chart.Version) }}'
|
||||||
|
{{- end }}
|
||||||
imagePullPolicy: {{ .Values.tap.docker.imagePullPolicy }}
|
imagePullPolicy: {{ .Values.tap.docker.imagePullPolicy }}
|
||||||
name: tracer
|
name: tracer
|
||||||
env:
|
env:
|
||||||
|
@ -3,6 +3,18 @@ Thank you for installing {{ title .Chart.Name }}.
|
|||||||
Registry: {{ .Values.tap.docker.registry }}
|
Registry: {{ .Values.tap.docker.registry }}
|
||||||
Tag: {{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (printf "v%s" .Chart.Version) }}
|
Tag: {{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (printf "v%s" .Chart.Version) }}
|
||||||
|
|
||||||
|
{{- if .Values.tap.docker.overrideTag.worker }}
|
||||||
|
Overridden worker tag: {{ .Values.tap.docker.overrideTag.worker }}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
|
{{- if .Values.tap.docker.overrideTag.hub }}
|
||||||
|
Overridden hub tag: {{ .Values.tap.docker.overrideTag.hub }}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
|
{{- if .Values.tap.docker.overrideTag.front }}
|
||||||
|
Overridden front tag: {{ .Values.tap.docker.overrideTag.front }}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
Your deployment has been successful. The release is named `{{ .Release.Name }}` and it has been deployed in the `{{ .Release.Namespace }}` namespace.
|
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 }}
|
{{- if .Values.tap.telemetry.enabled }}
|
||||||
|
@ -4,6 +4,10 @@ tap:
|
|||||||
tag: ""
|
tag: ""
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
imagePullSecrets: []
|
imagePullSecrets: []
|
||||||
|
overrideTag:
|
||||||
|
worker: ""
|
||||||
|
hub: ""
|
||||||
|
front: ""
|
||||||
proxy:
|
proxy:
|
||||||
worker:
|
worker:
|
||||||
srvPort: 30001
|
srvPort: 30001
|
||||||
|
Loading…
Reference in New Issue
Block a user