Skip to content

Commit c35de73

Browse files
pooknullpooknull
authored
K8SPSMDB-1285: add version label to the crd (#1934)
* K8SPSMDB-1285: add version label to the crd https://perconadev.atlassian.net/browse/K8SPSMDB-1285 * set version to the `1.21.0` * fix merge * fix manifests
1 parent 03f78e5 commit c35de73

34 files changed

+222
-46
lines changed

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ help: ## Display this help.
1414
@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)
1515

1616
generate: controller-gen ## Generate CRDs and RBAC files
17+
go generate ./...
1718
$(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.
1819
$(CONTROLLER_GEN) object paths="./..." ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
1920

‎config/crd/kustomization.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ resources:
77
- bases/psmdb.percona.com_perconaservermongodbs.yaml
88
#+kubebuilder:scaffold:crdkustomizeresource
99

10+
patchesStrategicMerge:
11+
- patches/versionlabel_in_psmdb.yaml
12+
- patches/versionlabel_in_psmdbbackup.yaml
13+
- patches/versionlabel_in_psmdbrestore.yaml
14+
1015
patches:
1116
- path: patches/deprecated-1.2.json
1217
target:

‎config/crd/patches/versionlabel_in_psmdb.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: perconaservermongodbs.psmdb.percona.com
5+
labels:
6+
app.kubernetes.io/name: percona-server-mongodb
7+
app.kubernetes.io/version: v1.21.0
8+
app.kubernetes.io/component: crd
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator

‎config/crd/patches/versionlabel_in_psmdbbackup.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: perconaservermongodbbackups.psmdb.percona.com
5+
labels:
6+
app.kubernetes.io/name: percona-server-mongodb
7+
app.kubernetes.io/version: v1.21.0
8+
app.kubernetes.io/component: crd
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator

‎config/crd/patches/versionlabel_in_psmdbrestore.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: perconaservermongodbrestores.psmdb.percona.com
5+
labels:
6+
app.kubernetes.io/name: percona-server-mongodb
7+
app.kubernetes.io/version: v1.21.0
8+
app.kubernetes.io/component: crd
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator

‎deploy/bundle.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.16.3
6+
labels:
7+
app.kubernetes.io/component: crd
8+
app.kubernetes.io/name: percona-server-mongodb
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator
10+
app.kubernetes.io/version: v1.21.0
611
name: perconaservermongodbbackups.psmdb.percona.com
712
spec:
813
group: psmdb.percona.com
@@ -189,6 +194,11 @@ kind: CustomResourceDefinition
189194
metadata:
190195
annotations:
191196
controller-gen.kubebuilder.io/version: v0.16.3
197+
labels:
198+
app.kubernetes.io/component: crd
199+
app.kubernetes.io/name: percona-server-mongodb
200+
app.kubernetes.io/part-of: percona-server-mongodb-operator
201+
app.kubernetes.io/version: v1.21.0
192202
name: perconaservermongodbrestores.psmdb.percona.com
193203
spec:
194204
group: psmdb.percona.com
@@ -383,6 +393,11 @@ kind: CustomResourceDefinition
383393
metadata:
384394
annotations:
385395
controller-gen.kubebuilder.io/version: v0.16.3
396+
labels:
397+
app.kubernetes.io/component: crd
398+
app.kubernetes.io/name: percona-server-mongodb
399+
app.kubernetes.io/part-of: percona-server-mongodb-operator
400+
app.kubernetes.io/version: v1.21.0
386401
name: perconaservermongodbs.psmdb.percona.com
387402
spec:
388403
group: psmdb.percona.com
@@ -19788,7 +19803,7 @@ spec:
1978819803
serviceAccountName: percona-server-mongodb-operator
1978919804
containers:
1979019805
- name: percona-server-mongodb-operator
19791-
image: percona/percona-server-mongodb-operator:1.20.0
19806+
image: perconalab/percona-server-mongodb-operator:main
1979219807
imagePullPolicy: Always
1979319808
livenessProbe:
1979419809
failureThreshold: 3

‎deploy/crd.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.16.3
6+
labels:
7+
app.kubernetes.io/component: crd
8+
app.kubernetes.io/name: percona-server-mongodb
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator
10+
app.kubernetes.io/version: v1.21.0
611
name: perconaservermongodbbackups.psmdb.percona.com
712
spec:
813
group: psmdb.percona.com
@@ -189,6 +194,11 @@ kind: CustomResourceDefinition
189194
metadata:
190195
annotations:
191196
controller-gen.kubebuilder.io/version: v0.16.3
197+
labels:
198+
app.kubernetes.io/component: crd
199+
app.kubernetes.io/name: percona-server-mongodb
200+
app.kubernetes.io/part-of: percona-server-mongodb-operator
201+
app.kubernetes.io/version: v1.21.0
192202
name: perconaservermongodbrestores.psmdb.percona.com
193203
spec:
194204
group: psmdb.percona.com
@@ -383,6 +393,11 @@ kind: CustomResourceDefinition
383393
metadata:
384394
annotations:
385395
controller-gen.kubebuilder.io/version: v0.16.3
396+
labels:
397+
app.kubernetes.io/component: crd
398+
app.kubernetes.io/name: percona-server-mongodb
399+
app.kubernetes.io/part-of: percona-server-mongodb-operator
400+
app.kubernetes.io/version: v1.21.0
386401
name: perconaservermongodbs.psmdb.percona.com
387402
spec:
388403
group: psmdb.percona.com

‎deploy/cw-bundle.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.16.3
6+
labels:
7+
app.kubernetes.io/component: crd
8+
app.kubernetes.io/name: percona-server-mongodb
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator
10+
app.kubernetes.io/version: v1.21.0
611
name: perconaservermongodbbackups.psmdb.percona.com
712
spec:
813
group: psmdb.percona.com
@@ -189,6 +194,11 @@ kind: CustomResourceDefinition
189194
metadata:
190195
annotations:
191196
controller-gen.kubebuilder.io/version: v0.16.3
197+
labels:
198+
app.kubernetes.io/component: crd
199+
app.kubernetes.io/name: percona-server-mongodb
200+
app.kubernetes.io/part-of: percona-server-mongodb-operator
201+
app.kubernetes.io/version: v1.21.0
192202
name: perconaservermongodbrestores.psmdb.percona.com
193203
spec:
194204
group: psmdb.percona.com
@@ -383,6 +393,11 @@ kind: CustomResourceDefinition
383393
metadata:
384394
annotations:
385395
controller-gen.kubebuilder.io/version: v0.16.3
396+
labels:
397+
app.kubernetes.io/component: crd
398+
app.kubernetes.io/name: percona-server-mongodb
399+
app.kubernetes.io/part-of: percona-server-mongodb-operator
400+
app.kubernetes.io/version: v1.21.0
386401
name: perconaservermongodbs.psmdb.percona.com
387402
spec:
388403
group: psmdb.percona.com
@@ -19809,7 +19824,7 @@ spec:
1980919824
serviceAccountName: percona-server-mongodb-operator
1981019825
containers:
1981119826
- name: percona-server-mongodb-operator
19812-
image: percona/percona-server-mongodb-operator:1.20.0
19827+
image: perconalab/percona-server-mongodb-operator:main
1981319828
imagePullPolicy: Always
1981419829
livenessProbe:
1981519830
failureThreshold: 3

‎deploy/cw-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: percona-server-mongodb-operator
1616
containers:
1717
- name: percona-server-mongodb-operator
18-
image: percona/percona-server-mongodb-operator:1.20.0
18+
image: perconalab/percona-server-mongodb-operator:main
1919
imagePullPolicy: Always
2020
livenessProbe:
2121
failureThreshold: 3

‎deploy/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: percona-server-mongodb-operator
1616
containers:
1717
- name: percona-server-mongodb-operator
18-
image: percona/percona-server-mongodb-operator:1.20.0
18+
image: perconalab/percona-server-mongodb-operator:main
1919
imagePullPolicy: Always
2020
livenessProbe:
2121
failureThreshold: 3

‎e2e-tests/version-service/conf/crd.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.16.3
6+
labels:
7+
app.kubernetes.io/component: crd
8+
app.kubernetes.io/name: percona-server-mongodb
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator
10+
app.kubernetes.io/version: v1.21.0
611
name: perconaservermongodbbackups.psmdb.percona.com
712
spec:
813
group: psmdb.percona.com
@@ -189,6 +194,11 @@ kind: CustomResourceDefinition
189194
metadata:
190195
annotations:
191196
controller-gen.kubebuilder.io/version: v0.16.3
197+
labels:
198+
app.kubernetes.io/component: crd
199+
app.kubernetes.io/name: percona-server-mongodb
200+
app.kubernetes.io/part-of: percona-server-mongodb-operator
201+
app.kubernetes.io/version: v1.21.0
192202
name: perconaservermongodbrestores.psmdb.percona.com
193203
spec:
194204
group: psmdb.percona.com
@@ -383,6 +393,11 @@ kind: CustomResourceDefinition
383393
metadata:
384394
annotations:
385395
controller-gen.kubebuilder.io/version: v0.16.3
396+
labels:
397+
app.kubernetes.io/component: crd
398+
app.kubernetes.io/name: percona-server-mongodb
399+
app.kubernetes.io/part-of: percona-server-mongodb-operator
400+
app.kubernetes.io/version: v1.21.0
386401
name: perconaservermongodbs.psmdb.percona.com
387402
spec:
388403
group: psmdb.percona.com

‎pkg/apis/psmdb/v1/psmdb_defaults.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/percona/percona-server-mongodb-operator/pkg/mcs"
1919
"github.com/percona/percona-server-mongodb-operator/pkg/util"
2020
"github.com/percona/percona-server-mongodb-operator/pkg/util/numstr"
21-
"github.com/percona/percona-server-mongodb-operator/version"
21+
"github.com/percona/percona-server-mongodb-operator/pkg/version"
2222
)
2323

