Skip to content
This repository was archived by the owner on Feb 22, 2022. It is now read-only.

[stable/jenkins] Revert direct connection fix in previous version #18490

Merged
k8s-ci-robot merged 2 commits into from
Nov 6, 2019
Merged

[stable/jenkins] Revert direct connection fix in previous version #18490

k8s-ci-robot merged 2 commits into from
Nov 6, 2019

Conversation

@bergemalm
Copy link
Contributor

@bergemalm bergemalm commented Oct 31, 2019 •
edited
Loading

What this PR does / why we need it:

Fix created for direct connection enabled by default in kubernetes plugin version 1.20.2 is no longer needed (#18410). It was changed upstream to default to disabled in version 1.21.1 jenkinsci/kubernetes-plugin#633

Which issue this PR fixes

Skips setting direct connect to false.

Special notes for your reviewer:

Reverting still causes issues if you happen to install 1.20.2 and using this helm chart. Also, not specifying the option at all makes

<directConnection>false</directConnection>

being injected to config.xml with each pod start without being handled by helm chart.

I don't think it's possible to configure this option via JCasC atm either.

Alternative would be to keep it but also adding the option if latest version of kubernetes plugin is specified, since it caused issues with semver comparison.

Checklist

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [stable/mychartname])

@helm-bot helm-bot added Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 31, 2019
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Oct 31, 2019

Hi @bergemalm. Thanks for your PR.

I'm waiting for a helm 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.

Details

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 31, 2019
@k8s-ci-robot k8s-ci-robot requested review from maorfr and mogaal October 31, 2019 16:48
@bergemalm
Copy link
Contributor Author

bergemalm commented Oct 31, 2019

/assign @torstenwalter

@zanhsieh
Copy link
Collaborator

zanhsieh commented Nov 1, 2019

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 1, 2019
@bergemalm
Copy link
Contributor Author

bergemalm commented Nov 1, 2019

/retest

1 similar comment
@bergemalm
Copy link
Contributor Author

bergemalm commented Nov 4, 2019

/retest

@bergemalm bergemalm mentioned this pull request Nov 4, 2019
Closed
@bergemalm
Copy link
Contributor Author

bergemalm commented Nov 4, 2019

Ping @torstenwalter - we need to get this in since the added semVer compare causes various issues for people...
Sorry for the noise.

@torstenwalter
Copy link
Collaborator

torstenwalter commented Nov 5, 2019

@bergemalm Can you rebase it on master?

@bergemalm
Copy link
Contributor Author

bergemalm commented Nov 5, 2019

@bergemalm Can you rebase it on master?

Sure

@bergemalm bergemalm force-pushed the remove-disable-direct-connection branch from 8101ecb to 7a4e05c Compare November 5, 2019 18:26
@bergemalm
Copy link
Contributor Author

bergemalm commented Nov 5, 2019

Done. @torstenwalter

@torstenwalter
Copy link
Collaborator

torstenwalter commented Nov 5, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 5, 2019
@HerrmannHinz
Copy link

HerrmannHinz commented Nov 5, 2019

@mogaal @maorfr could you please review? :D

@torstenwalter
Copy link
Collaborator

torstenwalter commented Nov 5, 2019

/retest

@torstenwalter
Copy link
Collaborator

torstenwalter commented Nov 5, 2019

@bergemalm GitHub is still complaining about conflicting CHANGELOG file.

@bergemalm
Copy link
Contributor Author

bergemalm commented Nov 6, 2019

@bergemalm GitHub is still complaining about conflicting CHANGELOG file.

Yes, well another version of this chart was merged. Updating again...

@bergemalm
Revert direct connection fix in previous version since it has been ch…
2641f56 
…anged to disabled by default

Signed-off-by: Mikael Bergemalm <mbergemalm@gmail.com>
@bergemalm bergemalm force-pushed the remove-disable-direct-connection branch from 7a4e05c to 2641f56 Compare November 6, 2019 05:57
@k8s-ci-robot k8s-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 6, 2019
@bergemalm
Bump chart version
3e83add 
Signed-off-by: Mikael Bergemalm <mbergemalm@gmail.com>
@bergemalm
Copy link
Contributor Author

bergemalm commented Nov 6, 2019

Rebased again. @torstenwalter

@torstenwalter
Copy link
Collaborator

torstenwalter commented Nov 6, 2019

/ok-to-test

@torstenwalter
Copy link
Collaborator

torstenwalter commented Nov 6, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 6, 2019
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 6, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bergemalm, torstenwalter

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit 3b61dd4 into helm:master Nov 6, 2019
@bergemalm bergemalm mentioned this pull request Nov 6, 2019
Merged
JoseAlban pushed a commit to JoseAlban/charts that referenced this pull request Nov 22, 2019
@bergemalm
[stable/jenkins] Revert direct connection fix in previous version (he…
ab953de 
…lm#18490)

* Revert direct connection fix in previous version since it has been changed to disabled by default

Signed-off-by: Mikael Bergemalm <mbergemalm@gmail.com>

* Bump chart version

Signed-off-by: Mikael Bergemalm <mbergemalm@gmail.com>
hakman pushed a commit to hakman/charts that referenced this pull request Dec 5, 2019
@bergemalm
[stable/jenkins] Revert direct connection fix in previous version (he…
44b30d5 
…lm#18490)

* Revert direct connection fix in previous version since it has been changed to disabled by default

Signed-off-by: Mikael Bergemalm <mbergemalm@gmail.com>

* Bump chart version

Signed-off-by: Mikael Bergemalm <mbergemalm@gmail.com>
wmcdona89 pushed a commit to wmcdona89/charts that referenced this pull request Aug 30, 2020
@bergemalm @k8s-ci-robot
[stable/jenkins] Revert direct connection fix in previous version (he…
712173a 
…lm#18490)

* Revert direct connection fix in previous version since it has been changed to disabled by default

Signed-off-by: Mikael Bergemalm <mbergemalm@gmail.com>

* Bump chart version

Signed-off-by: Mikael Bergemalm <mbergemalm@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@maorfr maorfr Awaiting requested review from maorfr

@mogaal mogaal Awaiting requested review from mogaal

Assignees

@torstenwalter torstenwalter

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. Contribution Allowed If the contributor has signed the DCO or the CNCF CLA (prior to the move to a DCO). lgtm Indicates that a PR is ready to be merged. ok-to-test 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.

6 participants

@bergemalm @k8s-ci-robot @zanhsieh @torstenwalter @HerrmannHinz @helm-bot