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

Fix support for ca-bundle #399

Merged
merged 2 commits into from
Jul 4, 2024

Conversation

ahmedwaleedmalik
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik commented Jul 4, 2024

What this PR does / why we need it:
This PR fixes the ca-bundle flag/support in OSM. This flag is used to override the PKI certs for Kubernetes. Although in our other tools like machine-controller, KubeOne, the functionality is a bit different and this is used to override the CA certs for the host and in-code clients that communicate with external services.

To clear this ambiguity, we have to split it into kubernetes-ca-bundle and host-ca-bundle flags to make it coherent and self-explanatory. The flag ca-bundle has been deprecated and made no-op.

Which issue(s) this PR fixes:

Fixes #235

What type of PR is this?

/kind feature
/kind deprecation

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

* Introduce `kubernetes-ca-bundle` and `host-ca-bundle` to propgate custom CA certs to kubernetes worker node and the machine itself, respectively.
* The flag `ca-bundle` has been deprecated and is now no-op. Please use `kubernetes-ca-bundle` or `host-ca-bundle` instead.

Documentation:

NONE

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
@ahmedwaleedmalik ahmedwaleedmalik self-assigned this Jul 4, 2024
@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 4, 2024
@ahmedwaleedmalik ahmedwaleedmalik changed the title WIP: Fix support for ca-bundle Fix support for ca-bundle Jul 4, 2024
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. docs/none Denotes a PR that doesn't need documentation (changes). and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/docs-needed Indicates that a PR should not merge because it's missing one of the documentation labels. labels Jul 4, 2024
@ahmedwaleedmalik ahmedwaleedmalik added the needs-release-testing Denotes a PR or issue that needs to be tested before release. label Jul 4, 2024
Copy link
Member

@kron4eg kron4eg left a comment

Choose a reason for hiding this comment

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

Found few forgotten names.

cmd/osm-controller/main.go Show resolved Hide resolved
cmd/osm-controller/main.go Outdated Show resolved Hide resolved
cmd/osm-controller/main.go Outdated Show resolved Hide resolved
Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
Copy link
Member

@kron4eg kron4eg left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jul 4, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: f5109822da30207a9842a8e00313408cdb92fad5

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

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

The pull request process is described here

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 4, 2024
@kubermatic-bot kubermatic-bot merged commit 65ba1eb into kubermatic:main Jul 4, 2024
11 checks passed
@ahmedwaleedmalik ahmedwaleedmalik deleted the ca-bundle branch July 4, 2024 13:03
@kron4eg
Copy link
Member

kron4eg commented Sep 19, 2024

/cherrypick release/v1.5

@kubermatic-bot
Copy link
Contributor

@kron4eg: #399 failed to apply on top of branch "release/v1.5":

Applying: Fix support for ca-bundle
Using index info to reconstruct a base tree...
M	cmd/osm-controller/main.go
M	deploy/osps/default/osp-ubuntu.yaml
M	go.mod
M	go.sum
M	pkg/controllers/osc/osc_controller.go
M	pkg/controllers/osc/resources/operating_system_config.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controllers/osc/resources/operating_system_config.go
Auto-merging pkg/controllers/osc/osc_controller.go
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging deploy/osps/default/osp-ubuntu.yaml
Auto-merging cmd/osm-controller/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix support for ca-bundle
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:

/cherrypick release/v1.5

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.

kron4eg pushed a commit to kron4eg/operating-system-manager that referenced this pull request Sep 20, 2024
* Fix support for ca-bundle

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>

* Add support for custom ca-bundle in all the OSPs

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>

---------

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
Signed-off-by: Artiom Diomin <artiom@kubermatic.com>
kubermatic-bot pushed a commit that referenced this pull request Sep 20, 2024
* Fix support for ca-bundle



* Add support for custom ca-bundle in all the OSPs



---------

Signed-off-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
Signed-off-by: Artiom Diomin <artiom@kubermatic.com>
Co-authored-by: Waleed Malik <ahmedwaleedmalik@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). lgtm Indicates that a PR is ready to be merged. needs-release-testing Denotes a PR or issue that needs to be tested before release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for Custom CA by default
3 participants