From 2f6b9f0aaa19ca38ceefb7560e25a146c1056d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ko=CC=88hler?= Date: Tue, 30 Apr 2024 13:24:34 +0200 Subject: [PATCH] use enna-systems github, renaming docker registry folder --- .github/workflows/publish.yml | 4 ++-- Dockerfile | 2 +- Makefile | 4 ++-- PROJECT | 4 ++-- README.md | 15 ++++++++------- api/v1alpha1/jitsi_helpers.go | 2 +- config/manager/kustomization.yaml | 2 +- controllers/ingress.go | 2 +- controllers/jibri.go | 2 +- controllers/jicofo.go | 2 +- controllers/jitsi_controller.go | 2 +- controllers/jvb.go | 2 +- controllers/monitoring.go | 2 +- controllers/prosody.go | 2 +- controllers/suite_test.go | 2 +- controllers/web.go | 2 +- deploy/jitsi-operator.yaml | 2 +- go.mod | 2 +- hack/publish-source.yml | 4 ++-- main.go | 4 ++-- scripts/build-containters.sh | 4 ++-- scripts/test.sh | 2 +- 22 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index de79ef8..712886a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,8 +6,8 @@ on: pull_request: branches: [master] env: - REGISTRY: rg.fr-par.scw.cloud/prod-enna-nsp - BASE_REPO: rg.fr-par.scw.cloud/prod-enna-nsp/${{ github.repository }} + REGISTRY: rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems + BASE_REPO: rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems/${{ github.repository }} jobs: build-operator: runs-on: ubuntu-latest diff --git a/Dockerfile b/Dockerfile index eae3193..b6bee78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ COPY controllers/ controllers/ # Build ARG VERSION -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-X 'github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1.Version=${VERSION}'" -a -o manager main.go +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-X 'github.com/enna-systems/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/Makefile b/Makefile index f53d8e7..4712f71 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION ?= latest # Image URL to use all building/pushing image targets -IMG ?= rg.fr-par.scw.cloud/prod-enna-nsp/jitsi-kubernetes-operator:${VERSION} +IMG ?= rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems/jitsi-kubernetes-operator:${VERSION} # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.24.2 @@ -70,7 +70,7 @@ run: manifests generate fmt vet ## Run a controller from your host. .PHONY: docker-login docker-login: ## Push docker image with the manager. - docker login rg.fr-par.scw.cloud/prod-enna-nsp -u nologin -p ${SCW_TOKEN} + docker login rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems -u nologin -p ${SCW_TOKEN} .PHONY: docker-build docker-build: test ## Build docker image with the manager. diff --git a/PROJECT b/PROJECT index ebd7aae..9ec3a60 100644 --- a/PROJECT +++ b/PROJECT @@ -2,7 +2,7 @@ domain: jit.si layout: - go.kubebuilder.io/v3 projectName: jitsi-kubernetes-operator -repo: github.com/jitsi-contrib/jitsi-kubernetes-operator +repo: github.com/enna-systems/jitsi-kubernetes-operator resources: - api: crdVersion: v1 @@ -11,6 +11,6 @@ resources: domain: jit.si group: apps kind: Jitsi - path: github.com/jitsi-contrib/jitsi-kubernetes-operator/jitsi-kubernetes-operator/api/v1alpha1 + path: github.com/enna-systems/jitsi-kubernetes-operator/jitsi-kubernetes-operator/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/README.md b/README.md index aa81d25..5d185fb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ - # Autoscaling Kubernetes Operator A [https://k8s.libre.sh](https://k8s.libre.sh/) project @@ -7,7 +6,7 @@ A [https://k8s.libre.sh](https://k8s.libre.sh/) project ## The issue -With covid universities and schools have to provide large scale infrastructure for visionconferences. +With covid universities and schools have to provide large scale infrastructure for visionconferences. From an environmental standpoint, as much as technical and fincancial, running jitsi at scale can be challenging! ## Our magic solution @@ -28,9 +27,11 @@ Depending on your region of the world, or your taste. For the hackathon, we decided to use scaleway, as they provide autoscaling kubernetes cluster as a service ### Install our jitsi kubernetes operator -kubectl apply -f https://raw.githubusercontent.com/jitsi-contrib/jitsi-kubernetes-operator/master/deploy/jitsi-operator.yaml + +kubectl apply -f https://raw.githubusercontent.com/enna-systems/jitsi-kubernetes-operator/master/deploy/jitsi-operator.yaml ### custom jitsi web interface + cf [Custom jitsi Web interface](interfaceJitsi.md) ### Profit @@ -43,7 +44,7 @@ One JVB is deployed per node for network facilities, we need to know the JVB por Firewall needs to allow JVB ports A new replica of a JVB instance is a equivalent to new node in the kubernetes cluster -Single shard deployments. Multishard can be implemented later. +Single shard deployments. Multishard can be implemented later. 1 shard = 1 signaling server - prosody and jicofo instance - and multiple JVBs and Web instances 3 Topologies: @@ -53,12 +54,12 @@ If you wan to determistacaly define your deployements and replicas. ### Daemonset: -If all your cluster nodes are dedicated to your jitsi cluster, you can use this strategy. -JVB processes will be deployed on each nodes. +If all your cluster nodes are dedicated to your jitsi cluster, you can use this strategy. +JVB processes will be deployed on each nodes. ### Autoscalable: -JVB will be autoscaled according to stress level. +JVB will be autoscaled according to stress level. We had to tune how to read metrics for the jvb using: diff --git a/api/v1alpha1/jitsi_helpers.go b/api/v1alpha1/jitsi_helpers.go index 1e6ecca..3e7c8ff 100644 --- a/api/v1alpha1/jitsi_helpers.go +++ b/api/v1alpha1/jitsi_helpers.go @@ -111,7 +111,7 @@ func (jitsi *Jitsi) EnvVars(names []string) []corev1.EnvVar { func (jitsi *Jitsi) SetDefaults() { if len(jitsi.Spec.Image.Registry) == 0 { - jitsi.Spec.Image.Registry = "rg.fr-par.scw.cloud/prod-enna-nsp/jitsi-kubernetes-operator" + jitsi.Spec.Image.Registry = "rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems/jitsi-kubernetes-operator" } if len(jitsi.Spec.Image.Tag) == 0 { diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 3f8665f..885173e 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: rg.fr-par.scw.cloud/prod-enna-nsp/jitsi-kubernetes-operator + newName: rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems/jitsi-kubernetes-operator newTag: latest diff --git a/controllers/ingress.go b/controllers/ingress.go index 2c4ef19..88e0a82 100644 --- a/controllers/ingress.go +++ b/controllers/ingress.go @@ -3,7 +3,7 @@ package controllers import ( "fmt" - "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + "github.com/enna-systems/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 index e527e3a..7cdadbb 100644 --- a/controllers/jibri.go +++ b/controllers/jibri.go @@ -1,7 +1,7 @@ package controllers import ( - "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + "github.com/enna-systems/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 index 81bc6b9..e65bc1b 100644 --- a/controllers/jicofo.go +++ b/controllers/jicofo.go @@ -6,7 +6,7 @@ import ( "io" "net/http" - "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + "github.com/enna-systems/jitsi-kubernetes-operator/api/v1alpha1" "github.com/presslabs/controller-util/pkg/syncer" "github.com/tidwall/gjson" diff --git a/controllers/jitsi_controller.go b/controllers/jitsi_controller.go index a105e3c..e911b0b 100644 --- a/controllers/jitsi_controller.go +++ b/controllers/jitsi_controller.go @@ -28,7 +28,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - appsv1alpha1 "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + appsv1alpha1 "github.com/enna-systems/jitsi-kubernetes-operator/api/v1alpha1" apierrs "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/controllers/jvb.go b/controllers/jvb.go index 3eca8ae..0edf99a 100644 --- a/controllers/jvb.go +++ b/controllers/jvb.go @@ -3,7 +3,7 @@ package controllers import ( "fmt" - "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + "github.com/enna-systems/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 index 3184737..dd75876 100644 --- a/controllers/monitoring.go +++ b/controllers/monitoring.go @@ -3,7 +3,7 @@ package controllers import ( "fmt" - "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + "github.com/enna-systems/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 index 1d52e09..b4d7a32 100644 --- a/controllers/prosody.go +++ b/controllers/prosody.go @@ -3,7 +3,7 @@ package controllers import ( "fmt" - "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + "github.com/enna-systems/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 index 676e23b..3042792 100644 --- 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 "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + appsv1alpha1 "github.com/enna-systems/jitsi-kubernetes-operator/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/controllers/web.go b/controllers/web.go index 6ce7756..f7b3519 100644 --- a/controllers/web.go +++ b/controllers/web.go @@ -3,7 +3,7 @@ package controllers import ( "fmt" - "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + "github.com/enna-systems/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 index 7724901..62f8d6b 100644 --- a/deploy/jitsi-operator.yaml +++ b/deploy/jitsi-operator.yaml @@ -2949,7 +2949,7 @@ spec: - --leader-elect command: - /manager - image: rg.fr-par.scw.cloud/prod-enna-nsp/jitsi-kubernetes-operator:latest + image: rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems/jitsi-kubernetes-operator:latest livenessProbe: httpGet: path: /healthz diff --git a/go.mod b/go.mod index 874729a..00fc72c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/jitsi-contrib/jitsi-kubernetes-operator +module github.com/enna-systems/jitsi-kubernetes-operator go 1.18 diff --git a/hack/publish-source.yml b/hack/publish-source.yml index a413b91..ac1b1c6 100644 --- a/hack/publish-source.yml +++ b/hack/publish-source.yml @@ -8,8 +8,8 @@ on: branches: [master] env: - REGISTRY: rg.fr-par.scw.cloud/prod-enna-nsp - BASE_REPO: rg.fr-par.scw.cloud/prod-enna-nsp/${{ github.repository }} + REGISTRY: rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems + BASE_REPO: rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems/${{ github.repository }} jobs: build-operator: diff --git a/main.go b/main.go index 8425b80..3fe02e3 100644 --- a/main.go +++ b/main.go @@ -34,9 +34,9 @@ import ( monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1" - "github.com/jitsi-contrib/jitsi-kubernetes-operator/controllers" + "github.com/enna-systems/jitsi-kubernetes-operator/controllers" - appsv1alpha1 "github.com/jitsi-contrib/jitsi-kubernetes-operator/api/v1alpha1" + appsv1alpha1 "github.com/enna-systems/jitsi-kubernetes-operator/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/scripts/build-containters.sh b/scripts/build-containters.sh index fa7768e..c5ff8d1 100755 --- a/scripts/build-containters.sh +++ b/scripts/build-containters.sh @@ -5,7 +5,7 @@ JITSI_VERSION=$(cat JITSI_VERSION) for context in images/*; do name=$(basename $context) - docker buildx build --build-arg "JITSI_VERSION=$JITSI_VERSION" --file images/$name/Containerfile -t rg.fr-par.scw.cloud/prod-enna-nsp/jitsi-kubernetes-operator/$name:$VERSION -o type=docker,dest=build/$name.tar $context + docker buildx build --build-arg "JITSI_VERSION=$JITSI_VERSION" --file images/$name/Containerfile -t rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems/jitsi-kubernetes-operator/$name:$VERSION -o type=docker,dest=build/$name.tar $context done -docker buildx build --build-arg "VERSION=$VERSION" -t rg.fr-par.scw.cloud/prod-enna-nsp/jitsi-kubernetes-operator:$VERSION -o type=docker,dest=build/jitsi-kubernetes-operator.tar . \ No newline at end of file +docker buildx build --build-arg "VERSION=$VERSION" -t rg.fr-par.scw.cloud/prod-enna-nsp/enna-systems/jitsi-kubernetes-operator:$VERSION -o type=docker,dest=build/jitsi-kubernetes-operator.tar . \ No newline at end of file diff --git a/scripts/test.sh b/scripts/test.sh index e73ca2d..fffcb81 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -11,7 +11,7 @@ kind load image-archive --name jitsi-test build/web.tar kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml -cat deploy/jitsi-operator.yaml | sed "s#rg\.fr-par\.scw\.cloud/prod-enna-nsp/jitsi-kubernetes-operator:latest#$BASE_REPO:$VERSION#" | kubectl apply -f - +cat deploy/jitsi-operator.yaml | sed "s#rg\.fr-par\.scw\.cloud/prod-enna-nsp/enna-systems/jitsi-kubernetes-operator:latest#$BASE_REPO:$VERSION#" | kubectl apply -f - LOCAL_IP=$(ip route get 1 | awk '{print $7}') echo "Local IP is $LOCAL_IP"