2424
// DefaultDNSSuffix is a default dns suffix for the cluster service

‎pkg/apis/psmdb/v1/psmdb_defaults_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
logf "sigs.k8s.io/controller-runtime/pkg/log"
1010

1111
api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
12-
"github.com/percona/percona-server-mongodb-operator/version"
12+
"github.com/percona/percona-server-mongodb-operator/pkg/version"
1313
)
1414

1515
func TestSetSafeDefaultPre116(t *testing.T) {

‎pkg/apis/psmdb/v1/psmdb_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/percona/percona-server-mongodb-operator/pkg/mcs"
3131
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/mongo"
3232
"github.com/percona/percona-server-mongodb-operator/pkg/util/numstr"
33-
"github.com/percona/percona-server-mongodb-operator/version"
33+
"github.com/percona/percona-server-mongodb-operator/pkg/version"
3434
)
3535

3636
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

‎pkg/apis/psmdb/v1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/controller/perconaservermongodb/connections_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb"
2424
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/mongo"
2525
mongoFake "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/mongo/fake"
26-
"github.com/percona/percona-server-mongodb-operator/version"
26+
"github.com/percona/percona-server-mongodb-operator/pkg/version"
2727
)
2828

2929
// TestConnectionLeaks aims to cover every initialization of a connection to the MongoDB database.
@@ -44,7 +44,7 @@ func TestConnectionLeaks(t *testing.T) {
4444
Backup: api.BackupSpec{
4545
Enabled: false,
4646
},
47-
CRVersion: version.Version,
47+
CRVersion: version.Version(),
4848
Image: "percona/percona-server-mongodb:latest",
4949
Replsets: []*api.ReplsetSpec{
5050
{

‎pkg/controller/perconaservermongodb/finalizers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
1111
"github.com/percona/percona-server-mongodb-operator/pkg/naming"
12-
"github.com/percona/percona-server-mongodb-operator/version"
12+
"github.com/percona/percona-server-mongodb-operator/pkg/version"
1313
)
1414

1515
func TestCheckFinalizers(t *testing.T) {

‎pkg/controller/perconaservermongodb/psmdb_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/secret"
4444
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/tls"
4545
"github.com/percona/percona-server-mongodb-operator/pkg/util"
46-
"github.com/percona/percona-server-mongodb-operator/version"
46+
"github.com/percona/percona-server-mongodb-operator/pkg/version"
4747
)
4848

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

691691
orig := cr.DeepCopy()
692-
cr.Spec.CRVersion = version.Version
692+
cr.Spec.CRVersion = version.Version()
693693

694694
if err := r.client.Patch(ctx, cr, client.MergeFrom(orig)); err != nil {
695695
return errors.Wrap(err, "patch CR")

‎pkg/controller/perconaservermongodb/statefulset_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
1616
"github.com/percona/percona-server-mongodb-operator/pkg/naming"
17-
"github.com/percona/percona-server-mongodb-operator/version"
17+
"github.com/percona/percona-server-mongodb-operator/pkg/version"
1818
)
1919

2020
func TestReconcileStatefulSet(t *testing.T) {

‎pkg/controller/perconaservermongodb/status_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
api "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
1717
fakeBackup "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/backup/fake"
1818
faketls "github.com/percona/percona-server-mongodb-operator/pkg/psmdb/tls/fake"
19-
"github.com/percona/percona-server-mongodb-operator/version"
19+
"github.com/percona/percona-server-mongodb-operator/pkg/version"
2020
)
2121

2222
// creates a fake client to mock API calls with the mock objects
@@ -97,7 +97,7 @@ func TestConnectionEndpoint(t *testing.T) {
9797
ObjectMeta: metav1.ObjectMeta{Name: "psmdb-mock", Namespace: "psmdb"},
9898
Spec: api.PerconaServerMongoDBSpec{
9999
Image: "some-image",
100-
CRVersion: version.Version,
100+
CRVersion: version.Version(),
101101
Replsets: []*api.ReplsetSpec{
102102
{
103103
Name: "rs0",

‎pkg/controller/perconaservermongodb/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
psmdbv1 "github.com/percona/percona-server-mongodb-operator/pkg/apis/psmdb/v1"
2222
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/backup"
2323
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/tls"
24-
"github.com/percona/percona-server-mongodb-operator/version"
24+
"github.com/percona/percona-server-mongodb-operator/pkg/version"
2525
)
2626

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

0 commit comments

Comments
 (0)