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 ISTIO_DELTA_XDS in compatibility version 1.21 profile #52119

Merged
merged 1 commit into from
Jul 17, 2024
Merged

fix ISTIO_DELTA_XDS in compatibility version 1.21 profile #52119

merged 1 commit into from
Jul 17, 2024

Conversation

antoinedeschenes
Copy link
Contributor

@antoinedeschenes antoinedeschenes commented Jul 17, 2024 •
edited
Loading

Please provide a description of this PR:

Compatibility profile for v1.21 wouldn't disable delta XDS correctly.

proxyMetadata should be under meshConfig.defaultConfig in the meshConfig.

Current behavior:

      - name: PROXY_CONFIG
        value: |
          {"tracing":{"zipkin":{"address":"zipkin.istio-system:9411"}},"proxyMetadata":{"ISTIO_META_DNS_CAPTURE":"true"},"gatewayTopology":{"numTrustedProxies":2},"meshId":"my-mesh","holdApplicationUntilProxyStarts":true}

After patching:

      - name: PROXY_CONFIG
        value: |
          {"tracing":{"zipkin":{"address":"zipkin.istio-system:9411"}},"proxyMetadata":{"ISTIO_DELTA_XDS":"false","ISTIO_META_DNS_CAPTURE":"true"},"gatewayTopology":{"numTrustedProxies":2},"meshId":"my-mesh","holdApplicationUntilProxyStarts":true}

@antoinedeschenes antoinedeschenes requested a review from a team as a code owner July 17, 2024 18:22
@istio-policy-bot istio-policy-bot added area/environments area/upgrade Issues related to upgrades labels Jul 17, 2024
@istio-policy-bot
Copy link

😊 Welcome @antoinedeschenes! This is either your first contribution to the Istio istio repo, or it's been
a while since you've been here.

You can learn more about the Istio working groups, Code of Conduct, and contribution guidelines
by referring to Contributing to Istio.

Thanks for contributing!

Courtesy of your friendly welcome wagon.

@istio-testing istio-testing added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. needs-ok-to-test labels Jul 17, 2024
@istio-testing
Copy link
Collaborator

Hi @antoinedeschenes. Thanks for your PR.

I'm waiting for a istio member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-sigs/prow repository.

@antoinedeschenes
fix ISTIO_DELTA_XDS in compatibility version 1.21 profile
9703c07 
Signed-off-by: Antoine Deschênes <antoine.deschenes@linux.com>
@antoinedeschenes antoinedeschenes force-pushed the fix/compatibility-profile-1.21-delta-xds branch from 2e987e9 to 9703c07 Compare July 17, 2024 18:29
howardjohn
howardjohn approved these changes Jul 17, 2024
View reviewed changes
Copy link
Member

@howardjohn howardjohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you!

@howardjohn
Copy link
Member

/ok-to-test

@istio-testing istio-testing added ok-to-test Set this label allow normal testing to take place for a PR not submitted by an Istio org member. and removed needs-ok-to-test labels Jul 17, 2024
@antoinedeschenes
Copy link
Contributor Author

Should I fill a release note?

@howardjohn howardjohn added release-notes-none Indicates a PR that does not require release notes. cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch labels Jul 17, 2024
@howardjohn
Copy link
Member

In this case its probably small enough to elide. Thanks for the fix!

/retest

@howardjohn
Copy link
Member

/test integ-operator-controller_istio

@istio-testing
Copy link
Collaborator

@howardjohn: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test bookinfo-build
  • /test gencheck
  • /test integ-ambient
  • /test integ-basic-arm64
  • /test integ-cni
  • /test integ-distroless
  • /test integ-ds
  • /test integ-helm
  • /test integ-ipv6
  • /test integ-pilot
  • /test integ-pilot-istiodremote
  • /test integ-pilot-istiodremote-mc
  • /test integ-pilot-multicluster
  • /test integ-security
  • /test integ-security-istiodremote
  • /test integ-security-multicluster
  • /test integ-telemetry
  • /test integ-telemetry-discovery
  • /test integ-telemetry-istiodremote
  • /test integ-telemetry-mc
  • /test lint
  • /test macbuildcheck
  • /test release-notes
  • /test release-test
  • /test unit-tests
  • /test unit-tests-arm64

