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

Optional secret #2897

Closed
wants to merge 9 commits into from
Closed

Conversation

prary
Copy link
Contributor

@prary prary commented Sep 17, 2019

pull secret should be optional
Resolving issue #2888

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and then comment @googlebot I fixed it.. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@@ -210,13 +210,13 @@ func setDefaultClusterTimeout(cluster *latest.ClusterDetails) error {
}

func setDefaultClusterPullSecret(cluster *latest.ClusterDetails) error {
cluster.PullSecretName = valueOrDefault(cluster.PullSecretName, constants.DefaultKanikoSecretName)
if cluster.PullSecret != "" {
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
if cluster.PullSecret != "" {
if cluster.PullSecret != "" && cluster.PullSecretName != "" {

Copy link
Contributor

Choose a reason for hiding this comment

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

Also add tests

Copy link
Contributor Author

Choose a reason for hiding this comment

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

cluster.PullSecretName != ""
this could be skipped by user when user wants pullsecret to be created as constants.DefaultKanikoSecretName i.e kaniko-secret.
observe the below line
cluster.PullSecretName = valueOrDefault(cluster.PullSecretName, constants.DefaultKanikoSecretName)

},
}
if clusterDetails.PullSecretName != "" {
VolumeMount := v1.VolumeMount{
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: let's call this variable volumeMount to match current style

MountPath: "/secret",
}
pod.Spec.Containers[0].VolumeMounts = append(pod.Spec.Containers[0].VolumeMounts, VolumeMount)
Volume := v1.Volume{
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: call this variable v or volume

This was referenced Sep 18, 2019
@prary prary closed this Sep 19, 2019
@prary prary deleted the optional_secret branch September 19, 2019 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants