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.

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

Expose cniNetnsDir Helm value to istioctl #47499

Merged
merged 1 commit into from
Oct 21, 2023

Conversation

bleggett
Copy link
Contributor

@bleggett bleggett commented Oct 20, 2023

Followup to #47444

Forgot that we can't just add things to Helm charts and have them also work in istioctl. I don't love exposing all these flags but we do already expose the other CNI fields (bin dir, conf file, etc).

  • Ambient
  • Configuration Infrastructure
  • Docs
  • Dual Stack
  • Installation
  • Networking
  • Performance and Scalability
  • Policies and Telemetry
  • Security
  • Test and Release
  • User Experience
  • Developer Infrastructure

@bleggett bleggett requested a review from a team as a code owner October 20, 2023 16:48
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 20, 2023
Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io>
@bleggett bleggett force-pushed the bleggett/expose-netns-istioctl branch from 91df183 to a4b0118 Compare October 20, 2023 16:57
@bleggett bleggett added the release-notes-none Indicates a PR that does not require release notes. label Oct 20, 2023
@bleggett bleggett mentioned this pull request Oct 20, 2023
2 tasks
@istio-testing istio-testing merged commit f5ec669 into istio:master Oct 21, 2023
@bleggett
Copy link
Contributor Author

/cherry-pick release-1.20

@istio-testing
Copy link
Collaborator

@bleggett: #47499 failed to apply on top of branch "release-1.20":

Applying: Expose https://github.com/istio/istio/pull/47444 to istioctl
Using index info to reconstruct a base tree...
M	manifests/charts/istio-cni/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/charts/istio-cni/values.yaml
CONFLICT (content): Merge conflict in manifests/charts/istio-cni/values.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Expose https://github.com/istio/istio/pull/47444 to istioctl
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@istio-testing
Copy link
Collaborator

@bleggett: new issue created for failed cherrypick: #47523

In response to this:

/cherry-pick release-1.20

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

bleggett added a commit to bleggett/istio that referenced this pull request Oct 23, 2023
Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io>
istio-testing pushed a commit that referenced this pull request Oct 23, 2023
…ikube issue (#47524)

* Fix for #46163 - Make `netns` host node path configurable (#47444)

* Fix for #46163

Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io>

* Release notes

Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io>

---------

Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io>

* Expose #47444 to istioctl (#47499)

Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io>

---------

Signed-off-by: Benjamin Leggett <benjamin.leggett@solo.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/environments area/user experience release-notes-none Indicates a PR that does not require release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants