mirror of
https://github.com/kubeshark/kubeshark.git
synced 2025-07-04 03:48:58 +00:00
Added an ability to override image names for a case, where when using a CI, one needs to use individual image names (#1636)
This commit is contained in:
parent
e0c010eb29
commit
b3f6fdc831
@ -89,6 +89,11 @@ 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 OverrideImageConfig struct {
|
||||||
|
Worker string `yaml:"worker" json:"worker"`
|
||||||
|
Hub string `yaml:"hub" json:"hub"`
|
||||||
|
Front string `yaml:"front" json:"front"`
|
||||||
|
}
|
||||||
type OverrideTagConfig struct {
|
type OverrideTagConfig struct {
|
||||||
Worker string `yaml:"worker" json:"worker"`
|
Worker string `yaml:"worker" json:"worker"`
|
||||||
Hub string `yaml:"hub" json:"hub"`
|
Hub string `yaml:"hub" json:"hub"`
|
||||||
@ -101,6 +106,7 @@ type DockerConfig struct {
|
|||||||
TagLocked bool `yaml:"tagLocked" json:"tagLocked" default:"true"`
|
TagLocked bool `yaml:"tagLocked" json:"tagLocked" default:"true"`
|
||||||
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"`
|
||||||
|
OverrideImage OverrideImageConfig `yaml:"overrideImage" json:"overrideImage"`
|
||||||
OverrideTag OverrideTagConfig `yaml:"overrideTag" json:"overrideTag"`
|
OverrideTag OverrideTagConfig `yaml:"overrideTag" json:"overrideTag"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,6 +104,20 @@ helm install kubeshark kubeshark/kubeshark \
|
|||||||
|
|
||||||
Please refer to [metrics](./metrics.md) documentation for details.
|
Please refer to [metrics](./metrics.md) documentation for details.
|
||||||
|
|
||||||
|
## Override Tag, Tags, Images
|
||||||
|
|
||||||
|
In addition to using a private registry, you can further override the images' tag, specific image tags and specific image names.
|
||||||
|
|
||||||
|
Example for overriding image names:
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
docker:
|
||||||
|
overrideImage:
|
||||||
|
worker: docker.io/kubeshark/worker:v52.3.87
|
||||||
|
front: docker.io/kubeshark/front:v52.3.87
|
||||||
|
hub: docker.io/kubeshark/hub:v52.3.87
|
||||||
|
```
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
| Parameter | Description | Default |
|
| Parameter | Description | Default |
|
||||||
@ -114,7 +128,8 @@ Please refer to [metrics](./metrics.md) documentation for details.
|
|||||||
| `tap.docker.tagLocked` | If `false` - use latest minor tag | `true` |
|
| `tap.docker.tagLocked` | If `false` - use latest minor tag | `true` |
|
||||||
| `tap.docker.imagePullPolicy` | Kubernetes image pull policy | `Always` |
|
| `tap.docker.imagePullPolicy` | Kubernetes image pull policy | `Always` |
|
||||||
| `tap.docker.imagePullSecrets` | Kubernetes secrets to pull the images | `[]` |
|
| `tap.docker.imagePullSecrets` | Kubernetes secrets to pull the images | `[]` |
|
||||||
| `tap.docker.overrideTag` | DANGER: Used to override specific images, when testing custom features from the Kubeshark team | `""` |
|
| `tap.docker.overrideImage` | Can be used to directly override image names | `""` |
|
||||||
|
| `tap.docker.overrideTag` | Can be used to override image tags | `""` |
|
||||||
| `tap.proxy.hub.srvPort` | Hub server port. Change if already occupied. | `8898` |
|
| `tap.proxy.hub.srvPort` | Hub server port. Change if already occupied. | `8898` |
|
||||||
| `tap.proxy.worker.srvPort` | Worker server port. Change if already occupied.| `30001` |
|
| `tap.proxy.worker.srvPort` | Worker server port. Change if already occupied.| `30001` |
|
||||||
| `tap.proxy.front.port` | Front service port. Change if already occupied.| `8899` |
|
| `tap.proxy.front.port` | Front service port. Change if already occupied.| `8899` |
|
||||||
|
@ -51,7 +51,9 @@ spec:
|
|||||||
value: 'https://api.kubeshark.co'
|
value: 'https://api.kubeshark.co'
|
||||||
- name: PROFILING_ENABLED
|
- name: PROFILING_ENABLED
|
||||||
value: '{{ .Values.tap.pprof.enabled }}'
|
value: '{{ .Values.tap.pprof.enabled }}'
|
||||||
{{- if .Values.tap.docker.overrideTag.hub }}
|
{{- if .Values.tap.docker.overrideImage.hub }}
|
||||||
|
image: '{{ .Values.tap.docker.overrideImage.hub }}'
|
||||||
|
{{- else if .Values.tap.docker.overrideTag.hub }}
|
||||||
image: '{{ .Values.tap.docker.registry }}/hub:{{ .Values.tap.docker.overrideTag.hub }}'
|
image: '{{ .Values.tap.docker.registry }}/hub:{{ .Values.tap.docker.overrideTag.hub }}'
|
||||||
{{ else }}
|
{{ else }}
|
||||||
image: '{{ .Values.tap.docker.registry }}/hub:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (include "kubeshark.defaultVersion" .) }}'
|
image: '{{ .Values.tap.docker.registry }}/hub:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (include "kubeshark.defaultVersion" .) }}'
|
||||||
|
@ -66,7 +66,9 @@ spec:
|
|||||||
value: '{{ (include "sentry.enabled" .) }}'
|
value: '{{ (include "sentry.enabled" .) }}'
|
||||||
- name: REACT_APP_SENTRY_ENVIRONMENT
|
- name: REACT_APP_SENTRY_ENVIRONMENT
|
||||||
value: '{{ .Values.tap.sentry.environment }}'
|
value: '{{ .Values.tap.sentry.environment }}'
|
||||||
{{- if .Values.tap.docker.overrideTag.front }}
|
{{- if .Values.tap.docker.overrideImage.front }}
|
||||||
|
image: '{{ .Values.tap.docker.overrideImage.front }}'
|
||||||
|
{{- else if .Values.tap.docker.overrideTag.front }}
|
||||||
image: '{{ .Values.tap.docker.registry }}/front:{{ .Values.tap.docker.overrideTag.front }}'
|
image: '{{ .Values.tap.docker.registry }}/front:{{ .Values.tap.docker.overrideTag.front }}'
|
||||||
{{ else }}
|
{{ else }}
|
||||||
image: '{{ .Values.tap.docker.registry }}/front:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (include "kubeshark.defaultVersion" .) }}'
|
image: '{{ .Values.tap.docker.registry }}/front:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (include "kubeshark.defaultVersion" .) }}'
|
||||||
|
@ -83,7 +83,9 @@ spec:
|
|||||||
{{- if .Values.tap.debug }}
|
{{- if .Values.tap.debug }}
|
||||||
- -debug
|
- -debug
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.tap.docker.overrideTag.worker }}
|
{{- if .Values.tap.docker.overrideImage.worker }}
|
||||||
|
image: '{{ .Values.tap.docker.overrideImage.worker }}'
|
||||||
|
{{- else if .Values.tap.docker.overrideTag.worker }}
|
||||||
image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.overrideTag.worker }}{{ include "kubeshark.dockerTagDebugVersion" . }}'
|
image: '{{ .Values.tap.docker.registry }}/worker:{{ .Values.tap.docker.overrideTag.worker }}{{ include "kubeshark.dockerTagDebugVersion" . }}'
|
||||||
{{ else }}
|
{{ else }}
|
||||||
image: '{{ .Values.tap.docker.registry }}/worker:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (include "kubeshark.defaultVersion" .) }}{{ include "kubeshark.dockerTagDebugVersion" . }}'
|
image: '{{ .Values.tap.docker.registry }}/worker:{{ not (eq .Values.tap.docker.tag "") | ternary .Values.tap.docker.tag (include "kubeshark.defaultVersion" .) }}{{ include "kubeshark.dockerTagDebugVersion" . }}'
|
||||||
|
@ -6,6 +6,10 @@ tap:
|
|||||||
tagLocked: true
|
tagLocked: true
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
imagePullSecrets: []
|
imagePullSecrets: []
|
||||||
|
overrideImage:
|
||||||
|
worker: ""
|
||||||
|
hub: ""
|
||||||
|
front: ""
|
||||||
overrideTag:
|
overrideTag:
|
||||||
worker: ""
|
worker: ""
|
||||||
hub: ""
|
hub: ""
|
||||||
|
Loading…
Reference in New Issue
Block a user