-
Notifications
You must be signed in to change notification settings - Fork 176
K8SPSMDB-1503: include horizon domains in certificates #2157
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
Merged
Merged
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
73d5aa1
K8SPSMDB-1503: include horizon domains in certificates
pooknull 24c6098
fix `GetHorizons` method
pooknull b2ba61c
add unit-test
pooknull a322f9a
add get certificate sans unit-test
pooknull f6f7d55
prepare split-horizon e2e test
pooknull a5a7a21
update split-horizon test
pooknull 45e1e78
Merge branch 'main' into K8SPSMDB-1503
pooknull c3f04e8
deduplicate
pooknull de7a239
address copilot comments
pooknull d63d7c4
Merge branch 'main' into K8SPSMDB-1503
pooknull a7f4077
Merge branch 'main' into K8SPSMDB-1503
hors File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
e2e-tests/split-horizon/compare/certificate_some-name-ca-cert.yml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| apiVersion: cert-manager.io/v1 | ||
| kind: Certificate | ||
| metadata: | ||
| annotations: {} | ||
| generation: 1 | ||
| labels: | ||
| app.kubernetes.io/instance: some-name | ||
| app.kubernetes.io/managed-by: percona-server-mongodb-operator | ||
| app.kubernetes.io/name: percona-server-mongodb | ||
| app.kubernetes.io/part-of: percona-server-mongodb | ||
| name: some-name-ca-cert | ||
| ownerReferences: | ||
| - blockOwnerDeletion: true | ||
| controller: true | ||
| kind: PerconaServerMongoDB | ||
| name: some-name | ||
| spec: | ||
| commonName: some-name-ca | ||
| duration: 8760h0m0s | ||
| isCA: true | ||
| issuerRef: | ||
| kind: Issuer | ||
| name: some-name-psmdb-ca-issuer | ||
| renewBefore: 730h0m0s | ||
| secretName: some-name-ca-cert |
56 changes: 56 additions & 0 deletions
56
e2e-tests/split-horizon/compare/certificate_some-name-ssl-internal.yml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| apiVersion: cert-manager.io/v1 | ||
| kind: Certificate | ||
| metadata: | ||
| annotations: {} | ||
| generation: 1 | ||
| labels: | ||
| app.kubernetes.io/instance: some-name | ||
| app.kubernetes.io/managed-by: percona-server-mongodb-operator | ||
| app.kubernetes.io/name: percona-server-mongodb | ||
| app.kubernetes.io/part-of: percona-server-mongodb | ||
| name: some-name-ssl-internal | ||
| ownerReferences: | ||
| - blockOwnerDeletion: true | ||
| controller: true | ||
| kind: PerconaServerMongoDB | ||
| name: some-name | ||
| spec: | ||
| commonName: some-name | ||
| dnsNames: | ||
| - localhost | ||
| - some-name-rs0 | ||
| - some-name-rs0.NAME_SPACE | ||
| - some-name-rs0.NAME_SPACE.svc.cluster.local | ||
| - '*.some-name-rs0' | ||
| - '*.some-name-rs0.NAME_SPACE' | ||
| - '*.some-name-rs0.NAME_SPACE.svc.cluster.local' | ||
| - some-name-rs0.NAME_SPACE.svc.clusterset.local | ||
| - '*.some-name-rs0.NAME_SPACE.svc.clusterset.local' | ||
| - some-name-rs0-0.clouddemo.xyz | ||
| - some-name-rs0-1.clouddemo.xyz | ||
| - some-name-rs0-2.clouddemo.xyz | ||
| - '*.NAME_SPACE.svc.clusterset.local' | ||
| - some-name-mongos | ||
| - some-name-mongos.NAME_SPACE | ||
| - some-name-mongos.NAME_SPACE.svc.cluster.local | ||
| - '*.some-name-mongos' | ||
| - '*.some-name-mongos.NAME_SPACE' | ||
| - '*.some-name-mongos.NAME_SPACE.svc.cluster.local' | ||
| - some-name-cfg | ||
| - some-name-cfg.NAME_SPACE | ||
| - some-name-cfg.NAME_SPACE.svc.cluster.local | ||
| - '*.some-name-cfg' | ||
| - '*.some-name-cfg.NAME_SPACE' | ||
| - '*.some-name-cfg.NAME_SPACE.svc.cluster.local' | ||
| - some-name-mongos.NAME_SPACE.svc.clusterset.local | ||
| - '*.some-name-mongos.NAME_SPACE.svc.clusterset.local' | ||
| - some-name-cfg.NAME_SPACE.svc.clusterset.local | ||
| - '*.some-name-cfg.NAME_SPACE.svc.clusterset.local' | ||
| duration: 2160h0m0s | ||
| issuerRef: | ||
| kind: Issuer | ||
| name: some-name-psmdb-issuer | ||
| secretName: some-name-ssl-internal | ||
| subject: | ||
| organizations: | ||
| - PSMDB |
56 changes: 56 additions & 0 deletions
56
e2e-tests/split-horizon/compare/certificate_some-name-ssl.yml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| apiVersion: cert-manager.io/v1 | ||
| kind: Certificate | ||
| metadata: | ||
| annotations: {} | ||
| generation: 1 | ||
| labels: | ||
| app.kubernetes.io/instance: some-name | ||
| app.kubernetes.io/managed-by: percona-server-mongodb-operator | ||
| app.kubernetes.io/name: percona-server-mongodb | ||
| app.kubernetes.io/part-of: percona-server-mongodb | ||
| name: some-name-ssl | ||
| ownerReferences: | ||
| - blockOwnerDeletion: true | ||
| controller: true | ||
| kind: PerconaServerMongoDB | ||
| name: some-name | ||
| spec: | ||
| commonName: some-name | ||
| dnsNames: | ||
| - localhost | ||
| - some-name-rs0 | ||
| - some-name-rs0.NAME_SPACE | ||
| - some-name-rs0.NAME_SPACE.svc.cluster.local | ||
| - '*.some-name-rs0' | ||
| - '*.some-name-rs0.NAME_SPACE' | ||
| - '*.some-name-rs0.NAME_SPACE.svc.cluster.local' | ||
| - some-name-rs0.NAME_SPACE.svc.clusterset.local | ||
| - '*.some-name-rs0.NAME_SPACE.svc.clusterset.local' | ||
| - some-name-rs0-0.clouddemo.xyz | ||
| - some-name-rs0-1.clouddemo.xyz | ||
| - some-name-rs0-2.clouddemo.xyz | ||
| - '*.NAME_SPACE.svc.clusterset.local' | ||
| - some-name-mongos | ||
| - some-name-mongos.NAME_SPACE | ||
| - some-name-mongos.NAME_SPACE.svc.cluster.local | ||
| - '*.some-name-mongos' | ||
| - '*.some-name-mongos.NAME_SPACE' | ||
| - '*.some-name-mongos.NAME_SPACE.svc.cluster.local' | ||
| - some-name-cfg | ||
| - some-name-cfg.NAME_SPACE | ||
| - some-name-cfg.NAME_SPACE.svc.cluster.local | ||
| - '*.some-name-cfg' | ||
| - '*.some-name-cfg.NAME_SPACE' | ||
| - '*.some-name-cfg.NAME_SPACE.svc.cluster.local' | ||
| - some-name-mongos.NAME_SPACE.svc.clusterset.local | ||
| - '*.some-name-mongos.NAME_SPACE.svc.clusterset.local' | ||
| - some-name-cfg.NAME_SPACE.svc.clusterset.local | ||
| - '*.some-name-cfg.NAME_SPACE.svc.clusterset.local' | ||
| duration: 2160h0m0s | ||
| issuerRef: | ||
| kind: Issuer | ||
| name: some-name-psmdb-issuer | ||
| secretName: some-name-ssl | ||
| subject: | ||
| organizations: | ||
| - PSMDB |
18 changes: 18 additions & 0 deletions
18
e2e-tests/split-horizon/compare/issuer_some-name-psmdb-ca-issuer.yml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| apiVersion: cert-manager.io/v1 | ||
| kind: Issuer | ||
| metadata: | ||
| annotations: {} | ||
| generation: 1 | ||
| labels: | ||
| app.kubernetes.io/instance: some-name | ||
| app.kubernetes.io/managed-by: percona-server-mongodb-operator | ||
| app.kubernetes.io/name: percona-server-mongodb | ||
| app.kubernetes.io/part-of: percona-server-mongodb | ||
| name: some-name-psmdb-ca-issuer | ||
| ownerReferences: | ||
| - blockOwnerDeletion: true | ||
| controller: true | ||
| kind: PerconaServerMongoDB | ||
| name: some-name | ||
| spec: | ||
| selfSigned: {} |
19 changes: 19 additions & 0 deletions
19
e2e-tests/split-horizon/compare/issuer_some-name-psmdb-issuer.yml
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| apiVersion: cert-manager.io/v1 | ||
| kind: Issuer | ||
| metadata: | ||
| annotations: {} | ||
| generation: 1 | ||
| labels: | ||
| app.kubernetes.io/instance: some-name | ||
| app.kubernetes.io/managed-by: percona-server-mongodb-operator | ||
| app.kubernetes.io/name: percona-server-mongodb | ||
| app.kubernetes.io/part-of: percona-server-mongodb | ||
| name: some-name-psmdb-issuer | ||
| ownerReferences: | ||
| - blockOwnerDeletion: true | ||
| controller: true | ||
| kind: PerconaServerMongoDB | ||
| name: some-name | ||
| spec: | ||
| ca: | ||
| secretName: some-name-ca-cert |
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -764,6 +764,35 @@ type ReplsetSpec struct { | |||||||||||||||||||||||||||||||||||||||||||
| PrimaryPreferTagSelector PrimaryPreferTagSelectorSpec `json:"primaryPreferTagSelector,omitempty"` | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
| func (r *ReplsetSpec) GetHorizons(withPorts bool) map[string]map[string]string { | ||||||||||||||||||||||||||||||||||||||||||||
| horizons := make(map[string]map[string]string) | ||||||||||||||||||||||||||||||||||||||||||||
| for podName, m := range r.Horizons { | ||||||||||||||||||||||||||||||||||||||||||||
| overrides, ok := r.ReplsetOverrides[podName] | ||||||||||||||||||||||||||||||||||||||||||||
| hasOverrides := ok && len(overrides.Horizons) > 0 | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
| for h, domain := range m { | ||||||||||||||||||||||||||||||||||||||||||||
| if hasOverrides { | ||||||||||||||||||||||||||||||||||||||||||||
| if d, ok := overrides.Horizons[h]; ok { | ||||||||||||||||||||||||||||||||||||||||||||
| domain = d | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
| idx := strings.IndexRune(domain, ':') | ||||||||||||||||||||||||||||||||||||||||||||
| if withPorts && idx == -1 { | ||||||||||||||||||||||||||||||||||||||||||||
| domain = fmt.Sprintf("%s:%d", domain, r.GetPort()) | ||||||||||||||||||||||||||||||||||||||||||||
| } else if !withPorts && idx != -1 { | ||||||||||||||||||||||||||||||||||||||||||||
| domain = domain[:idx] | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||
| if m, ok := horizons[podName]; !ok || m == nil { | ||||||||||||||||||||||||||||||||||||||||||||
| horizons[podName] = make(map[string]string) | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
| horizons[podName][h] = domain | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||
| } | |
| } | |
| for podName, overrides := range r.ReplsetOverrides { | |
| if len(overrides.Horizons) == 0 { | |
| continue | |
| } | |
| // Skip pods that already have horizons from the base spec. | |
| if _, exists := horizons[podName]; exists { | |
| continue | |
| } | |
| horizons[podName] = make(map[string]string, len(overrides.Horizons)) | |
| for h, domain := range overrides.Horizons { | |
| if withPorts { | |
| if !strings.Contains(domain, ":") { | |
| domain = fmt.Sprintf("%s:%d", domain, r.GetPort()) | |
| } | |
| } | |
| horizons[podName][h] = domain | |
| } | |
| } |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.