(misc) fix module name

jitsi-contrib · May 24, 2022 · eb013e7 · eb013e7
1 parent e8e5855
commit eb013e7
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 22 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,7 @@ COPY controllers/ controllers/
 
 # Build
 ARG VERSION
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -ldflags="-X 'jitsi-operator/api/v1alpha1.Version=${VERSION}'" -a -o manager main.go
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -ldflags="-X 'github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1.Version=${VERSION}'" -a -o manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details

diff --git a/PROJECT b/PROJECT
@@ -1,8 +1,8 @@
 domain: jit.si
 layout:
 - go.kubebuilder.io/v3
-projectName: jitsi-operator
-repo: jitsi-operator
+projectName: jitsi-kubernetes-operator
+repo: github.com/jitsi-contrib/jitsi-kubernetes-operator
 resources:
 - api:
     crdVersion: v1
@@ -11,6 +11,6 @@ resources:
   domain: jit.si
   group: apps
   kind: Jitsi
-  path: jitsi-operator/api/v1alpha1
+  path: github.com/jitsi-contrib/jitsi-kubernetes-operator/jitsi-kubernetes-operator/api/v1alpha1
   version: v1alpha1
 version: "3"
diff --git a/api/v1alpha1/jitsi_helpers.go b/api/v1alpha1/jitsi_helpers.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 )
 
-var Version = "main"
+var Version = "master"
 
 var defaultEnvVarMap = map[string]string{
 	"JICOFO_AUTH_USER":                   "focus",

diff --git a/controllers/ingress.go b/controllers/ingress.go
@@ -2,7 +2,8 @@ package controllers
 
 import (
 	"fmt"
-	"jitsi-operator/api/v1alpha1"
+
+	"github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 
 	"github.com/presslabs/controller-util/pkg/syncer"
 	networkingv1 "k8s.io/api/networking/v1"

diff --git a/controllers/jibri.go b/controllers/jibri.go
@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"jitsi-operator/api/v1alpha1"
+	"github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 
 	"github.com/presslabs/controller-util/pkg/syncer"
 	appsv1 "k8s.io/api/apps/v1"

diff --git a/controllers/jicofo.go b/controllers/jicofo.go
@@ -2,7 +2,7 @@ package controllers
 
 import (
 	"fmt"
-	"jitsi-operator/api/v1alpha1"
+	"github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 
 	"github.com/presslabs/controller-util/pkg/syncer"
 	appsv1 "k8s.io/api/apps/v1"

diff --git a/controllers/jitsi_controller.go b/controllers/jitsi_controller.go
@@ -26,7 +26,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	appsv1alpha1 "jitsi-operator/api/v1alpha1"
+	appsv1alpha1 "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 )

diff --git a/controllers/jvb.go b/controllers/jvb.go
@@ -2,7 +2,8 @@ package controllers
 
 import (
 	"fmt"
-	"jitsi-operator/api/v1alpha1"
+
+	"github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 
 	"github.com/presslabs/controller-util/pkg/rand"
 	"github.com/presslabs/controller-util/pkg/syncer"

diff --git a/controllers/monitoring.go b/controllers/monitoring.go
@@ -2,7 +2,8 @@ package controllers
 
 import (
 	"fmt"
-	"jitsi-operator/api/v1alpha1"
+
+	"github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 
 	"github.com/presslabs/controller-util/pkg/syncer"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"

diff --git a/controllers/prosody.go b/controllers/prosody.go
@@ -2,7 +2,8 @@ package controllers
 
 import (
 	"fmt"
-	"jitsi-operator/api/v1alpha1"
+
+	"github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 
 	"github.com/presslabs/controller-util/pkg/syncer"
 	appsv1 "k8s.io/api/apps/v1"

diff --git a/controllers/suite_test.go b/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"
 
-	appsv1alpha1 "jitsi-operator/api/v1alpha1"
+	appsv1alpha1 "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/controllers/web.go b/controllers/web.go
@@ -2,7 +2,8 @@ package controllers
 
 import (
 	"fmt"
-	"jitsi-operator/api/v1alpha1"
+
+	"github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 
 	"github.com/presslabs/controller-util/pkg/syncer"
 	appsv1 "k8s.io/api/apps/v1"

diff --git a/deploy/jitsi-operator.yaml b/deploy/jitsi-operator.yaml
@@ -37,6 +37,8 @@ spec:
           spec:
             description: JitsiSpec defines the desired state of Jitsi
             properties:
+              disableGracefulUpgrade:
+                type: boolean
               domain:
                 type: string
               image:
@@ -2663,12 +2665,11 @@ spec:
           status:
             description: JitsiStatus defines the observed state of Jitsi
             properties:
-              jvb:
+              lastAppliedRevision:
                 description: 'INSERT ADDITIONAL STATUS FIELD - define observed state of cluster Important: Run "make" to regenerate code after modifying this file'
-                properties:
-                  jvb:
-                    type: integer
-                type: object
+                type: string
+              lastAttemptedRevision:
+                type: string
             type: object
         type: object
     served: true

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module jitsi-operator
+module github.com/jitsi-contrib/jitsi-kubernetes-operator
 
 go 1.17
 

diff --git a/main.go b/main.go
@@ -34,8 +34,9 @@ import (
 
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 
-	appsv1alpha1 "jitsi-operator/api/v1alpha1"
-	"jitsi-operator/controllers"
+	"github.com/jitsi-contrib/jitsi-kubernetes-operator/controllers"
+
+	appsv1alpha1 "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1"
 	//+kubebuilder:scaffold:imports
 )