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.

Sign up for GitHub

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

Ensure certgen handles already-existing secrets correctly #2178

Merged
merged 1 commit into from
Jan 30, 2020
Merged

Ensure certgen handles already-existing secrets correctly #2178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions internal/certgen/certgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"fmt"
"path"

k8serrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/kubernetes"
)

Expand Down Expand Up @@ -101,8 +102,11 @@ func writeCACertSecret(outputDir, namespace string, cert []byte) error {

func writeCACertKube(client *kubernetes.Clientset, namespace string, cert []byte) error {
secret := newCertOnlySecret("cacert", namespace, "cacert.pem", cert)
_, err := client.CoreV1().Secrets(namespace).Create(secret)
if err != nil {
if _, err := client.CoreV1().Secrets(namespace).Create(secret); err != nil {
if k8serrors.IsAlreadyExists(err) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: would this style be more canonical?

if _, err := client.CoreV1().Secrets(namespace).Create(secret); if err != nil {
        ...
}

Copy link
Member Author

Choose a reason for hiding this comment

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

Won't hurt. I'll change it.

fmt.Print("secret/cacert already exists\n")
return nil
}
return err
}
fmt.Print("secret/cacert created\n")
Expand All @@ -126,8 +130,11 @@ func writeKeyPairSecret(outputDir, service, namespace string, cert, key []byte)
func writeKeyPairKube(client *kubernetes.Clientset, service, namespace string, cert, key []byte) error {
secretname := service + "cert"
secret := newTLSSecret(secretname, namespace, key, cert)
_, err := client.CoreV1().Secrets(namespace).Create(secret)
if err != nil {
if _, err := client.CoreV1().Secrets(namespace).Create(secret); err != nil {
if k8serrors.IsAlreadyExists(err) {
fmt.Printf("secret/%s already exists\n", secretname)
return nil
}
return err
}
fmt.Printf("secret/%s created\n", secretname)
Expand Down