From 244177a9b43ca8fbcadfbc78394eefcee1d760ba Mon Sep 17 00:00:00 2001 From: HaimKortovich Date: Tue, 7 Apr 2026 11:32:06 -0500 Subject: [PATCH] use rbac for leases --- .gitea/workflows/build-and-publish.yaml | 7 ++++++ ops/chart/templates/manager-rbac.yaml | 12 ++++++++++ src/PROJECT | 18 +++++++------- src/cmd/main.go | 8 +++---- src/config/rbac/role.yaml | 12 ++++++++++ src/go.mod | 14 +++-------- src/go.sum | 24 ------------------- .../controller/connection_controller.go | 9 +++---- .../connection_controller_finalizer.go | 4 ++-- .../controller/machineuser_controller.go | 8 +++---- .../machineuser_controller_finalizer.go | 4 ++-- src/internal/controller/oidcapp_controller.go | 8 +++---- .../oidcapp_controller_finalizer.go | 4 ++-- .../controller/organization_controller.go | 6 ++--- .../organization_controller_finalizer.go | 4 ++-- src/internal/controller/project_controller.go | 6 ++--- .../project_controller_finalizer.go | 4 ++-- src/internal/controller/suite_test.go | 2 +- src/pkg/builder/secret_builder.go | 2 +- src/pkg/condition/pat.go | 2 +- src/pkg/condition/ready.go | 2 +- src/pkg/controller/core/controller.go | 6 ++--- src/pkg/controller/core/finalizer.go | 4 ++-- src/pkg/controller/core/types.go | 4 ++-- src/pkg/zitadel/zitadel.go | 2 +- 25 files changed, 88 insertions(+), 88 deletions(-) diff --git a/.gitea/workflows/build-and-publish.yaml b/.gitea/workflows/build-and-publish.yaml index 8df332b..4fd703a 100644 --- a/.gitea/workflows/build-and-publish.yaml +++ b/.gitea/workflows/build-and-publish.yaml @@ -21,6 +21,13 @@ jobs: - uses: DeterminateSystems/flake-checker-action@main with: flake-lock-path: ./build/flake.lock + + - name: Setup Attic cache + uses: ryanccn/attic-action@v0 + with: + endpoint: ${{ secrets.ATTIC_ENDPOINT }} + cache: ${{ secrets.ATTIC_CACHE }} + token: ${{ secrets.ATTIC_TOKEN }} - name: Build Docker Image via Nix Flake run: | diff --git a/ops/chart/templates/manager-rbac.yaml b/ops/chart/templates/manager-rbac.yaml index e72dd10..ec1d11e 100644 --- a/ops/chart/templates/manager-rbac.yaml +++ b/ops/chart/templates/manager-rbac.yaml @@ -14,6 +14,18 @@ rules: - list - patch - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create + - delete + - get + - list + - patch + - update + - watch - apiGroups: - zitadel.github.com resources: diff --git a/src/PROJECT b/src/PROJECT index 3e9ccac..53a653e 100644 --- a/src/PROJECT +++ b/src/PROJECT @@ -9,7 +9,7 @@ plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} projectName: src -repo: github.com/HaimKortovich/zitadel-resources-operator +repo: gitea.corredorconect.com/software-engineering/zitadel-resources-operator resources: - api: crdVersion: v1 @@ -18,7 +18,7 @@ resources: domain: github.com group: zitadel kind: Organization - path: github.com/HaimKortovich/zitadel-k8s-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -27,7 +27,7 @@ resources: domain: github.com group: zitadel kind: Project - path: github.com/HaimKortovich/zitadel-k8s-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -36,7 +36,7 @@ resources: domain: github.com group: zitadel kind: OIDCApp - path: github.com/HaimKortovich/zitadel-k8s-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -45,7 +45,7 @@ resources: domain: github.com group: zitadel kind: MachineUser - path: github.com/HaimKortovich/zitadel-k8s-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -54,7 +54,7 @@ resources: domain: github.com group: zitadel kind: APIApp - path: github.com/HaimKortovich/zitadel-k8s-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -63,7 +63,7 @@ resources: domain: github.com group: zitadel kind: Action - path: github.com/HaimKortovich/zitadel-k8s-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -72,7 +72,7 @@ resources: domain: github.com group: zitadel kind: Flow - path: github.com/HaimKortovich/zitadel-k8s-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 version: v1alpha1 - api: - api: @@ -82,6 +82,6 @@ resources: domain: github.com group: zitadel kind: Connection - path: github.com/HaimKortovich/zitadel-k8s-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/src/cmd/main.go b/src/cmd/main.go index 78063f3..9922217 100644 --- a/src/cmd/main.go +++ b/src/cmd/main.go @@ -34,10 +34,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" server "sigs.k8s.io/controller-runtime/pkg/metrics/server" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - "github.com/HaimKortovich/zitadel-resources-operator/internal/controller" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/builder" - conditions "github.com/HaimKortovich/zitadel-resources-operator/pkg/condition" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/internal/controller" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/builder" + conditions "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/condition" //+kubebuilder:scaffold:imports ) diff --git a/src/config/rbac/role.yaml b/src/config/rbac/role.yaml index 70c5c32..10024e9 100644 --- a/src/config/rbac/role.yaml +++ b/src/config/rbac/role.yaml @@ -13,6 +13,18 @@ rules: - list - patch - watch +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create + - delete + - get + - list + - patch + - update + - watch - apiGroups: - zitadel.github.com resources: diff --git a/src/go.mod b/src/go.mod index e53b530..a014c64 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,4 +1,4 @@ -module github.com/HaimKortovich/zitadel-resources-operator +module gitea.corredorconect.com/software-engineering/zitadel-resources-operator go 1.25.8 @@ -6,9 +6,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/onsi/ginkgo/v2 v2.23.3 github.com/onsi/gomega v1.36.3 - github.com/sethvargo/go-password v0.3.1 github.com/zitadel/zitadel-go/v3 v3.27.0 - google.golang.org/grpc v1.79.3 google.golang.org/protobuf v1.36.11 k8s.io/api v0.32.3 k8s.io/apimachinery v0.32.3 @@ -20,11 +18,10 @@ require ( require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/cloudnative-pg/barman-cloud v0.1.0 // indirect - github.com/cloudnative-pg/machinery v0.1.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/envoyproxy/protoc-gen-validate v1.3.3 // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.9.11 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect @@ -45,23 +42,17 @@ require ( github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/securecookie v1.1.2 // indirect - github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.11 // indirect - github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0 // indirect - github.com/lib/pq v1.10.9 // indirect github.com/mailru/easyjson v0.9.0 // indirect - github.com/moby/spdystream v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/muhlemmer/gu v0.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 // indirect github.com/prometheus/client_golang v1.21.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.62.0 // indirect @@ -89,6 +80,7 @@ require ( gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260209200024-4cfbd4190f57 // indirect + google.golang.org/grpc v1.79.3 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/src/go.sum b/src/go.sum index fd74911..76443b5 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,17 +1,9 @@ -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bmatcuk/doublestar/v4 v4.10.0 h1:zU9WiOla1YA122oLM6i4EXvGW62DvKZVxIe6TYWexEs= github.com/bmatcuk/doublestar/v4 v4.10.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cloudnative-pg/barman-cloud v0.1.0 h1:e/z52CehMBIh1LjZqNBJnncWJbS+1JYvRMBR8Js6Uiw= -github.com/cloudnative-pg/barman-cloud v0.1.0/go.mod h1:rJUJO/f1yNckLZiVxHAyRmKY+4EPJkYRJsGbTZRJQSY= -github.com/cloudnative-pg/cloudnative-pg v1.25.1 h1:Yc6T7ikQ1AiWXBQht+6C3DoihrIpUN2OkM1dIwqadTo= -github.com/cloudnative-pg/cloudnative-pg v1.25.1/go.mod h1:96b9bRFLSr3uFWHjhytPdcvKIKwy9H6AG7cH0O6jefs= -github.com/cloudnative-pg/machinery v0.1.0 h1:tjRmsqQmsO/OlaT0uFmkEtVqgr+SGPM88cKZOHYKLBo= -github.com/cloudnative-pg/machinery v0.1.0/go.mod h1:0V3vm44FaIsY+x4pm8ORry7xCC3AJiO+ebfPNxeP5Ck= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -67,8 +59,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs= github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= @@ -89,16 +79,10 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0 h1:Q3jQ1NkFqv5o+F8dMmHd8SfEmlcwNeo1immFApntEwE= -github.com/kubernetes-csi/external-snapshotter/client/v8 v8.2.0/go.mod h1:E3vdYxHj2C2q6qo8/Da4g7P+IcwqRZyy3gJBzYybV9Y= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= -github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= -github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= -github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -110,8 +94,6 @@ github.com/muhlemmer/httpforwarded v0.1.0 h1:x4DLrzXdliq8mprgUMR0olDvHGkou5BJsK/ github.com/muhlemmer/httpforwarded v0.1.0/go.mod h1:yo9czKedo2pdZhoXe+yDkGVbU0TJ0q9oQ90BVoDEtw0= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/onsi/ginkgo/v2 v2.23.3 h1:edHxnszytJ4lD9D5Jjc4tiDkPBZ3siDeJJkUZJJVkp0= github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM= github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU= @@ -121,8 +103,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1 h1:DP+PUNVOc+Bkft8a4QunLzaZ0RspWuD3tBbcPHr2PeE= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.80.1/go.mod h1:6x4x0t9BP35g4XcjkHE9EB3RxhyfxpdpmZKd/Qyk8+M= github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA= github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= @@ -135,8 +115,6 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/sethvargo/go-password v0.3.1 h1:WqrLTjo7X6AcVYfC6R7GtSyuUQR9hGyAj/f1PYQZCJU= -github.com/sethvargo/go-password v0.3.1/go.mod h1:rXofC1zT54N7R8K/h1WDUdkf9BOx5OptoxrMBcrXzvs= github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w= github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g= github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= @@ -145,8 +123,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/thoas/go-funk v0.9.3 h1:7+nAEx3kn5ZJcnDm2Bh23N2yOtweO14bi//dvRtgLpw= -github.com/thoas/go-funk v0.9.3/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/src/internal/controller/connection_controller.go b/src/internal/controller/connection_controller.go index 6e88ec3..5ae71cb 100644 --- a/src/internal/controller/connection_controller.go +++ b/src/internal/controller/connection_controller.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/builder" - condition "github.com/HaimKortovich/zitadel-resources-operator/pkg/condition" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/builder" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" clientv2 "github.com/zitadel/zitadel-go/v3/pkg/client" "k8s.io/client-go/util/workqueue" ctrl "sigs.k8s.io/controller-runtime" @@ -57,6 +57,7 @@ func NewConnectionReconciler(client client.Client, refResolver *zitadelv1alpha1. //+kubebuilder:rbac:groups=zitadel.github.com,resources=connections/status,verbs=get;update;patch //+kubebuilder:rbac:groups=zitadel.github.com,resources=connections/finalizers,verbs=update // +kubebuilder:rbac:groups="",resources=secrets,verbs=list;watch;create;patch +// +kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;list;watch;create;update;patch;delete // Reconcile is part of the main kubernetes reconciliation loop which aims to // move the current state of the cluster closer to the desired state. diff --git a/src/internal/controller/connection_controller_finalizer.go b/src/internal/controller/connection_controller_finalizer.go index ada388d..5691230 100644 --- a/src/internal/controller/connection_controller_finalizer.go +++ b/src/internal/controller/connection_controller_finalizer.go @@ -1,8 +1,8 @@ package controller import ( - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/machineuser_controller.go b/src/internal/controller/machineuser_controller.go index 655f5d7..00ba0b2 100644 --- a/src/internal/controller/machineuser_controller.go +++ b/src/internal/controller/machineuser_controller.go @@ -6,10 +6,10 @@ import ( "slices" "time" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/builder" - condition "github.com/HaimKortovich/zitadel-resources-operator/pkg/condition" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/builder" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" clientv2 "github.com/zitadel/zitadel-go/v3/pkg/client" "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/filter/v2" "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/internal_permission/v2" diff --git a/src/internal/controller/machineuser_controller_finalizer.go b/src/internal/controller/machineuser_controller_finalizer.go index fd144c9..fddc65f 100644 --- a/src/internal/controller/machineuser_controller_finalizer.go +++ b/src/internal/controller/machineuser_controller_finalizer.go @@ -1,8 +1,8 @@ package controller import ( - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/oidcapp_controller.go b/src/internal/controller/oidcapp_controller.go index 2e2c3e4..84f542f 100644 --- a/src/internal/controller/oidcapp_controller.go +++ b/src/internal/controller/oidcapp_controller.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/builder" - condition "github.com/HaimKortovich/zitadel-resources-operator/pkg/condition" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/builder" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" clientv2 "github.com/zitadel/zitadel-go/v3/pkg/client" "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/application/v2" "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/filter/v2" diff --git a/src/internal/controller/oidcapp_controller_finalizer.go b/src/internal/controller/oidcapp_controller_finalizer.go index 6a14529..9a789ba 100644 --- a/src/internal/controller/oidcapp_controller_finalizer.go +++ b/src/internal/controller/oidcapp_controller_finalizer.go @@ -3,8 +3,8 @@ package controller import ( "strings" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/organization_controller.go b/src/internal/controller/organization_controller.go index cdd2053..c8f4a59 100644 --- a/src/internal/controller/organization_controller.go +++ b/src/internal/controller/organization_controller.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - condition "github.com/HaimKortovich/zitadel-resources-operator/pkg/condition" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" clientv2 "github.com/zitadel/zitadel-go/v3/pkg/client" "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/object/v2" "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/org/v2" diff --git a/src/internal/controller/organization_controller_finalizer.go b/src/internal/controller/organization_controller_finalizer.go index 5cb9c0e..b42279f 100644 --- a/src/internal/controller/organization_controller_finalizer.go +++ b/src/internal/controller/organization_controller_finalizer.go @@ -1,8 +1,8 @@ package controller import ( - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/project_controller.go b/src/internal/controller/project_controller.go index 616c6a7..47675ce 100644 --- a/src/internal/controller/project_controller.go +++ b/src/internal/controller/project_controller.go @@ -23,9 +23,9 @@ import ( "sort" "time" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - condition "github.com/HaimKortovich/zitadel-resources-operator/pkg/condition" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" clientv2 "github.com/zitadel/zitadel-go/v3/pkg/client" "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/filter/v2" diff --git a/src/internal/controller/project_controller_finalizer.go b/src/internal/controller/project_controller_finalizer.go index 402ea33..1402f70 100644 --- a/src/internal/controller/project_controller_finalizer.go +++ b/src/internal/controller/project_controller_finalizer.go @@ -1,8 +1,8 @@ package controller import ( - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - "github.com/HaimKortovich/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/suite_test.go b/src/internal/controller/suite_test.go index cf2f829..eb1443b 100644 --- a/src/internal/controller/suite_test.go +++ b/src/internal/controller/suite_test.go @@ -30,7 +30,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/src/pkg/builder/secret_builder.go b/src/pkg/builder/secret_builder.go index 77832b1..308a6e4 100644 --- a/src/pkg/builder/secret_builder.go +++ b/src/pkg/builder/secret_builder.go @@ -2,7 +2,7 @@ package builder import ( "fmt" - metadata "github.com/HaimKortovich/zitadel-resources-operator/pkg/builder/metadata" + metadata "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/builder/metadata" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/src/pkg/condition/pat.go b/src/pkg/condition/pat.go index 971d1e7..b9b94a8 100644 --- a/src/pkg/condition/pat.go +++ b/src/pkg/condition/pat.go @@ -3,7 +3,7 @@ package conditions import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" ) func SetPatOutOfDate(c Conditioner) { diff --git a/src/pkg/condition/ready.go b/src/pkg/condition/ready.go index 14ee71e..c2a87ff 100644 --- a/src/pkg/condition/ready.go +++ b/src/pkg/condition/ready.go @@ -4,7 +4,7 @@ import ( appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" ) func SetReadyHealthty(c Conditioner) { diff --git a/src/pkg/controller/core/controller.go b/src/pkg/controller/core/controller.go index df65362..bb130fc 100644 --- a/src/pkg/controller/core/controller.go +++ b/src/pkg/controller/core/controller.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - condition "github.com/HaimKortovich/zitadel-resources-operator/pkg/condition" - zitadelClient "github.com/HaimKortovich/zitadel-resources-operator/pkg/zitadel" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/condition" + zitadelClient "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/zitadel" "github.com/hashicorp/go-multierror" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/src/pkg/controller/core/finalizer.go b/src/pkg/controller/core/finalizer.go index 0e1e8d1..a4da94e 100644 --- a/src/pkg/controller/core/finalizer.go +++ b/src/pkg/controller/core/finalizer.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" - zitadelClient "github.com/HaimKortovich/zitadel-resources-operator/pkg/zitadel" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + zitadelClient "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/zitadel" apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/src/pkg/controller/core/types.go b/src/pkg/controller/core/types.go index 15a9d1c..ba4501f 100644 --- a/src/pkg/controller/core/types.go +++ b/src/pkg/controller/core/types.go @@ -3,10 +3,10 @@ package core import ( "context" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" "github.com/zitadel/zitadel-go/v3/pkg/client" - condition "github.com/HaimKortovich/zitadel-resources-operator/pkg/condition" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/condition" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/src/pkg/zitadel/zitadel.go b/src/pkg/zitadel/zitadel.go index b580842..c6de48b 100644 --- a/src/pkg/zitadel/zitadel.go +++ b/src/pkg/zitadel/zitadel.go @@ -3,7 +3,7 @@ package zitadel import ( "context" "fmt" - zitadelv1alpha1 "github.com/HaimKortovich/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" clientv2 "github.com/zitadel/zitadel-go/v3/pkg/client" z "github.com/zitadel/zitadel-go/v3/pkg/zitadel" )