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

add privateCA support for containerd images #2079

Merged
merged 15 commits into from
Jan 19, 2024

Conversation

pgvishnuram
Copy link
Contributor

@pgvishnuram pgvishnuram commented Jan 2, 2024

Description

Adds the ability to support privateCA for containerd images

Related Issues

https://github.com/astronomer/issues/issues/6022

Testing

tested on AWS, GCP, Azure, local clusters

Merging

release-0.34

@rishkarajgi rishkarajgi marked this pull request as ready for review January 17, 2024 07:47
@rishkarajgi rishkarajgi requested a review from a team as a code owner January 17, 2024 07:47
Copy link
Contributor

@rishkarajgi rishkarajgi left a comment

Choose a reason for hiding this comment

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

Please add tests to this change

data:
update-containerd-certs.sh: |
#!/usr/bin/env sh
if [ ! -f /hostcontainerd/config.toml ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

theoretically I think this file could be totally absent and need to be created, but if we have tested on Azure, AWS, and GCP I'm fine with crossing that bridge when we come to it. In reality, I would expect it always exists.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes this file always exists in all cloud provider only difference is the content

values.yaml Outdated
@@ -19,6 +19,10 @@ global:
privateCaCertsAddToHost:
enabled: false
hostDirectory: /etc/docker/certs.d
addToContainerd: false
containerdConfigPath: /etc/containerd/certs.d
Copy link
Contributor

Choose a reason for hiding this comment

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

key name should be something else as that sounds like the path that should put to containerd.toml itself. Maybe rename to containerdCertsConfigPath or similar?

@@ -19,6 +19,10 @@ global:
privateCaCertsAddToHost:
enabled: false
hostDirectory: /etc/docker/certs.d
addToContainerd: false
containerdConfigPath: /etc/containerd/certs.d
containerdnodeAffinitys: []
Copy link
Contributor

Choose a reason for hiding this comment

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

Are these actually templated into the daemonset anywhere?

@rishkarajgi rishkarajgi changed the title [WIP] containerd ca support add privateCA support for containerd images Jan 18, 2024
Copy link
Contributor

@rob-1126 rob-1126 left a comment

Choose a reason for hiding this comment

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

Needs to be tested in QA on all three major cloud-providers as part of the release process for both new install and upgrade path.

@rishkarajgi
Copy link
Contributor

Needs to be tested in QA on all three major cloud-providers as part of the release process for both new install and upgrade path.

cc: @himabindu07 @Priyanka13Astro

@rishkarajgi rishkarajgi merged commit b143df4 into master Jan 19, 2024
7 of 8 checks passed
@rishkarajgi rishkarajgi deleted the 6022-containerd-private-ca-support branch January 19, 2024 06:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants