Skip to content

feat: allow to add annotations to secret (#15) #18

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

Draft
poilade-de-coulemelle wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: allow to add annotations to secret (#15) #18

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions api/v1alpha1/postgresrole_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ type PostgresRoleSpec struct {
PasswordFromSecret *PostgresRolePasswordFromSecret `json:"passwordFromSecret,omitempty"`
SecretName string `json:"secretName,omitempty"`
SecretTemplate map[string]string `json:"secretTemplate,omitempty"`
SecretAnnotations map[string]string `json:"secretAnnotations,omitempty"`

MemberOfRoles []string `json:"memberOfRoles,omitempty"`

Expand Down
7 changes: 7 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions deploy/crds/managed-postgres-operator.hoppscale.com_postgresroles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ spec:
type: object
replication:
type: boolean
secretAnnotations:
additionalProperties:
type: string
type: object
secretName:
type: string
secretTemplate:
Expand Down
18 changes: 15 additions & 3 deletions internal/controller/postgresrole_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@

resource := &managedpostgresoperatorhoppscalecomv1alpha1.PostgresRole{}

if err := r.Client.Get(ctx, req.NamespacedName, resource); err != nil {

Check failure on line 72 in internal/controller/postgresrole_controller.go

View workflow job for this annotation

GitHub Actions / Run on Ubuntu 

QF1008: could remove embedded field "Client" from selector (staticcheck)
return r.Result(client.IgnoreNotFound(err))
}

// Skip reconcile if the resource is not managed by this operator
if !utils.IsManagedByOperatorInstance(resource.ObjectMeta.Annotations, r.OperatorInstanceName) {

Check failure on line 77 in internal/controller/postgresrole_controller.go

View workflow job for this annotation

GitHub Actions / Run on Ubuntu 

QF1008: could remove embedded field "ObjectMeta" from selector (staticcheck)
return r.Result(nil)
}

Expand Down Expand Up @@ -156,6 +156,7 @@
resource.ObjectMeta.Namespace,
resource.Spec.SecretName,
resource.Spec.SecretTemplate,
resource.Spec.SecretAnnotations,
&desiredRole,
r.PGPools.Default.Config().ConnConfig,
)
Expand Down Expand Up @@ -337,7 +338,7 @@
return err
}

func (r *PostgresRoleReconciler) reconcileRoleSecret(secretNamespace, secretName string, secretTemplate map[string]string, role *postgresql.Role, pgConfig *pgx.ConnConfig) (err error) {
func (r *PostgresRoleReconciler) reconcileRoleSecret(secretNamespace, secretName string, secretTemplate map[string]string, secretAnnotations map[string]string, role *postgresql.Role, pgConfig *pgx.ConnConfig) (err error) {
// Do not create Secret if no name provided by the user
if secretName == "" {
return err
Expand Down Expand Up @@ -382,7 +383,7 @@
}

// Retrieve Secret
err = r.Client.Get(context.Background(), secretNamespacedName, resourceSecret)

Check failure on line 386 in internal/controller/postgresrole_controller.go

View workflow job for this annotation

GitHub Actions / Run on Ubuntu 

QF1008: could remove embedded field "Client" from selector (staticcheck)
if err != nil && !errors.IsNotFound(err) {
return fmt.Errorf("failed to retrieve secret: %s", err)
}
Expand All @@ -391,8 +392,9 @@
if errors.IsNotFound(err) {
resourceSecret = &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Namespace: secretNamespace,
Name: secretName,
Namespace: secretNamespace,
Name: secretName,
Annotations: secretAnnotations,
Labels: map[string]string{
"app.kubernetes.io/managed-by": "managed-postgres-operator.hoppscale.com",
},
Expand Down Expand Up @@ -421,6 +423,16 @@
toUpdate = true
}

if resourceSecret.ObjectMeta.Annotations == nil {
resourceSecret.ObjectMeta.Annotations = make(map[string]string)
}
for k, v := range secretAnnotations {
if val, ok := resourceSecret.ObjectMeta.Annotations[k]; !ok || val != v {
resourceSecret.ObjectMeta.Annotations[k] = v
toUpdate = true
}
}

if fmt.Sprint(resourceSecret.Data) != fmt.Sprint(desiredSecretData) {
toUpdate = true
resourceSecret.Data = desiredSecretData
Expand Down
3 changes: 3 additions & 0 deletions internal/controller/postgresrole_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ var _ = Describe("PostgresRole Controller", func() {
"default",
"db-config-myrole",
make(map[string]string),
make(map[string]string),
&role,
pgConfig,
)
Expand Down Expand Up @@ -299,6 +300,7 @@ var _ = Describe("PostgresRole Controller", func() {
"default",
"db-config-myrole",
secretTemplate,
make(map[string]string),
&role,
pgConfig,
)
Expand Down Expand Up @@ -816,6 +818,7 @@ var _ = Describe("PostgresRole Controller", func() {
"default",
"db-config-myrole",
make(map[string]string),
make(map[string]string),
&role,
pgConfig,
)
Expand Down
Loading