Skip to content

K8SPSMDB-1285: add version label to the crd #1934

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 5 commits into from
May 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ help: ## Display this help.
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

generate: controller-gen ## Generate CRDs and RBAC files
go generate ./...
$(CONTROLLER_GEN) crd:maxDescLen=0,allowDangerousTypes=true rbac:roleName=$(NAME) webhook paths="./..." output:crd:artifacts:config=config/crd/bases ## Generate WebhookConfiguration, Role and CustomResourceDefinition objects.
$(CONTROLLER_GEN) object paths="./..." ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

Expand Down
5 changes: 5 additions & 0 deletions config/crd/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ resources:
- bases/psmdb.percona.com_perconaservermongodbs.yaml
#+kubebuilder:scaffold:crdkustomizeresource

patchesStrategicMerge:
- patches/versionlabel_in_psmdb.yaml
- patches/versionlabel_in_psmdbbackup.yaml
- patches/versionlabel_in_psmdbrestore.yaml

patches:
- path: patches/deprecated-1.2.json
target:
Expand Down
9 changes: 9 additions & 0 deletions config/crd/patches/versionlabel_in_psmdb.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: perconaservermongodbs.psmdb.percona.com
labels:
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/version: v1.21.0
app.kubernetes.io/component: crd
app.kubernetes.io/part-of: percona-server-mongodb-operator
9 changes: 9 additions & 0 deletions config/crd/patches/versionlabel_in_psmdbbackup.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: perconaservermongodbbackups.psmdb.percona.com
labels:
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/version: v1.21.0
app.kubernetes.io/component: crd
app.kubernetes.io/part-of: percona-server-mongodb-operator
9 changes: 9 additions & 0 deletions config/crd/patches/versionlabel_in_psmdbrestore.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: perconaservermongodbrestores.psmdb.percona.com
labels:
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/version: v1.21.0
app.kubernetes.io/component: crd
app.kubernetes.io/part-of: percona-server-mongodb-operator
17 changes: 16 additions & 1 deletion deploy/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbbackups.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -189,6 +194,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbrestores.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -383,6 +393,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbs.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -19788,7 +19803,7 @@ spec:
serviceAccountName: percona-server-mongodb-operator
containers:
- name: percona-server-mongodb-operator
image: percona/percona-server-mongodb-operator:1.20.0
image: perconalab/percona-server-mongodb-operator:main
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
15 changes: 15 additions & 0 deletions deploy/crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbbackups.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -189,6 +194,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbrestores.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -383,6 +393,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbs.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down
17 changes: 16 additions & 1 deletion deploy/cw-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbbackups.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -189,6 +194,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbrestores.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -383,6 +393,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbs.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -19809,7 +19824,7 @@ spec:
serviceAccountName: percona-server-mongodb-operator
containers:
- name: percona-server-mongodb-operator
image: percona/percona-server-mongodb-operator:1.20.0
image: perconalab/percona-server-mongodb-operator:main
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion deploy/cw-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
serviceAccountName: percona-server-mongodb-operator
containers:
- name: percona-server-mongodb-operator
image: percona/percona-server-mongodb-operator:1.20.0
image: perconalab/percona-server-mongodb-operator:main
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
serviceAccountName: percona-server-mongodb-operator
containers:
- name: percona-server-mongodb-operator
image: percona/percona-server-mongodb-operator:1.20.0
image: perconalab/percona-server-mongodb-operator:main
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
15 changes: 15 additions & 0 deletions e2e-tests/version-service/conf/crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbbackups.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -189,6 +194,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbrestores.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down Expand Up @@ -383,6 +393,11 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.3
labels:
app.kubernetes.io/component: crd
app.kubernetes.io/name: percona-server-mongodb
app.kubernetes.io/part-of: percona-server-mongodb-operator
app.kubernetes.io/version: v1.21.0
name: perconaservermongodbs.psmdb.percona.com
spec:
group: psmdb.percona.com
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/psmdb/v1/psmdb_defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/percona/percona-server-mongodb-operator/pkg/mcs"
"github.com/percona/percona-server-mongodb-operator/pkg/util"
"github.com/percona/percona-server-mongodb-operator/pkg/util/numstr"
"github.com/percona/percona-server-mongodb-operator/version"
"github.com/percona/percona-server-mongodb-operator/pkg/version"
)

