Skip to content

Commit d34553f

Browse files
authored
refactor: bump operator-go to 0.12-dev (#115)
* refactor: bump domain to kubedoop.dev * refactor: bump operator-go to 0.12-dev
1 parent 7d6bf39 commit d34553f

22 files changed

+46
-56
lines changed

.github/ISSUE_TEMPLATE/feature_request.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9-
First, check out our [Collaboration Guide](https://zncdata.dev/docs/developer-manual/collaboration)
9+
First, check out our [Collaboration Guide](https://kubedoop.dev/docs/developer-manual/collaboration)
1010
Please provide a searchable summary of the issue in the title above ⬆️.
1111
- type: dropdown
1212
attributes:
@@ -27,4 +27,4 @@ body:
2727
- type: textarea
2828
attributes:
2929
label: Motivation 🔦
30-
description: What are you trying to accomplish? How has the lack of this feature affected you? Providing context helps us come up with a solution that is more useful in the real world.
30+
description: What are you trying to accomplish? How has the lack of this feature affected you? Providing context helps us come up with a solution that is more useful in the real world.

PROJECT

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is used to track the info used to scaffold your project
33
# and allow the plugins properly work.
44
# More info: https://book.kubebuilder.io/reference/project-config.html
5-
domain: zncdata.dev
5+
domain: kubedoop.dev
66
layout:
77
- go.kubebuilder.io/v4
88
projectName: kafka-operator
@@ -12,7 +12,7 @@ resources:
1212
crdVersion: v1
1313
namespaced: true
1414
controller: true
15-
domain: zncdata.dev
15+
domain: kubedoop.dev
1616
group: kafka
1717
kind: KafkaCluster
1818
path: github.com/zncdatadev/kafka-operator/api/v1alpha1

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Kubedoop built-in operators:
6565

6666
## Contributing
6767

68-
If you'd like to contribute to Kubedoop, please refer to our [Contributing Guide](https://zncdata.dev/docs/developer-manual/collaboration) for more information.
68+
If you'd like to contribute to Kubedoop, please refer to our [Contributing Guide](https://kubedoop.dev/docs/developer-manual/collaboration) for more information.
6969
We welcome contributions of all kinds, including but not limited to code, documentation, and use cases.
7070

7171
## License

api/v1alpha1/groupversion_info.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ limitations under the License.
1616

1717
// Package v1alpha1 contains API Schema definitions for the kafka v1alpha1 API group
1818
// +kubebuilder:object:generate=true
19-
// +groupName=kafka.zncdata.dev
19+
// +groupName=kafka.kubedoop.dev
2020
package v1alpha1
2121

2222
import (
2323
"k8s.io/apimachinery/pkg/runtime/schema"
2424
"sigs.k8s.io/controller-runtime/pkg/scheme"
2525
)
2626

27-
const GroupName = "kafka.zncdata.dev"
27+
const GroupName = "kafka.kubedoop.dev"
2828

2929
var (
3030
// GroupVersion is group version used to register these objects

cmd/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func main() {
125125
HealthProbeBindAddress: probeAddr,
126126
LeaderElection: enableLeaderElection,
127127
WebhookServer: webhookServer,
128-
LeaderElectionID: "6e8ac606.zncdata.dev",
128+
LeaderElectionID: "6e8ac606.kubedoop.dev",
129129
// LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily
130130
// when the Manager ends. This requires the binary to immediately end when the
131131
// Manager is stopped, otherwise, this setting is unsafe. Setting this significantly

config/crd/bases/kafka.zncdata.dev_kafkaclusters.yaml config/crd/bases/kafka.kubedoop.dev_kafkaclusters.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.1
7-
name: kafkaclusters.kafka.zncdata.dev
6+
controller-gen.kubebuilder.io/version: v0.16.5
7+
name: kafkaclusters.kafka.kubedoop.dev
88
spec:
9-
group: kafka.zncdata.dev
9+
group: kafka.kubedoop.dev
1010
names:
1111
kind: KafkaCluster
1212
listKind: KafkaClusterList

config/crd/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# since it depends on service name and namespace that are out of this kustomize package.
33
# It should be run by config/default
44
resources:
5-
- bases/kafka.zncdata.dev_kafkaclusters.yaml
5+
- bases/kafka.kubedoop.dev_kafkaclusters.yaml
66
#+kubebuilder:scaffold:crdkustomizeresource
77

88
patches:

config/crd/patches/cainjection_in_kafkaclusters.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME
7-
name: kafkaclusters.kafka.zncdata.dev
7+
name: kafkaclusters.kafka.kubedoop.dev

config/crd/patches/webhook_in_kafkaclusters.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
5-
name: kafkaclusters.kafka.zncdata.dev
5+
name: kafkaclusters.kafka.kubedoop.dev
66
spec:
77
conversion:
88
strategy: Webhook

config/rbac/kafkacluster_editor_role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
name: kafkacluster-editor-role
1313
rules:
1414
- apiGroups:
15-
- kafka.zncdata.dev
15+
- kafka.kubedoop.dev
1616
resources:
1717
- kafkaclusters
1818
verbs:
@@ -24,7 +24,7 @@ rules:
2424
- update
2525
- watch
2626
- apiGroups:
27-
- kafka.zncdata.dev
27+
- kafka.kubedoop.dev
2828
resources:
2929
- kafkaclusters/status
3030
verbs:

config/rbac/kafkacluster_viewer_role.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ metadata:
1212
name: kafkacluster-viewer-role
1313
rules:
1414
- apiGroups:
15-
- kafka.zncdata.dev
15+
- kafka.kubedoop.dev
1616
resources:
1717
- kafkaclusters
1818
verbs:
1919
- get
2020
- list
2121
- watch
2222
- apiGroups:
23-
- kafka.zncdata.dev
23+
- kafka.kubedoop.dev
2424
resources:
2525
- kafkaclusters/status
2626
verbs:

config/rbac/role.yaml

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ metadata:
55
name: manager-role
66
rules:
77
- apiGroups:
8-
- apps
8+
- ""
99
resources:
10-
- statefulsets
10+
- configmaps
11+
- serviceaccounts
12+
- services
1113
verbs:
1214
- create
1315
- delete
@@ -19,27 +21,25 @@ rules:
1921
- apiGroups:
2022
- ""
2123
resources:
22-
- configmaps
23-
- serviceaccounts
24-
- services
24+
- pods
2525
verbs:
26-
- create
27-
- delete
2826
- get
2927
- list
30-
- patch
31-
- update
3228
- watch
3329
- apiGroups:
34-
- ""
30+
- apps
3531
resources:
36-
- pods
32+
- statefulsets
3733
verbs:
34+
- create
35+
- delete
3836
- get
3937
- list
38+
- patch
39+
- update
4040
- watch
4141
- apiGroups:
42-
- kafka.zncdata.dev
42+
- kafka.kubedoop.dev
4343
resources:
4444
- kafkaclusters
4545
verbs:
@@ -51,13 +51,13 @@ rules:
5151
- update
5252
- watch
5353
- apiGroups:
54-
- kafka.zncdata.dev
54+
- kafka.kubedoop.dev
5555
resources:
5656
- kafkaclusters/finalizers
5757
verbs:
5858
- update
5959
- apiGroups:
60-
- kafka.zncdata.dev
60+
- kafka.kubedoop.dev
6161
resources:
6262
- kafkaclusters/status
6363
verbs:

config/samples/kafka_v1alpha1_kafkacluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kafka.zncdata.dev/v1alpha1
1+
apiVersion: kafka.kubedoop.dev/v1alpha1
22
kind: KafkaCluster
33
metadata:
44
labels:

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/go-logr/logr v1.4.2
99
github.com/onsi/ginkgo/v2 v2.21.0
1010
github.com/onsi/gomega v1.35.1
11-
github.com/zncdatadev/operator-go v0.11.2
11+
github.com/zncdatadev/operator-go v0.11.3-0.20241120112858-dcdca6c6cd44
1212
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
1313
k8s.io/api v0.31.2
1414
k8s.io/apimachinery v0.31.2

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
136136
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
137137
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
138138
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
139-
github.com/zncdatadev/operator-go v0.11.2 h1:/3ti+26D9w38gZV2eQLIz62mPe45em3Ej8iePoSj/04=
140-
github.com/zncdatadev/operator-go v0.11.2/go.mod h1:Thc0Jo5LuXnwrb73shfI63PKlxC+7cGq7SClzo3Y5qI=
139+
github.com/zncdatadev/operator-go v0.11.3-0.20241120112858-dcdca6c6cd44 h1:wxxTwfas5UAX46FoinIC/ZmGc+dlk5I+1cT3McypY+4=
140+
github.com/zncdatadev/operator-go v0.11.3-0.20241120112858-dcdca6c6cd44/go.mod h1:9QGIaH5gTDgpv0kftcGkBGqCIj7cboC5ZMES9fZy4XI=
141141
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA=
142142
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg=
143143
go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo=

internal/controller/container/kafka.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func (d *KafkaContainerBuilder) Command() []string {
173173
}
174174

175175
// CommandArgs command args
176-
// ex: export NODE_PORT=$(cat /zncdata/tmp/kafka_nodepor
176+
// ex: export NODE_PORT=$(cat /kubedoop/tmp/kafka_nodepor
177177
func (d *KafkaContainerBuilder) CommandArgs() []string {
178178
listenerConfig, err := common.GetKafkaListenerConfig(d.namespace, d.KafkaTlsSecurity, d.groupSvcName)
179179
if err != nil {

internal/controller/kafkacluster_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ type KafkaClusterReconciler struct {
3636
Log logr.Logger
3737
}
3838

39-
// +kubebuilder:rbac:groups=kafka.zncdata.dev,resources=kafkaclusters,verbs=get;list;watch;create;update;patch;delete
40-
// +kubebuilder:rbac:groups=kafka.zncdata.dev,resources=kafkaclusters/status,verbs=get;update;patch
41-
// +kubebuilder:rbac:groups=kafka.zncdata.dev,resources=kafkaclusters/finalizers,verbs=update
39+
// +kubebuilder:rbac:groups=kafka.kubedoop.dev,resources=kafkaclusters,verbs=get;list;watch;create;update;patch;delete
40+
// +kubebuilder:rbac:groups=kafka.kubedoop.dev,resources=kafkaclusters/status,verbs=get;update;patch
41+
// +kubebuilder:rbac:groups=kafka.kubedoop.dev,resources=kafkaclusters/finalizers,verbs=update
4242
// +kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=get;list;watch;create;update;patch;delete
4343
// +kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete
4444
// +kubebuilder:rbac:groups=core,resources=serviceaccounts,verbs=get;list;watch;create;update;patch;delete

internal/controller/vector.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func ExtendConfigMapByVector(ctx context.Context, params VectorConfigParams, dat
5151
if err != nil {
5252
vectorLogger.Error(errors.Wrap(err, "error creating vector YAML"), "failed to create vector YAML")
5353
} else {
54-
data[builder.VectorConfigFile] = vectorYaml
54+
data[builder.VectorConfigFileName] = vectorYaml
5555
}
5656
}
5757

internal/util/secret.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (s *SecretVolumeBuilder) Build() corev1.Volume {
4040
Spec: corev1.PersistentVolumeClaimSpec{
4141
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
4242
StorageClassName: func() *string {
43-
cs := "secrets.zncdata.dev"
43+
cs := "secrets.kubedoop.dev"
4444
return &cs
4545
}(),
4646
VolumeMode: func() *corev1.PersistentVolumeMode { v := corev1.PersistentVolumeFilesystem; return &v }(),

test/e2e/default/kafka.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kafka.zncdata.dev/v1alpha1
1+
apiVersion: kafka.kubedoop.dev/v1alpha1
22
kind: KafkaCluster
33
metadata:
44
labels:

test/e2e/setup/zookeeper.yaml

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: zookeeper.zncdata.dev/v1alpha1
1+
apiVersion: zookeeper.kubedoop.dev/v1alpha1
22
kind: ZookeeperCluster
33
metadata:
44
name: zookeepercluster-sample
@@ -18,17 +18,8 @@ spec:
1818
max: "800m"
1919
memory:
2020
limit: "2Gi"
21-
logging:
22-
zookeeperCluster:
23-
loggers:
24-
test:
25-
level: DEBUG
26-
console:
27-
level: INFO
28-
file:
29-
level: INFO
3021
---
31-
apiVersion: zookeeper.zncdata.dev/v1alpha1
22+
apiVersion: zookeeper.kubedoop.dev/v1alpha1
3223
kind: ZookeeperZnode
3324
metadata:
3425
labels:
@@ -41,4 +32,3 @@ metadata:
4132
spec:
4233
clusterRef:
4334
name: zookeepercluster-sample
44-

test/e2e/vector/kafka.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kafka.zncdata.dev/v1alpha1
1+
apiVersion: kafka.kubedoop.dev/v1alpha1
22
kind: KafkaCluster
33
metadata:
44
labels:

0 commit comments

Comments
 (0)