Fix scaffolding

PROJECT

@@ -1,8 +1,8 @@
 domain: prosimcorp.com
 layout:
 - go.kubebuilder.io/v3
-projectName: replika
-repo: github.com/prosimcorp/replika
+projectName: replika2
+repo: prosimcorp.com/replika
 resources:
 - api:
     crdVersion: v1
@@ -11,6 +11,6 @@ resources:
   domain: prosimcorp.com
   group: replika
   kind: Replika
-  path: github.com/prosimcorp/replika/api/v1alpha1
+  path: prosimcorp.com/replika/api/v1alpha1
   version: v1alpha1
-version: "3"
+version: "3"

config/default/kustomization.yaml

@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: replika
+namespace: replika2-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: replika-
+namePrefix: replika2-
 
 # Labels to add to all resources and selectors.
 #commonLabels:

config/manager/controller_manager_config.yaml

@@ -8,4 +8,4 @@ webhook:
   port: 9443
 leaderElection:
   leaderElect: true
-  resourceName: bdf6c878.prosimcorp.com
+  resourceName: 562e2a83.prosimcorp.com

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: prosimcorp/replika
-  newTag: v0.2.0
+  newTag: v0.2.1

config/manager/manager.yaml

@@ -47,6 +47,7 @@ spec:
             port: 8081
           initialDelaySeconds: 5
           periodSeconds: 10
+        # TODO(user): Configure the resources accordingly based on the project requirements.
         # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
         resources:
           limits:

controllers/replika_controller.go