// DefaultDNSSuffix is a default dns suffix for the cluster service
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/psmdb/v1/psmdb_defaults_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"

api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
"github.com/percona/percona-server-mongodb-operator/version"
"github.com/percona/percona-server-mongodb-operator/pkg/version"
)

func TestSetSafeDefaultPre116(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/psmdb/v1/psmdb_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/percona/percona-server-mongodb-operator/pkg/mcs"
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/mongo"
"github.com/percona/percona-server-mongodb-operator/pkg/util/numstr"
"github.com/percona/percona-server-mongodb-operator/version"
"github.com/percona/percona-server-mongodb-operator/pkg/version"
)

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/psmdb/v1/zz_generated.deepcopy.go

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

4 changes: 2 additions & 2 deletions pkg/controller/perconaservermongodb/connections_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb"
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/mongo"
mongoFake "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/mongo/fake"
"github.com/percona/percona-server-mongodb-operator/version"
"github.com/percona/percona-server-mongodb-operator/pkg/version"
)

// TestConnectionLeaks aims to cover every initialization of a connection to the MongoDB database.
Expand All @@ -44,7 +44,7 @@ func TestConnectionLeaks(t *testing.T) {
Backup: api.BackupSpec{
Enabled: false,
},
CRVersion: version.Version,
CRVersion: version.Version(),
Image: "percona/percona-server-mongodb:latest",
Replsets: []*api.ReplsetSpec{
{
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/perconaservermongodb/finalizers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
"github.com/percona/percona-server-mongodb-operator/pkg/naming"
"github.com/percona/percona-server-mongodb-operator/version"
"github.com/percona/percona-server-mongodb-operator/pkg/version"
)

func TestCheckFinalizers(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/perconaservermongodb/psmdb_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/secret"
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/tls"
"github.com/percona/percona-server-mongodb-operator/pkg/util"
"github.com/percona/percona-server-mongodb-operator/version"
"github.com/percona/percona-server-mongodb-operator/pkg/version"
)

var secretFileMode int32 = 288
Expand Down Expand Up @@ -689,7 +689,7 @@ func (r *ReconcilePerconaServerMongoDB) setCRVersion(ctx context.Context, cr *ap
}

orig := cr.DeepCopy()
cr.Spec.CRVersion = version.Version
cr.Spec.CRVersion = version.Version()

if err := r.client.Patch(ctx, cr, client.MergeFrom(orig)); err != nil {
return errors.Wrap(err, "patch CR")
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/perconaservermongodb/statefulset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
"github.com/percona/percona-server-mongodb-operator/pkg/naming"
"github.com/percona/percona-server-mongodb-operator/version"
"github.com/percona/percona-server-mongodb-operator/pkg/version"
)

func TestReconcileStatefulSet(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/perconaservermongodb/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
fakeBackup "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/backup/fake"
faketls "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/tls/fake"
"github.com/percona/percona-server-mongodb-operator/version"
"github.com/percona/percona-server-mongodb-operator/pkg/version"
)

// creates a fake client to mock API calls with the mock objects
Expand Down Expand Up @@ -97,7 +97,7 @@ func TestConnectionEndpoint(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{Name: "psmdb-mock", Namespace: "psmdb"},
Spec: api.PerconaServerMongoDBSpec{
Image: "some-image",
CRVersion: version.Version,
CRVersion: version.Version(),
Replsets: []*api.ReplsetSpec{
{
Name: "rs0",
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/perconaservermongodb/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/backup"
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/tls"
"github.com/percona/percona-server-mongodb-operator/version"
"github.com/percona/percona-server-mongodb-operator/pkg/version"
)

// These tests use Ginkgo (BDD-style Go testing framework). Refer to
Expand Down
Loading
Loading