Skip to content

K8SPG-951: [WIP] add spec.issuerConf #1684

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

Open
mayankshah1607 wants to merge 21 commits into
base: main
Choose a base branch
from
Open

K8SPG-951: [WIP] add spec.issuerConf #1684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7f9450b
added spec.issuerConf to CRD
mayankshah1607 Jul 13, 2026
187c2f8
wip
mayankshah1607 Jul 14, 2026
482d0c3
Merge branch 'main' into K8SPG-951-issuer-conf
mayankshah1607 Jul 15, 2026
e347f11
cleanup
mayankshah1607 Jul 15, 2026
6e5dcbd
use issuer name for secret name
mayankshah1607 Jul 15, 2026
abe1790
trim down unnecessary comments
mayankshah1607 Jul 15, 2026
9d97033
improve ResolveIssuerMode by checking labels
mayankshah1607 Jul 15, 2026
8c941e7
add groupName in issuerRef
mayankshah1607 Jul 15, 2026
a19b878
remove unnecessary test
mayankshah1607 Jul 15, 2026
c7f2e5b
updated cr.yaml
mayankshah1607 Jul 15, 2026
f544698
remove unnecessarily verbose comments
mayankshah1607 Jul 15, 2026
cbf3959
update e2e test
mayankshah1607 Jul 15, 2026
d123e94
linting
mayankshah1607 Jul 15, 2026
4e0ff68
Potential fix for pull request finding
mayankshah1607 Jul 15, 2026
63b3e41
fix scheme ordering
mayankshah1607 Jul 16, 2026
491a4d0
unit test fix
mayankshah1607 Jul 16, 2026
bedf9c4
Merge branch 'main' into K8SPG-951-issuer-conf
mayankshah1607 Jul 16, 2026
42ca64e
Merge branch 'main' into K8SPG-951-issuer-conf
mayankshah1607 Jul 17, 2026
f2dc250
fix panic
mayankshah1607 Jul 17, 2026
ec13aa1
e2e test fixes
mayankshah1607 Jul 17, 2026
8ce02eb
Merge branch 'main' into K8SPG-951-issuer-conf
mayankshah1607 Jul 17, 2026
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
19 changes: 19 additions & 0 deletions build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28731,6 +28731,25 @@ spec:
type: string
certValidityDuration:
type: string
issuerConf:
description: K8SPG-951
properties:
group:
description: |-
Group of the issuer being referred to.
Defaults to 'cert-manager.io'.
type: string
kind:
description: |-
Kind of the issuer being referred to.
Defaults to 'Issuer'.
type: string
name:
description: Name of the issuer being referred to.
type: string
required:
- name
type: object
pgBackRestCertValidityDuration:
type: string
type: object
Expand Down
16 changes: 7 additions & 9 deletions cmd/postgres-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,6 @@ func main() {
)
assertNoError(err)

// Add Percona custom resource types to scheme
assertNoError(v2.AddToScheme(mgr.GetScheme()))

assertNoError(volumesnapshotv1.AddToScheme(mgr.GetScheme()))

// K8SPG-552
// Add Scheme for cert-manager resources like Issuer and Certificate.
assertNoError(certmanagerscheme.AddToScheme(mgr.GetScheme()))

// add all PostgreSQL Operator controllers to the runtime manager
err = addControllersToManager(ctx, mgr)
assertNoError(err)
Expand Down Expand Up @@ -363,6 +354,13 @@ func initManager(ctx context.Context) (runtime.Options, error) {
}
}

// add scheme
scheme := runtime.Scheme
assertNoError(v2.AddToScheme(scheme))
assertNoError(volumesnapshotv1.AddToScheme(scheme))
assertNoError(certmanagerscheme.AddToScheme(scheme))
options.Scheme = scheme

return options, nil
}

Expand Down
6 changes: 6 additions & 0 deletions cmd/postgres-operator/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (

"gotest.tools/v3/assert"
"gotest.tools/v3/assert/cmp"

"github.com/percona/percona-postgresql-operator/v2/internal/controller/runtime"
)

