diff --git a/ops/chart/values.yaml b/ops/chart/values.yaml index 3ecb3a8..15e9fc8 100644 --- a/ops/chart/values.yaml +++ b/ops/chart/values.yaml @@ -32,7 +32,6 @@ controllerManager: - ALL image: repository: gitea.corredorconect.com/software-engineering/zitadel-resources-operator - tag: latest resources: limits: cpu: 500m diff --git a/src/PROJECT b/src/PROJECT index 53a653e..f0b6f33 100644 --- a/src/PROJECT +++ b/src/PROJECT @@ -8,8 +8,8 @@ layout: plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} -projectName: src -repo: gitea.corredorconect.com/software-engineering/zitadel-resources-operator +projectName: zitadel-resources-operator +repo: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src resources: - api: crdVersion: v1 @@ -18,7 +18,7 @@ resources: domain: github.com group: zitadel kind: Organization - path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -27,7 +27,7 @@ resources: domain: github.com group: zitadel kind: Project - path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -36,7 +36,7 @@ resources: domain: github.com group: zitadel kind: OIDCApp - path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -45,7 +45,7 @@ resources: domain: github.com group: zitadel kind: MachineUser - path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -54,7 +54,7 @@ resources: domain: github.com group: zitadel kind: APIApp - path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -63,7 +63,7 @@ resources: domain: github.com group: zitadel kind: Action - path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -72,7 +72,7 @@ resources: domain: github.com group: zitadel kind: Flow - path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1 version: v1alpha1 - api: - api: @@ -82,6 +82,6 @@ resources: domain: github.com group: zitadel kind: Connection - path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1 + path: gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1 version: v1alpha1 version: "3" diff --git a/src/cmd/main.go b/src/cmd/main.go index 9922217..584ba6f 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 "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" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/internal/controller" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/builder" + conditions "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/condition" //+kubebuilder:scaffold:imports ) diff --git a/src/go.mod b/src/go.mod index a014c64..af3c2b4 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,4 +1,4 @@ -module gitea.corredorconect.com/software-engineering/zitadel-resources-operator +module gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src go 1.25.8 diff --git a/src/internal/controller/connection_controller.go b/src/internal/controller/connection_controller.go index 5ae71cb..fe27533 100644 --- a/src/internal/controller/connection_controller.go +++ b/src/internal/controller/connection_controller.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - 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" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/builder" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/controller/core" clientv2 "github.com/zitadel/zitadel-go/v3/pkg/client" "k8s.io/client-go/util/workqueue" ctrl "sigs.k8s.io/controller-runtime" diff --git a/src/internal/controller/connection_controller_finalizer.go b/src/internal/controller/connection_controller_finalizer.go index 5691230..4ecda66 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 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" - "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/machineuser_controller.go b/src/internal/controller/machineuser_controller.go index 00ba0b2..7d60a1d 100644 --- a/src/internal/controller/machineuser_controller.go +++ b/src/internal/controller/machineuser_controller.go @@ -6,10 +6,10 @@ import ( "slices" "time" - 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" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/builder" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/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 fddc65f..f8be23e 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 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" - "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/oidcapp_controller.go b/src/internal/controller/oidcapp_controller.go index 84f542f..e76dce2 100644 --- a/src/internal/controller/oidcapp_controller.go +++ b/src/internal/controller/oidcapp_controller.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - 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" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/builder" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/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 9a789ba..51052c9 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 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" - "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/organization_controller.go b/src/internal/controller/organization_controller.go index c8f4a59..3c1d8f5 100644 --- a/src/internal/controller/organization_controller.go +++ b/src/internal/controller/organization_controller.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - 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" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/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 b42279f..98d15d3 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 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" - "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/project_controller.go b/src/internal/controller/project_controller.go index 47675ce..14907d3 100644 --- a/src/internal/controller/project_controller.go +++ b/src/internal/controller/project_controller.go @@ -23,9 +23,9 @@ import ( "sort" "time" - 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" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/condition" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/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 1402f70..8b0fba6 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 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" - "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/controller/core" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/controller/core" "context" "fmt" diff --git a/src/internal/controller/suite_test.go b/src/internal/controller/suite_test.go index eb1443b..8da234c 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 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/src/pkg/builder/secret_builder.go b/src/pkg/builder/secret_builder.go index 308a6e4..f228b1e 100644 --- a/src/pkg/builder/secret_builder.go +++ b/src/pkg/builder/secret_builder.go @@ -2,7 +2,7 @@ package builder import ( "fmt" - metadata "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/builder/metadata" + metadata "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/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 b9b94a8..cf93358 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 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" ) func SetPatOutOfDate(c Conditioner) { diff --git a/src/pkg/condition/ready.go b/src/pkg/condition/ready.go index c2a87ff..9ef7f3e 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 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" ) func SetReadyHealthty(c Conditioner) { diff --git a/src/pkg/controller/core/controller.go b/src/pkg/controller/core/controller.go index bb130fc..11be221 100644 --- a/src/pkg/controller/core/controller.go +++ b/src/pkg/controller/core/controller.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - 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" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/pkg/condition" + zitadelClient "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/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 a4da94e..163e04a 100644 --- a/src/pkg/controller/core/finalizer.go +++ b/src/pkg/controller/core/finalizer.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" - zitadelClient "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/zitadel" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" + zitadelClient "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/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 ba4501f..bc9d074 100644 --- a/src/pkg/controller/core/types.go +++ b/src/pkg/controller/core/types.go @@ -3,10 +3,10 @@ package core import ( "context" - zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" "github.com/zitadel/zitadel-go/v3/pkg/client" - condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/pkg/condition" + condition "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/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 c6de48b..2e20ea2 100644 --- a/src/pkg/zitadel/zitadel.go +++ b/src/pkg/zitadel/zitadel.go @@ -3,7 +3,7 @@ package zitadel import ( "context" "fmt" - zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/api/v1alpha1" + zitadelv1alpha1 "gitea.corredorconect.com/software-engineering/zitadel-resources-operator/src/api/v1alpha1" clientv2 "github.com/zitadel/zitadel-go/v3/pkg/client" z "github.com/zitadel/zitadel-go/v3/pkg/zitadel" )