Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(helm): use image.global.registry for imageExperimental #4641

Merged
merged 3 commits into from Jul 19, 2022
Merged

fix(helm): use image.global.registry for imageExperimental #4641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d4c6a9
fix(helm): use image.global.registry for imageExperimental
jakubdyszkiewicz Jul 19, 2022
5ab4cc0
fix(helm): make check pass
slonka Jul 19, 2022
0740d39
fix(cni): update golden files
slonka Jul 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.cni-experimental-enabled.golden.yaml
View file
Open in desktop
Expand Up @@ -2035,7 +2035,7 @@ spec:
terminationGracePeriodSeconds: 5
containers:
- name: install-cni
image: "kumahq/kuma-cni:1.7.0"
image: "docker.io/kumahq/kuma-cni:1.7.0"
imagePullPolicy: IfNotPresent
command: ["/install-cni"]
env:
Expand Down
4 changes: 1 addition & 3 deletions app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml
View file
Open in desktop
Expand Up @@ -150,7 +150,7 @@ controlPlane:

# -- Whether to automountServiceAccountToken for cp. Optionally set to false
automountServiceAccountToken: true

# -- Optionally override the resource spec
# @default -- the resources will be chosen based on the mode
resources:
Expand Down Expand Up @@ -322,8 +322,6 @@ cni:

# -- use new CNI image (experimental)
imageExperimental:
# -- CNI experimental image registry
registry: "kumahq"
# -- CNI experimental image repository
repository: "kuma-cni"
# -- CNI experimental image tag - defaults to .Chart.AppVersion
Expand Down
3 changes: 1 addition & 2 deletions deployments/charts/kuma/README.md
View file
Open in desktop
Expand Up @@ -88,8 +88,7 @@ A Helm chart for the Kuma Control Plane
| cni.image.registry | string | `"docker.io/kumahq"` | CNI image registry |
| cni.image.repository | string | `"install-cni"` | CNI image repository |
| cni.image.tag | string | `"0.0.10"` | CNI image tag |
| cni.imageExperimental | object | `{"registry":"kumahq","repository":"kuma-cni","tag":null}` | use new CNI image (experimental) |
| cni.imageExperimental.registry | string | `"kumahq"` | CNI experimental image registry |
| cni.imageExperimental | object | `{"repository":"kuma-cni","tag":null}` | use new CNI image (experimental) |
| cni.imageExperimental.repository | string | `"kuma-cni"` | CNI experimental image repository |
| cni.imageExperimental.tag | string | `nil` | CNI experimental image tag - defaults to .Chart.AppVersion |
| cni.podSecurityContext | object | `{}` | Security context at the pod level for cni |
Expand Down
4 changes: 1 addition & 3 deletions deployments/charts/kuma/values.yaml
View file
Open in desktop
Expand Up @@ -150,7 +150,7 @@ controlPlane:

# -- Whether to automountServiceAccountToken for cp. Optionally set to false
automountServiceAccountToken: true

# -- Optionally override the resource spec
# @default -- the resources will be chosen based on the mode
resources:
Expand Down Expand Up @@ -322,8 +322,6 @@ cni:

# -- use new CNI image (experimental)
imageExperimental:
# -- CNI experimental image registry
registry: "kumahq"
# -- CNI experimental image repository
repository: "kuma-cni"
# -- CNI experimental image tag - defaults to .Chart.AppVersion
Expand Down