func TestInitManager(t *testing.T) {
Expand Down Expand Up @@ -42,6 +44,9 @@ func TestInitManager(t *testing.T) {
assert.Assert(t, options.RenewDeadline.Seconds() == 40)
assert.Assert(t, options.RetryPeriod.Seconds() == 10)

assert.Assert(t, options.Scheme == runtime.Scheme,
"expected the shared scheme to be configured before manager creation")

{
options.Cache.SyncPeriod = nil
options.Controller.GroupKindConcurrency = nil
Expand All @@ -51,6 +56,7 @@ func TestInitManager(t *testing.T) {
options.LeaseDuration = nil
options.RenewDeadline = nil
options.RetryPeriod = nil
options.Scheme = nil

assert.Assert(t, reflect.ValueOf(options).IsZero(),
"expected remaining fields to be unset:\n%+v", options)
Expand Down
19 changes: 19 additions & 0 deletions config/crd/bases/pgv2.percona.com_perconapgclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29429,6 +29429,25 @@ spec:
type: string
certValidityDuration:
type: string
issuerConf:
description: K8SPG-951
properties:
group:
description: |-
Group of the issuer being referred to.
Defaults to 'cert-manager.io'.
type: string
kind:
description: |-
Kind of the issuer being referred to.
Defaults to 'Issuer'.
type: string
name:
description: Name of the issuer being referred to.
type: string
required:
- name
type: object
pgBackRestCertValidityDuration:
type: string
type: object
Expand Down
19 changes: 19 additions & 0 deletions config/crd/bases/upstream.pgv2.percona.com_postgresclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28709,6 +28709,25 @@ spec:
type: string
certValidityDuration:
type: string
issuerConf:
description: K8SPG-951
properties:
group:
description: |-
Group of the issuer being referred to.
Defaults to 'cert-manager.io'.
type: string
kind:
description: |-
Kind of the issuer being referred to.
Defaults to 'Issuer'.
type: string
name:
description: Name of the issuer being referred to.
type: string
required:
- name
type: object
pgBackRestCertValidityDuration:
type: string
type: object
Expand Down
38 changes: 38 additions & 0 deletions deploy/bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29726,6 +29726,25 @@ spec:
type: string
certValidityDuration:
type: string
issuerConf:
description: K8SPG-951
properties:
group:
description: |-
Group of the issuer being referred to.
Defaults to 'cert-manager.io'.
type: string
kind:
description: |-
Kind of the issuer being referred to.
Defaults to 'Issuer'.
type: string
name:
description: Name of the issuer being referred to.
type: string
required:
- name
type: object
pgBackRestCertValidityDuration:
type: string
type: object
Expand Down Expand Up @@ -66823,6 +66842,25 @@ spec:
type: string
certValidityDuration:
type: string
issuerConf:
description: K8SPG-951
properties:
group:
description: |-
Group of the issuer being referred to.
Defaults to 'cert-manager.io'.
type: string
kind:
description: |-
Kind of the issuer being referred to.
Defaults to 'Issuer'.
type: string
name:
description: Name of the issuer being referred to.
type: string
required:
- name
type: object
pgBackRestCertValidityDuration:
type: string
type: object
Expand Down
4 changes: 4 additions & 0 deletions deploy/cr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ spec:
# certValidityDuration: 2160h
# caValidityDuration: 26280h
# pgBackRestCertValidityDuration: 2160h
# issuerConf:
# name: some-selfsigned-issuer
# kind: ClusterIssuer
# group: cert-manager.io
# standby:
# enabled: true
# host: "<primary-ip>"
Expand Down
38 changes: 38 additions & 0 deletions deploy/crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29726,6 +29726,25 @@ spec:
type: string
certValidityDuration:
type: string
issuerConf:
description: K8SPG-951
properties:
group:
description: |-
Group of the issuer being referred to.
Defaults to 'cert-manager.io'.
type: string
kind:
description: |-
Kind of the issuer being referred to.
Defaults to 'Issuer'.
type: string
name:
description: Name of the issuer being referred to.
type: string
required:
- name
type: object
pgBackRestCertValidityDuration:
type: string
type: object
Expand Down Expand Up @@ -66823,6 +66842,25 @@ spec:
type: string
certValidityDuration:
type: string
issuerConf:
description: K8SPG-951
properties:
group:
description: |-
Group of the issuer being referred to.
Defaults to 'cert-manager.io'.
type: string
kind:
description: |-
Kind of the issuer being referred to.
Defaults to 'Issuer'.
type: string
name:
description: Name of the issuer being referred to.
type: string
required:
- name
type: object
pgBackRestCertValidityDuration:
type: string
type: object
Expand Down
38 changes: 38 additions & 0 deletions deploy/cw-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29726,6 +29726,25 @@ spec:
type: string
certValidityDuration:
type: string
issuerConf:
description: K8SPG-951
properties:
group:
description: |-
Group of the issuer being referred to.
Defaults to 'cert-manager.io'.
type: string
kind:
description: |-
Kind of the issuer being referred to.
Defaults to 'Issuer'.
type: string
name:
description: Name of the issuer being referred to.
type: string
required:
- name
type: object
pgBackRestCertValidityDuration:
type: string
type: object
Expand Down Expand Up @@ -66823,6 +66842,25 @@ spec:
type: string
certValidityDuration:
type: string
issuerConf:
description: K8SPG-951
properties:
group:
description: |-
Group of the issuer being referred to.
Defaults to 'cert-manager.io'.
type: string
kind:
description: |-
Kind of the issuer being referred to.
Defaults to 'Issuer'.
type: string
name:
description: Name of the issuer being referred to.
type: string
required:
- name
type: object
pgBackRestCertValidityDuration:
type: string
type: object
Expand Down
5 changes: 5 additions & 0 deletions e2e-tests/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,11 @@ deploy_cert_manager() {
sleep 5
done

echo "Waiting for cert-manager mutating webhook to be ready..."
until kubectl get mutatingwebhookconfiguration cert-manager-webhook -o jsonpath='{.webhooks[0].clientConfig.caBundle}' | grep -q '[A-Za-z0-9+/=]'; do
sleep 5
done

echo "Waiting for cert-manager webhook service to have endpoints..."
until kubectl -n cert-manager get endpoints cert-manager-webhook -o jsonpath='{.subsets[*].addresses}' | grep -q '.'; do
sleep 5
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/tests/cert-manager-tls/05-deploy-cert-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ commands:
kubectl -n "$NAMESPACE" delete pod -l postgres-operator.crunchydata.com/role=pgbouncer,postgres-operator.crunchydata.com/cluster=cert-manager-tls

wait_cluster_consistency cert-manager-tls
timeout: 120
timeout: 240
Loading
Loading