chore(kuma-cp) support other service name in DP injector #1491
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
nickolaev
approved these changes
Jan 28, 2021
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
lobkovilya
reviewed
Jan 29, 2021
| @@ -687,4 +687,4 @@ spec: | |||
| secret: | |||
| secretName: loki | |||
| - name: storage | |||
| emptyDir: {} | |||
| emptyDir: {} | |||
There was a problem hiding this comment.
Does it mean a new update mode for golden files isn't adding an empty line at the end?
There was a problem hiding this comment.
maybe. It's just overriding file with the output content. If content has no empty line at the end, there won't be empty line in the golden file. Is that a problem?
There was a problem hiding this comment.
No, no problem, GitHub so much highlights the fact there is no empty line at the end, so I asked :)
pkg/test/matchers/golden_yaml.go
Outdated
| } | ||
|
|
||
| func MatchGoldenJSON(goldenFilePath string) types.GomegaMatcher { | ||
| return MatchGolden(gomega.MatchYAML, goldenFilePath) |
There was a problem hiding this comment.
I think it should be MatchJSON
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
lobkovilya
approved these changes
Jan 29, 2021
mergify bot
pushed a commit
that referenced
this pull request
Jan 29, 2021
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com> (cherry picked from commit 4d2d01c) # Conflicts: # app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go # mk/e2e.new.mk
nickolaev
pushed a commit
that referenced
this pull request
Feb 4, 2021
…1494) * chore(kuma-cp) support other service name in DP injector (#1491) Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com> (cherry picked from commit 4d2d01c) # Conflicts: # app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go # mk/e2e.new.mk * fix(*) conflicts Signed-off-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com> Co-authored-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com> Co-authored-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Full changelog
kuma_runtime_kubernetes_control_plane_service_nameso Kuma the service name change can be applied and injector will inject Kuma DP with proper URLkuma-cniservice account name where as the service account was created with this patternserviceAccountName: {{ include "kuma.name" . }}-cnitemplates/pre-",templates/post-, not only prefix. This way when kuma is a sub chart, it will work.Documentation