Introduce masterServiceAnnotations & replicaServiceAnnotations
#2161
Conversation
This file contains hidden or 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
09b2b36 to
3725471
Compare
FxKu
reviewed
Jan 6, 2023
FxKu
reviewed
Jan 6, 2023
FxKu
reviewed
Jan 6, 2023
|
Could you add the new field also to the CRD schema (please, follow alphabetical sorting) |
owenthereal
added a commit
to owenthereal/postgres-operator
that referenced
this pull request
Jan 6, 2023
First, global config, then ServiceAnnotations overriding, then MasterServiceAnnotations and ReplicaServiceAnnotations. This addresses zalando#2161 (comment).
FxKu
reviewed
Jan 9, 2023
FxKu
reviewed
Jan 9, 2023
FxKu
reviewed
Jan 9, 2023
owenthereal
added a commit
to owenthereal/postgres-operator
that referenced
this pull request
Jan 9, 2023
First, global config, then ServiceAnnotations overriding, then MasterServiceAnnotations and ReplicaServiceAnnotations. This addresses zalando#2161 (comment).
fc96e71 to
1a5a7a2
Compare
owenthereal
added a commit
to owenthereal/postgres-operator
that referenced
this pull request
Jan 9, 2023
dmvolod
reviewed
Jan 10, 2023
Comment on lines
48
to
52
| // import ( | ||
| // "k8s.io/client-go/kubernetes" | ||
| // clientsetscheme "k8s.io/client-go/kubernetes/scheme" | ||
| // aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" | ||
| // ) |
There was a problem hiding this comment.
@owenthereal what is your golang version installed. For 1.17 and 1.18 generated files should not be changed
There was a problem hiding this comment.
I'm using 1.19 locally. I regenerated the code with 1.18 in 3fb0b42.
It would be nice to introduce https://asdf-vm.com or the like to this project to auto-switch or prompt to install the right Go version.
There was a problem hiding this comment.
Not sure we need an additional tools for that, as golang supports multiple versions management by itself
https://go.dev/doc/manage-install
As an option, some validation steps with autogeneration/formatting/linting can be added as part of the #2135
dmvolod
reviewed
Jan 10, 2023
pkg/cluster/k8sres.go
Outdated
| @@ -2380,3 +2384,18 @@ func ensurePath(file string, defaultDir string, defaultFile string) string { | |||
| } | |||
| return file | |||
| } | |||
|
|
|||
| // mergeAnnotations merged annotations that entries in b override the ones in a. | |||
| func mergeAnnotations(a, b map[string]string) map[string]string { | |||
There was a problem hiding this comment.
I read about maps.Copy yesterday. We would not need this function then and could do it in the code. Sounds good to me.
There was a problem hiding this comment.
Good call! Switched to use maps.Copy in 3fb0b42
Introduce `masterServiceAnnotations` & `replicaServiceAnnotations` to the `Postgresql` CRD. `masterServiceAnnotations` overrides `serviceAnnotations` for master role if not empty. `replicaServiceAnnotations` overrides `serviceAnnotations` for replica role if not empty. Existing definition of `serviceAnnotations` continue to work for backward compatibitlity when neither `masterServiceAnnotations` nor `replicaServiceAnnotations` is defined. This closes zalando#1927
First, global config, then ServiceAnnotations overriding, then MasterServiceAnnotations and ReplicaServiceAnnotations. This addresses zalando#2161 (comment).
Co-authored-by: Felix Kunde <felix-kunde@gmx.de>
Co-authored-by: Felix Kunde <felix-kunde@gmx.de>
Co-authored-by: Felix Kunde <felix-kunde@gmx.de>
|
👍 |
1 similar comment
|
👍 |
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.
Introduce
masterServiceAnnotations&replicaServiceAnnotationsto thePostgresqlCRD. The following behavior is implementedmasterServiceAnnotationstakes precedence overserviceAnnotationsfor master service if not empty.replicaServiceAnnotationstakes precedence overserviceAnnotationsfor replica service if not empty.serviceAnnotationscontinue to work for backward compatibility when neithermasterServiceAnnotationsnorreplicaServiceAnnotationsare defined.This closes #1927