Skip to content

Commit 2cf9409

Browse files
pooknullhors
andauthored
K8SPG-729: add pgv2.percona.com/version label to the crd.yaml (#1106)
* K8SPG-729: add `pgv2.percona.com/version` label to the `crd.yaml` https://perconadev.atlassian.net/browse/K8SPG-729 * fix test * use goimports-reviser * disable goimports --------- Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
1 parent 9c18a2d commit 2cf9409

File tree

16 files changed

+153
-28
lines changed

16 files changed

+153
-28
lines changed

.github/workflows/reviewdog.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,20 @@ jobs:
1616
only-new-issues: true
1717
args: --timeout 5m
1818

19+
goimports-reviser:
20+
name: runner / suggester / goimports-reviser
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: actions/checkout@v4
24+
- uses: actions/setup-go@v5
25+
with:
26+
go-version: '^1.23'
27+
- run: go install -v github.com/incu6us/goimports-reviser/v3@latest
28+
- run: $(go env GOPATH)/bin/goimports-reviser -imports-order "std,general,company,project" -company-prefixes "github.com/percona" ./...
29+
- uses: reviewdog/action-suggester@v1
30+
with:
31+
tool_name: goimports-reviser
32+
1933
gofmt:
2034
name: runner / suggester / gofmt
2135
runs-on: ubuntu-latest

.golangci.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ linters:
66
- errchkjson
77
- gci
88
- gofumpt
9+
- goimports
910
enable:
1011
- depguard
1112
- gomodguard
@@ -49,9 +50,6 @@ linters-settings:
4950
exhaustive:
5051
default-signifies-exhaustive: true
5152

52-
goimports:
53-
local-prefixes: github.com/percona/percona-postgresql-operator
54-
5553
gomodguard:
5654
blocked:
5755
modules:

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ generate-crd: generate-crunchy-crd generate-percona-crd
326326
$(KUSTOMIZE) build ./config/crd/ > ./deploy/crd.yaml
327327

328328
generate-percona-crd:
329+
go generate ./percona/...
329330
GOBIN='$(CURDIR)/hack/tools' ./hack/controller-generator.sh \
330331
crd:crdVersions='v1' \
331332
paths='./pkg/apis/pgv2.percona.com/...' \

config/crd/kustomization.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,8 @@ resources:
77
- bases/pgv2.percona.com_perconapgclusters.yaml
88
- bases/postgres-operator.crunchydata.com_pgupgrades.yaml
99
- bases/postgres-operator.crunchydata.com_pgadmins.yaml
10+
11+
patchesStrategicMerge:
12+
- patches/versionlabel_in_perconapgclusters.yaml
13+
- patches/versionlabel_in_perconapgbackups.yaml
14+
- patches/versionlabel_in_perconapgrestores.yaml
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: perconapgbackups.pgv2.percona.com
5+
labels:
6+
pgv2.percona.com/version: v2.7.0
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: perconapgclusters.pgv2.percona.com
5+
labels:
6+
pgv2.percona.com/version: v2.7.0
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: perconapgrestores.pgv2.percona.com
5+
labels:
6+
pgv2.percona.com/version: v2.7.0

deploy/bundle.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,8 @@ kind: CustomResourceDefinition
296296
metadata:
297297
annotations:
298298
controller-gen.kubebuilder.io/version: v0.16.5
299+
labels:
300+
pgv2.percona.com/version: v2.7.0
299301
name: perconapgbackups.pgv2.percona.com
300302
spec:
301303
group: pgv2.percona.com
@@ -702,6 +704,8 @@ kind: CustomResourceDefinition
702704
metadata:
703705
annotations:
704706
controller-gen.kubebuilder.io/version: v0.16.5
707+
labels:
708+
pgv2.percona.com/version: v2.7.0
705709
name: perconapgclusters.pgv2.percona.com
706710
spec:
707711
group: pgv2.percona.com
@@ -18272,6 +18276,8 @@ kind: CustomResourceDefinition
1827218276
metadata:
1827318277
annotations:
1827418278
controller-gen.kubebuilder.io/version: v0.16.5
18279+
labels:
18280+
pgv2.percona.com/version: v2.7.0
1827518281
name: perconapgrestores.pgv2.percona.com
1827618282
spec:
1827718283
group: pgv2.percona.com

deploy/crd.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,8 @@ kind: CustomResourceDefinition
296296
metadata:
297297
annotations:
298298
controller-gen.kubebuilder.io/version: v0.16.5
299+
labels:
300+
pgv2.percona.com/version: v2.7.0
299301
name: perconapgbackups.pgv2.percona.com
300302
spec:
301303
group: pgv2.percona.com
@@ -702,6 +704,8 @@ kind: CustomResourceDefinition
702704
metadata:
703705
annotations:
704706
controller-gen.kubebuilder.io/version: v0.16.5
707+
labels:
708+
pgv2.percona.com/version: v2.7.0
705709
name: perconapgclusters.pgv2.percona.com
706710
spec:
707711
group: pgv2.percona.com
@@ -18272,6 +18276,8 @@ kind: CustomResourceDefinition
1827218276
metadata:
1827318277
annotations:
1827418278
controller-gen.kubebuilder.io/version: v0.16.5
18279+
labels:
18280+
pgv2.percona.com/version: v2.7.0
1827518281
name: perconapgrestores.pgv2.percona.com
1827618282
spec:
1827718283
group: pgv2.percona.com

deploy/cw-bundle.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,8 @@ kind: CustomResourceDefinition
296296
metadata:
297297
annotations:
298298
controller-gen.kubebuilder.io/version: v0.16.5
299+
labels:
300+
pgv2.percona.com/version: v2.7.0
299301
name: perconapgbackups.pgv2.percona.com
300302
spec:
301303
group: pgv2.percona.com
@@ -702,6 +704,8 @@ kind: CustomResourceDefinition
702704
metadata:
703705
annotations:
704706
controller-gen.kubebuilder.io/version: v0.16.5
707+
labels:
708+
pgv2.percona.com/version: v2.7.0
705709
name: perconapgclusters.pgv2.percona.com
706710
spec:
707711
group: pgv2.percona.com
@@ -18272,6 +18276,8 @@ kind: CustomResourceDefinition
1827218276
metadata:
1827318277
annotations:
1827418278
controller-gen.kubebuilder.io/version: v0.16.5
18279+
labels:
18280+
pgv2.percona.com/version: v2.7.0
1827518281
name: perconapgrestores.pgv2.percona.com
1827618282
spec:
1827718283
group: pgv2.percona.com

0 commit comments

Comments
 (0)