The following commands are available to trigger optional jobs:

  • /test benchmark
  • /test experimental-tracing
  • /test integ-ambient-calico
  • /test integ-ambient-dual
  • /test integ-ambient-ipv6
  • /test integ-assertion

Use /test all to run the following jobs that were automatically triggered:

  • gencheck_istio
  • integ-ambient_istio
  • integ-basic-arm64_istio
  • integ-cni_istio
  • integ-distroless_istio
  • integ-ds_istio
  • integ-helm_istio
  • integ-ipv6_istio
  • integ-pilot-istiodremote-mc_istio
  • integ-pilot-istiodremote_istio
  • integ-pilot-multicluster_istio
  • integ-pilot_istio
  • integ-security-istiodremote_istio
  • integ-security-multicluster_istio
  • integ-security_istio
  • integ-telemetry-discovery_istio
  • integ-telemetry-istiodremote_istio
  • integ-telemetry-mc_istio
  • integ-telemetry_istio
  • lint_istio
  • macbuildcheck_istio
  • release-notes_istio
  • release-test_istio
  • unit-tests-arm64_istio
  • unit-tests_istio

In response to this:

/test integ-operator-controller_istio

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-sigs/prow repository.

@istio-testing istio-testing merged commit 762f69b into istio:master Jul 17, 2024
27 checks passed
@dhawton
Copy link
Member

dhawton commented Jul 22, 2024

/cherry-pick release-1.23

@dhawton
Copy link
Member

dhawton commented Jul 22, 2024

/cherry-pick release-1.22

@istio-testing istio-testing mentioned this pull request Jul 22, 2024
Merged
@istio-testing
Copy link
Collaborator

@dhawton: new pull request created: #52240

In response to this:

/cherry-pick release-1.23

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-sigs/prow repository.

@istio-testing
Copy link
Collaborator

@dhawton: new pull request created: #52241

In response to this:

/cherry-pick release-1.22

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-sigs/prow repository.

@istio-testing istio-testing mentioned this pull request Jul 22, 2024
Merged
luksa pushed a commit to luksa/istio that referenced this pull request Oct 14, 2024
Automator: merge upstream changes to openshift-service-mesh/istio@master
2185538 
* upstream/master:
  install: drop legacy k8s provider (istio#52116)
  ambient chart: bikeshed enablement (istio#52061)
  Fix and tests globals for ztunnel when installed via istioctl (istio#52133)
  Istio version bump to 1.24 for release 1.23 (istio#52129)
  architecture: add document on ztunnel lifecycle (istio#51805)
  Automator: update proxy@master in istio/istio@master (istio#52124)
  Automator: update istio/client-go@master dependency in istio/istio@master (istio#52123)
  Automator: update common-files@master in istio/istio@master (istio#52122)
  fix ISTIO_DELTA_XDS in compatibility version 1.21 profile (istio#52119)
  Automator: update ztunnel@master in istio/istio@master (istio#52120)
  Drop unused pkg/cache package (istio#52118)
  Automator: update proxy@master in istio/istio@master (istio#52115)
  Automated branching for 1.23 missed https://github.com/istio/release-builder/tree/c4b2830c95b537e3a70b1b5c83b529ab3eb2d3ae (istio#52094)
  networking: match multiple VIPs in sidecar outbound listener (istio#51967)
  Dedupe IAC handling and fix multiple nets case. (istio#52038)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@howardjohn howardjohn howardjohn approved these changes

Assignees
No one assigned
Labels
area/environments area/upgrade Issues related to upgrades cherrypick/release-1.22 Set this label on a PR to auto-merge it to the release-1.22 branch cherrypick/release-1.23 Set this label on a PR to auto-merge it to the release-1.23 branch ok-to-test Set this label allow normal testing to take place for a PR not submitted by an Istio org member. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@antoinedeschenes @istio-policy-bot @istio-testing @howardjohn @dhawton