Skip to content

Commit 1716243

Browse files
committed
feature: return nc group
1 parent d0d3443 commit 1716243

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

operator/api/v1alpha1/groupversion_info.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Package v1alpha1 contains API Schema definitions for the qubership.org v1alpha1 API group
1+
// Package v1alpha1 contains API Schema definitions for the netcracker.com v1alpha1 API group
22
// +kubebuilder:object:generate=true
3-
// +groupName=qubership.org
3+
// +groupName=netcracker.com
44
package v1alpha1
55

66
import (
@@ -10,7 +10,7 @@ import (
1010

1111
var (
1212
// GroupVersion is group version used to register these objects
13-
GroupVersion = schema.GroupVersion{Group: "qubership.org", Version: "v1alpha1"}
13+
GroupVersion = schema.GroupVersion{Group: "netcracker.com", Version: "v1alpha1"}
1414

1515
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
1616
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

operator/controllers/zookeeper_vault.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ package controllers
1616

1717
import (
1818
"fmt"
19+
"strings"
20+
1921
"github.com/Netcracker/qubership-zookeeper/operator/controllers/provider"
2022
"github.com/Netcracker/qubership-zookeeper/operator/util"
2123
corev1 "k8s.io/api/core/v1"
22-
"strings"
2324
)
2425

25-
const refreshCredentialsAnnotation = "vault.qubership.org/refresh-credentials"
26+
const refreshCredentialsAnnotation = "vault.netcracker.com/refresh-credentials"
2627

2728
type PasswordGenerator interface {
2829
Generate() (string, error)

operator/controllers/zookeeperservice_controller.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ package controllers
1717
import (
1818
"context"
1919
"fmt"
20+
"time"
21+
2022
zookeeperservice "github.com/Netcracker/qubership-zookeeper/operator/api/v1"
2123
"github.com/Netcracker/qubership-zookeeper/operator/controllers/provider"
2224
"github.com/Netcracker/qubership-zookeeper/operator/util"
@@ -28,7 +30,6 @@ import (
2830
logf "sigs.k8s.io/controller-runtime/pkg/log"
2931
"sigs.k8s.io/controller-runtime/pkg/predicate"
3032
"sigs.k8s.io/controller-runtime/pkg/reconcile"
31-
"time"
3233
)
3334

3435
const (
@@ -46,9 +47,9 @@ type ReconcileService interface {
4647
Status() error
4748
}
4849

49-
//+kubebuilder:rbac:groups=qubership.org,resources=zookeeperservices,verbs=get;list;watch;create;update;patch;delete
50-
//+kubebuilder:rbac:groups=qubership.org,resources=zookeeperservices/status,verbs=get;update;patch
51-
//+kubebuilder:rbac:groups=qubership.org,resources=zookeeperservices/finalizers,verbs=update
50+
//+kubebuilder:rbac:groups=netcracker.com,resources=zookeeperservices,verbs=get;list;watch;create;update;patch;delete
51+
//+kubebuilder:rbac:groups=netcracker.com,resources=zookeeperservices/status,verbs=get;update;patch
52+
//+kubebuilder:rbac:groups=netcracker.com,resources=zookeeperservices/finalizers,verbs=update
5253

5354
func (r *ZooKeeperServiceReconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.Result, error) {
5455
reqLogger := log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)

operator/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func main() {
8080
HealthProbeBindAddress: probeAddr,
8181
LeaderElection: enableLeaderElection,
8282
LeaderElectionNamespace: namespace,
83-
LeaderElectionID: fmt.Sprintf("zookeeperservice.%s.qubership.org", namespace),
83+
LeaderElectionID: fmt.Sprintf("zookeeperservice.%s.netcracker.com", namespace),
8484
})
8585
if err != nil {
8686
setupLog.Error(err, "unable to start manager")

0 commit comments

Comments
 (0)