Improve UX around setting Proxy configurations in the spec #69
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maci3jka
force-pushed
the
KU-1801/containerd-poxy-settings
branch
from
28aa139 to
a0b9e29
Compare
berkayoz
reviewed
Oct 14, 2024
There was a problem hiding this comment.
LGTM overall, I have one nit/question.
@bschimke95 Should we follow the k8s-operator approach of adding these variables to /etc/environment instead? If not we should make the variables reflect this is only for containerd.
maci3jka
force-pushed
the
KU-1801/containerd-poxy-settings
branch
from
214cc8f to
a7db9a6
Compare
eaudetcobello
requested changes
Oct 16, 2024
maci3jka
commented
Oct 17, 2024
berkayoz
reviewed
Oct 17, 2024
review fixes
berkayoz
approved these changes
Oct 18, 2024
pkg/cloudinit/common.go
Outdated
| }) | ||
| } | ||
|
|
||
| if len(files) == 0 { |
There was a problem hiding this comment.
I think this is unnecessary, zero value of a slice is nil already.
https://go.dev/tour/moretypes/12
Comment on lines
10
to
31
|
|
||
|
|
||
|
|
||
| if [ -f ${HTTP_PROXY_FILE} ]; then | ||
| HTTP_PROXY=$(cat ${HTTP_PROXY_FILE}) | ||
| echo "http_proxy=${HTTP_PROXY}" >> "${ENVIRONMENT_FILE}" | ||
| echo "HTTP_PROXY=${HTTP_PROXY}" >> "${ENVIRONMENT_FILE}" | ||
| fi | ||
|
|
||
|
|
||
| if [ -f ${HTTPS_PROXY_FILE} ]; then | ||
| HTTPS_PROXY=$(cat ${HTTPS_PROXY_FILE}) | ||
| echo "https_proxy=${HTTPS_PROXY}" >> "${ENVIRONMENT_FILE}" | ||
| echo "HTTPS_PROXY=${HTTPS_PROXY}" >> "${ENVIRONMENT_FILE}" | ||
| fi | ||
|
|
||
|
|
||
| if [ -f ${NO_PROXY_FILE} ]; then | ||
| NO_PROXY=$(cat ${NO_PROXY_FILE}) | ||
| echo "no_proxy=${NO_PROXY}" >> "${ENVIRONMENT_FILE}" | ||
| echo "NO_PROXY=${NO_PROXY}" >> "${ENVIRONMENT_FILE}" | ||
| fi |
There was a problem hiding this comment.
Can you make it so there are only 1 line between the if's? Same thing between lines 9 and 13.
eaudetcobello
approved these changes
Oct 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR introduces
httpProxy,httpsProxy,noProxyparameters that adds support for proxy settings for contained in k8s. Provides functionality mentioned in k8s docs.KU-1801