@@ -18,15 +18,15 @@ package controllers
 
 import (
 	"context"
-	"time"
-
-	replikav1alpha1 "github.com/prosimcorp/replika/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"time"
+
 	"k8s.io/apimachinery/pkg/runtime"
+	replikav1alpha1 "prosimcorp.com/replika/api/v1alpha1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
 const (
@@ -77,7 +77,7 @@ func (r *ReplikaReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re
 	defer func() {
 		err = r.Status().Update(ctx, replikaManifest)
 		if err != nil {
-			LogInfof(ctx, "Failed to update the condition on replika: %s", req.Name)
+			LogInfof(ctx, "Failed to update the conditionnnnnnn on replika: %s", req.Name)
 		}
 	}()
 

controllers/replika_status.go

@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	replikav1alpha1 "github.com/prosimcorp/replika/api/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	replikav1alpha1 "prosimcorp.com/replika/api/v1alpha1"
 )
 
 // https://github.com/external-secrets/external-secrets/blob/80545f4f183795ef193747fc959558c761b51c99/apis/externalsecrets/v1alpha1/externalsecret_types.go#L168

controllers/replika_sync.go

@@ -5,11 +5,11 @@ import (
 	"regexp"
 	"time"
 
-	replikav1alpha1 "github.com/prosimcorp/replika/api/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	replikav1alpha1 "prosimcorp.com/replika/api/v1alpha1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 

controllers/suite_test.go

@@ -30,7 +30,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	replikav1alpha1 "prosimcorp/replika/api/v1alpha1"
+	replikav1alpha1 "prosimcorp.com/replika/api/v1alpha1"
 	//+kubebuilder:scaffold:imports
 )
 

deploy/clusterrole/replika-manager-role.yaml → deploy/clusterrole/replika2-manager-role.yaml

@@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: replika-manager-role
+  name: replika2-manager-role
 rules:
 - apiGroups:
   - ""

deploy/clusterrole/replika-metrics-reader.yaml → deploy/clusterrole/replika2-metrics-reader.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: replika-metrics-reader
+  name: replika2-metrics-reader
 rules:
 - nonResourceURLs:
   - /metrics

deploy/clusterrole/replika-proxy-role.yaml → deploy/clusterrole/replika2-proxy-role.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: replika-proxy-role
+  name: replika2-proxy-role
 rules:
 - apiGroups:
   - authentication.k8s.io

deploy/clusterrolebinding/replika-proxy-rolebinding.yaml → deploy/clusterrolebinding/replika2-manager-rolebinding.yaml

@@ -1,13 +1,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: replika-proxy-rolebinding
+  name: replika2-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: replika-proxy-role
+  name: replika2-manager-role
 subjects:
 - kind: ServiceAccount
-  name: replika-controller-manager
-  namespace: replika
+  name: replika2-controller-manager
+  namespace: replika2-system
 

deploy/clusterrolebinding/replika-manager-rolebinding.yaml → deploy/clusterrolebinding/replika2-proxy-rolebinding.yaml

@@ -1,13 +1,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: replika-manager-rolebinding
+  name: replika2-proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: replika-manager-role
+  name: replika2-proxy-role
 subjects:
 - kind: ServiceAccount
-  name: replika-controller-manager
-  namespace: replika
+  name: replika2-controller-manager
+  namespace: replika2-system
 

deploy/configmap/replika-manager-config.yaml → deploy/configmap/replika2-manager-config.yaml

@@ -11,9 +11,9 @@ data:
       port: 9443
     leaderElection:
       leaderElect: true
-      resourceName: bdf6c878.prosimcorp.com
+      resourceName: 562e2a83.prosimcorp.com
 kind: ConfigMap
 metadata:
-  name: replika-manager-config
-  namespace: replika
+  name: replika2-manager-config
+  namespace: replika2-system
 

deploy/deployment/replika-controller-manager.yaml → deploy/deployment/replika2-controller-manager.yaml

@@ -3,8 +3,8 @@ kind: Deployment
 metadata:
   labels:
     control-plane: controller-manager
-  name: replika-controller-manager
-  namespace: replika
+  name: replika2-controller-manager
+  namespace: replika2-system
 spec:
   replicas: 1
   selector:
@@ -42,7 +42,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: prosimcorp/replika:v0.2.0
+        image: prosimcorp/replika:v0.2.1
         livenessProbe:
           httpGet:
             path: /healthz
@@ -67,6 +67,6 @@ spec:
           allowPrivilegeEscalation: false
       securityContext:
         runAsNonRoot: true
-      serviceAccountName: replika-controller-manager
+      serviceAccountName: replika2-controller-manager
       terminationGracePeriodSeconds: 10
 

deploy/kustomization.yaml

@@ -1,16 +1,16 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- clusterrole/replika-manager-role.yaml
-- clusterrole/replika-metrics-reader.yaml
-- clusterrole/replika-proxy-role.yaml
-- clusterrolebinding/replika-manager-rolebinding.yaml
-- clusterrolebinding/replika-proxy-rolebinding.yaml
-- configmap/replika-manager-config.yaml
+- clusterrole/replika2-manager-role.yaml
+- clusterrole/replika2-metrics-reader.yaml
+- clusterrole/replika2-proxy-role.yaml
+- clusterrolebinding/replika2-manager-rolebinding.yaml
+- clusterrolebinding/replika2-proxy-rolebinding.yaml
+- configmap/replika2-manager-config.yaml
 - customresourcedefinition/replikas-replika-prosimcorp-com.yaml
-- deployment/replika-controller-manager.yaml
-- namespace/replika.yaml
-- role/replika-leader-election-role.yaml
-- rolebinding/replika-leader-election-rolebinding.yaml
-- service/replika-controller-manager-metrics-service.yaml
-- serviceaccount/replika-controller-manager.yaml
+- deployment/replika2-controller-manager.yaml
+- namespace/replika2-system.yaml
+- role/replika2-leader-election-role.yaml
+- rolebinding/replika2-leader-election-rolebinding.yaml
+- service/replika2-controller-manager-metrics-service.yaml
+- serviceaccount/replika2-controller-manager.yaml

deploy/namespace/replika.yaml → deploy/namespace/replika2-system.yaml

@@ -3,5 +3,5 @@ kind: Namespace
 metadata:
   labels:
     control-plane: controller-manager
-  name: replika
+  name: replika2-system
 

deploy/role/replika-leader-election-role.yaml → deploy/role/replika2-leader-election-role.yaml

@@ -1,8 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: replika-leader-election-role
-  namespace: replika
+  name: replika2-leader-election-role
+  namespace: replika2-system
 rules:
 - apiGroups:
   - ""

deploy/rolebinding/replika2-leader-election-rolebinding.yaml

@@ -0,0 +1,14 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: replika2-leader-election-rolebinding
+  namespace: replika2-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: replika2-leader-election-role
+subjects:
+- kind: ServiceAccount
+  name: replika2-controller-manager
+  namespace: replika2-system
+

deploy/service/replika-controller-manager-metrics-service.yaml → deploy/service/replika2-controller-manager-metrics-service.yaml

@@ -3,8 +3,8 @@ kind: Service
 metadata:
   labels:
     control-plane: controller-manager
-  name: replika-controller-manager-metrics-service
-  namespace: replika
+  name: replika2-controller-manager-metrics-service
+  namespace: replika2-system
 spec:
   ports:
   - name: https

deploy/serviceaccount/replika2-controller-manager.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: replika2-controller-manager
+  namespace: replika2-system
+

go.mod

@@ -1,12 +1,10 @@
-module prosimcorp/replika
+module prosimcorp.com/replika
 
 go 1.17
 
 require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.17.0
-	github.com/prosimcorp/replika v0.0.0-20220227061546-1d2e8f395386
-	k8s.io/api v0.23.0
 	k8s.io/apimachinery v0.23.0
 	k8s.io/client-go v0.23.0
 	sigs.k8s.io/controller-runtime v0.11.0
@@ -64,6 +62,7 @@ require (
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/api v0.23.0 // indirect
 	k8s.io/apiextensions-apiserver v0.23.0 // indirect
 	k8s.io/component-base v0.23.0 // indirect
 	k8s.io/klog/v2 v2.30.0 // indirect

go.sum

@@ -405,8 +405,6 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
 github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/prosimcorp/replika v0.0.0-20220227061546-1d2e8f395386 h1:5XP9yiHjcFQguBf2mcdMFOu7EIC9ZetmnJbP3iAMu58=
-github.com/prosimcorp/replika v0.0.0-20220227061546-1d2e8f395386/go.mod h1:PENxqjZMZxLNONbZC/KHevlm19czginxl/n8CHOexOg=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

main.go

@@ -31,8 +31,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	replikav1alpha1 "github.com/prosimcorp/replika/api/v1alpha1"
-	"github.com/prosimcorp/replika/controllers"
+	replikav1alpha1 "prosimcorp.com/replika/api/v1alpha1"
+	"prosimcorp.com/replika/controllers"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -71,8 +71,7 @@ func main() {
 		Port:                   9443,
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
-		//LeaderElectionID:       "bdf6c878.prosimcorp.com",
-		LeaderElectionID: "ed4e541f.prosimcorp.com",
+		LeaderElectionID:       "562e2a83.prosimcorp.com",
 	})
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")