From 1febf72a299bec252194305d506f97b9205c881f Mon Sep 17 00:00:00 2001 From: Vibhav Bobade Date: Fri, 23 Feb 2024 17:38:00 +0530 Subject: [PATCH 1/2] refactor: cosolidate source --- Dockerfile | 4 ++-- Makefile | 4 ++-- kuttl-test.yaml | 2 +- main.go | 6 +++--- {api => src/api}/v1alpha1/groupversion_info.go | 0 {api => src/api}/v1alpha1/uffizzicluster_types.go | 0 {api => src/api}/v1alpha1/zz_generated.deepcopy.go | 0 {clientset => src/clientset}/v1alpha1/api.go | 2 +- .../clientset}/v1alpha1/uffizzicluster.go | 2 +- ...luster.uffizzi.com.uffizzi.com_uffizziclusters.yaml | 0 .../config}/crd/bases/uffizzi.com_uffizziclusters.yaml | 0 {config => src/config}/crd/kustomization.yaml | 0 {config => src/config}/crd/kustomizeconfig.yaml | 0 .../crd/patches/cainjection_in_ephemeralclusters.yaml | 0 {config => src/config}/crd/patches/labels.yaml | 0 .../crd/patches/webhook_in_ephemeralclusters.yaml | 0 {config => src/config}/default/kustomization.yaml | 0 .../config}/default/manager_auth_proxy_patch.yaml | 0 .../config}/default/manager_config_patch.yaml | 0 {config => src/config}/manager/kustomization.yaml | 0 {config => src/config}/manager/manager.yaml | 0 {config => src/config}/manifests/kustomization.yaml | 0 {config => src/config}/prometheus/kustomization.yaml | 0 {config => src/config}/prometheus/monitor.yaml | 0 .../config}/rbac/auth_proxy_client_clusterrole.yaml | 0 {config => src/config}/rbac/auth_proxy_role.yaml | 0 .../config}/rbac/auth_proxy_role_binding.yaml | 0 {config => src/config}/rbac/auth_proxy_service.yaml | 0 {config => src/config}/rbac/kustomization.yaml | 0 {config => src/config}/rbac/leader_election_role.yaml | 0 .../config}/rbac/leader_election_role_binding.yaml | 0 {config => src/config}/rbac/role.yaml | 0 {config => src/config}/rbac/role_binding.yaml | 0 {config => src/config}/rbac/service_account.yaml | 0 .../config}/rbac/uffizzicluster_editor_role.yaml | 0 .../config}/rbac/uffizzicluster_viewer_role.yaml | 0 ...ecluster.uffizzi.com_v1alpha1_ephemeralcluster.yaml | 0 {config => src/config}/samples/kustomization.yaml | 0 {config => src/config}/scorecard/bases/config.yaml | 0 {config => src/config}/scorecard/kustomization.yaml | 0 .../config}/scorecard/patches/basic.config.yaml | 2 +- .../config}/scorecard/patches/olm.config.yaml | 10 +++++----- .../controllers}/constants/constants.go | 0 .../controllers}/etcd/etcd_controller.go | 4 ++-- {controllers => src/controllers}/etcd/helm.go | 8 ++++---- .../controllers}/helm/build/etcd/build.go | 6 +++--- {controllers => src/controllers}/helm/build/tojson.go | 0 .../controllers}/helm/build/vcluster/build.go | 10 +++++----- .../controllers}/helm/build/vcluster/build_test.go | 2 +- {controllers => src/controllers}/helm/types/common.go | 0 .../controllers}/helm/types/etcd/etcd.go | 4 +++- .../controllers}/helm/types/vcluster/vcluster.go | 4 ++-- .../controllers}/uffizzicluster/conditions.go | 2 +- .../controllers}/uffizzicluster/conditions_test.go | 0 .../controllers}/uffizzicluster/deployment.go | 4 ++-- .../controllers}/uffizzicluster/helm.go | 8 ++++---- .../controllers}/uffizzicluster/networkpolicy.go | 4 ++-- .../controllers}/uffizzicluster/statefulset.go | 6 +++--- .../controllers}/uffizzicluster/suite_test.go | 5 ++--- .../uffizzicluster/uffizzicluster_controller.go | 6 +++--- .../controllers}/uffizzicluster/vcluster_test.go | 6 +++--- .../controllers}/uffizzicluster/workload.go | 7 +++---- {tests => src/test}/e2e/basic-k3s/00-assert.yaml | 0 {tests => src/test}/e2e/basic-k3s/00-install.yaml | 0 64 files changed, 59 insertions(+), 59 deletions(-) rename {api => src/api}/v1alpha1/groupversion_info.go (100%) rename {api => src/api}/v1alpha1/uffizzicluster_types.go (100%) rename {api => src/api}/v1alpha1/zz_generated.deepcopy.go (100%) rename {clientset => src/clientset}/v1alpha1/api.go (92%) rename {clientset => src/clientset}/v1alpha1/uffizzicluster.go (98%) rename {config => src/config}/crd/bases/ucluster.uffizzi.com.uffizzi.com_uffizziclusters.yaml (100%) rename {config => src/config}/crd/bases/uffizzi.com_uffizziclusters.yaml (100%) rename {config => src/config}/crd/kustomization.yaml (100%) rename {config => src/config}/crd/kustomizeconfig.yaml (100%) rename {config => src/config}/crd/patches/cainjection_in_ephemeralclusters.yaml (100%) rename {config => src/config}/crd/patches/labels.yaml (100%) rename {config => src/config}/crd/patches/webhook_in_ephemeralclusters.yaml (100%) rename {config => src/config}/default/kustomization.yaml (100%) rename {config => src/config}/default/manager_auth_proxy_patch.yaml (100%) rename {config => src/config}/default/manager_config_patch.yaml (100%) rename {config => src/config}/manager/kustomization.yaml (100%) rename {config => src/config}/manager/manager.yaml (100%) rename {config => src/config}/manifests/kustomization.yaml (100%) rename {config => src/config}/prometheus/kustomization.yaml (100%) rename {config => src/config}/prometheus/monitor.yaml (100%) rename {config => src/config}/rbac/auth_proxy_client_clusterrole.yaml (100%) rename {config => src/config}/rbac/auth_proxy_role.yaml (100%) rename {config => src/config}/rbac/auth_proxy_role_binding.yaml (100%) rename {config => src/config}/rbac/auth_proxy_service.yaml (100%) rename {config => src/config}/rbac/kustomization.yaml (100%) rename {config => src/config}/rbac/leader_election_role.yaml (100%) rename {config => src/config}/rbac/leader_election_role_binding.yaml (100%) rename {config => src/config}/rbac/role.yaml (100%) rename {config => src/config}/rbac/role_binding.yaml (100%) rename {config => src/config}/rbac/service_account.yaml (100%) rename {config => src/config}/rbac/uffizzicluster_editor_role.yaml (100%) rename {config => src/config}/rbac/uffizzicluster_viewer_role.yaml (100%) rename {config => src/config}/samples/ecluster.uffizzi.com_v1alpha1_ephemeralcluster.yaml (100%) rename {config => src/config}/samples/kustomization.yaml (100%) rename {config => src/config}/scorecard/bases/config.yaml (100%) rename {config => src/config}/scorecard/kustomization.yaml (100%) rename {config => src/config}/scorecard/patches/basic.config.yaml (88%) rename {config => src/config}/scorecard/patches/olm.config.yaml (89%) rename {controllers => src/controllers}/constants/constants.go (100%) rename {controllers => src/controllers}/etcd/etcd_controller.go (96%) rename {controllers => src/controllers}/etcd/helm.go (88%) rename {controllers => src/controllers}/helm/build/etcd/build.go (84%) rename {controllers => src/controllers}/helm/build/tojson.go (100%) rename {controllers => src/controllers}/helm/build/vcluster/build.go (96%) rename {controllers => src/controllers}/helm/build/vcluster/build_test.go (90%) rename {controllers => src/controllers}/helm/types/common.go (100%) rename {controllers => src/controllers}/helm/types/etcd/etcd.go (93%) rename {controllers => src/controllers}/helm/types/vcluster/vcluster.go (98%) rename {controllers => src/controllers}/uffizzicluster/conditions.go (99%) rename {controllers => src/controllers}/uffizzicluster/conditions_test.go (100%) rename {controllers => src/controllers}/uffizzicluster/deployment.go (91%) rename {controllers => src/controllers}/uffizzicluster/helm.go (97%) rename {controllers => src/controllers}/uffizzicluster/networkpolicy.go (93%) rename {controllers => src/controllers}/uffizzicluster/statefulset.go (92%) rename {controllers => src/controllers}/uffizzicluster/suite_test.go (95%) rename {controllers => src/controllers}/uffizzicluster/uffizzicluster_controller.go (98%) rename {controllers => src/controllers}/uffizzicluster/vcluster_test.go (82%) rename {controllers => src/controllers}/uffizzicluster/workload.go (81%) rename {tests => src/test}/e2e/basic-k3s/00-assert.yaml (100%) rename {tests => src/test}/e2e/basic-k3s/00-install.yaml (100%) diff --git a/Dockerfile b/Dockerfile index 321642a1..3c9779cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,8 @@ RUN go mod download # Copy the go source COPY main.go main.go -COPY api/ api/ -COPY controllers/ controllers/ +COPY src/api/ api/ +COPY src/controllers/ controllers/ # Build # the GOARCH has not a default value to allow the binary be built according to the host where the command diff --git a/Makefile b/Makefile index 539b0a08..4fe6d83a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -#include tests/e2e/Makefile +#include test/e2e/Makefile VERSION ?= 1.5.6 @@ -110,7 +110,7 @@ vet: ## Run go vet against code. go vet ./... .PHONY: test -test: manifests generate fmt vet envtest ## Run tests. +test: manifests generate fmt vet envtest ## Run test. KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test ./... -coverprofile cover.out ##@ Build diff --git a/kuttl-test.yaml b/kuttl-test.yaml index 5bf3e161..4f8a81f1 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -1,7 +1,7 @@ apiVersion: kuttl.dev/v1beta1 kind: TestSuite testDirs: - - ./tests/e2e/ + - ./test/e2e/ startKIND: false timeout: 120 skipDelete: false diff --git a/main.go b/main.go index eea6d3b8..d1cd083c 100644 --- a/main.go +++ b/main.go @@ -18,8 +18,9 @@ package main import ( "flag" - etcd "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/etcd" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/uffizzicluster" + uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/etcd" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/uffizzicluster" "k8s.io/utils/pointer" "os" ctrlcfg "sigs.k8s.io/controller-runtime/pkg/config/v1alpha1" @@ -35,7 +36,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" - uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" fluxhelmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1" fluxsourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2" //+kubebuilder:scaffold:imports diff --git a/api/v1alpha1/groupversion_info.go b/src/api/v1alpha1/groupversion_info.go similarity index 100% rename from api/v1alpha1/groupversion_info.go rename to src/api/v1alpha1/groupversion_info.go diff --git a/api/v1alpha1/uffizzicluster_types.go b/src/api/v1alpha1/uffizzicluster_types.go similarity index 100% rename from api/v1alpha1/uffizzicluster_types.go rename to src/api/v1alpha1/uffizzicluster_types.go diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/src/api/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from api/v1alpha1/zz_generated.deepcopy.go rename to src/api/v1alpha1/zz_generated.deepcopy.go diff --git a/clientset/v1alpha1/api.go b/src/clientset/v1alpha1/api.go similarity index 92% rename from clientset/v1alpha1/api.go rename to src/clientset/v1alpha1/api.go index 0d126239..e11c9881 100644 --- a/clientset/v1alpha1/api.go +++ b/src/clientset/v1alpha1/api.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" diff --git a/clientset/v1alpha1/uffizzicluster.go b/src/clientset/v1alpha1/uffizzicluster.go similarity index 98% rename from clientset/v1alpha1/uffizzicluster.go rename to src/clientset/v1alpha1/uffizzicluster.go index 98ef5f47..44a94646 100644 --- a/clientset/v1alpha1/uffizzicluster.go +++ b/src/clientset/v1alpha1/uffizzicluster.go @@ -3,8 +3,8 @@ package v1alpha1 import ( "context" "encoding/json" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" - "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/kubernetes/scheme" diff --git a/config/crd/bases/ucluster.uffizzi.com.uffizzi.com_uffizziclusters.yaml b/src/config/crd/bases/ucluster.uffizzi.com.uffizzi.com_uffizziclusters.yaml similarity index 100% rename from config/crd/bases/ucluster.uffizzi.com.uffizzi.com_uffizziclusters.yaml rename to src/config/crd/bases/ucluster.uffizzi.com.uffizzi.com_uffizziclusters.yaml diff --git a/config/crd/bases/uffizzi.com_uffizziclusters.yaml b/src/config/crd/bases/uffizzi.com_uffizziclusters.yaml similarity index 100% rename from config/crd/bases/uffizzi.com_uffizziclusters.yaml rename to src/config/crd/bases/uffizzi.com_uffizziclusters.yaml diff --git a/config/crd/kustomization.yaml b/src/config/crd/kustomization.yaml similarity index 100% rename from config/crd/kustomization.yaml rename to src/config/crd/kustomization.yaml diff --git a/config/crd/kustomizeconfig.yaml b/src/config/crd/kustomizeconfig.yaml similarity index 100% rename from config/crd/kustomizeconfig.yaml rename to src/config/crd/kustomizeconfig.yaml diff --git a/config/crd/patches/cainjection_in_ephemeralclusters.yaml b/src/config/crd/patches/cainjection_in_ephemeralclusters.yaml similarity index 100% rename from config/crd/patches/cainjection_in_ephemeralclusters.yaml rename to src/config/crd/patches/cainjection_in_ephemeralclusters.yaml diff --git a/config/crd/patches/labels.yaml b/src/config/crd/patches/labels.yaml similarity index 100% rename from config/crd/patches/labels.yaml rename to src/config/crd/patches/labels.yaml diff --git a/config/crd/patches/webhook_in_ephemeralclusters.yaml b/src/config/crd/patches/webhook_in_ephemeralclusters.yaml similarity index 100% rename from config/crd/patches/webhook_in_ephemeralclusters.yaml rename to src/config/crd/patches/webhook_in_ephemeralclusters.yaml diff --git a/config/default/kustomization.yaml b/src/config/default/kustomization.yaml similarity index 100% rename from config/default/kustomization.yaml rename to src/config/default/kustomization.yaml diff --git a/config/default/manager_auth_proxy_patch.yaml b/src/config/default/manager_auth_proxy_patch.yaml similarity index 100% rename from config/default/manager_auth_proxy_patch.yaml rename to src/config/default/manager_auth_proxy_patch.yaml diff --git a/config/default/manager_config_patch.yaml b/src/config/default/manager_config_patch.yaml similarity index 100% rename from config/default/manager_config_patch.yaml rename to src/config/default/manager_config_patch.yaml diff --git a/config/manager/kustomization.yaml b/src/config/manager/kustomization.yaml similarity index 100% rename from config/manager/kustomization.yaml rename to src/config/manager/kustomization.yaml diff --git a/config/manager/manager.yaml b/src/config/manager/manager.yaml similarity index 100% rename from config/manager/manager.yaml rename to src/config/manager/manager.yaml diff --git a/config/manifests/kustomization.yaml b/src/config/manifests/kustomization.yaml similarity index 100% rename from config/manifests/kustomization.yaml rename to src/config/manifests/kustomization.yaml diff --git a/config/prometheus/kustomization.yaml b/src/config/prometheus/kustomization.yaml similarity index 100% rename from config/prometheus/kustomization.yaml rename to src/config/prometheus/kustomization.yaml diff --git a/config/prometheus/monitor.yaml b/src/config/prometheus/monitor.yaml similarity index 100% rename from config/prometheus/monitor.yaml rename to src/config/prometheus/monitor.yaml diff --git a/config/rbac/auth_proxy_client_clusterrole.yaml b/src/config/rbac/auth_proxy_client_clusterrole.yaml similarity index 100% rename from config/rbac/auth_proxy_client_clusterrole.yaml rename to src/config/rbac/auth_proxy_client_clusterrole.yaml diff --git a/config/rbac/auth_proxy_role.yaml b/src/config/rbac/auth_proxy_role.yaml similarity index 100% rename from config/rbac/auth_proxy_role.yaml rename to src/config/rbac/auth_proxy_role.yaml diff --git a/config/rbac/auth_proxy_role_binding.yaml b/src/config/rbac/auth_proxy_role_binding.yaml similarity index 100% rename from config/rbac/auth_proxy_role_binding.yaml rename to src/config/rbac/auth_proxy_role_binding.yaml diff --git a/config/rbac/auth_proxy_service.yaml b/src/config/rbac/auth_proxy_service.yaml similarity index 100% rename from config/rbac/auth_proxy_service.yaml rename to src/config/rbac/auth_proxy_service.yaml diff --git a/config/rbac/kustomization.yaml b/src/config/rbac/kustomization.yaml similarity index 100% rename from config/rbac/kustomization.yaml rename to src/config/rbac/kustomization.yaml diff --git a/config/rbac/leader_election_role.yaml b/src/config/rbac/leader_election_role.yaml similarity index 100% rename from config/rbac/leader_election_role.yaml rename to src/config/rbac/leader_election_role.yaml diff --git a/config/rbac/leader_election_role_binding.yaml b/src/config/rbac/leader_election_role_binding.yaml similarity index 100% rename from config/rbac/leader_election_role_binding.yaml rename to src/config/rbac/leader_election_role_binding.yaml diff --git a/config/rbac/role.yaml b/src/config/rbac/role.yaml similarity index 100% rename from config/rbac/role.yaml rename to src/config/rbac/role.yaml diff --git a/config/rbac/role_binding.yaml b/src/config/rbac/role_binding.yaml similarity index 100% rename from config/rbac/role_binding.yaml rename to src/config/rbac/role_binding.yaml diff --git a/config/rbac/service_account.yaml b/src/config/rbac/service_account.yaml similarity index 100% rename from config/rbac/service_account.yaml rename to src/config/rbac/service_account.yaml diff --git a/config/rbac/uffizzicluster_editor_role.yaml b/src/config/rbac/uffizzicluster_editor_role.yaml similarity index 100% rename from config/rbac/uffizzicluster_editor_role.yaml rename to src/config/rbac/uffizzicluster_editor_role.yaml diff --git a/config/rbac/uffizzicluster_viewer_role.yaml b/src/config/rbac/uffizzicluster_viewer_role.yaml similarity index 100% rename from config/rbac/uffizzicluster_viewer_role.yaml rename to src/config/rbac/uffizzicluster_viewer_role.yaml diff --git a/config/samples/ecluster.uffizzi.com_v1alpha1_ephemeralcluster.yaml b/src/config/samples/ecluster.uffizzi.com_v1alpha1_ephemeralcluster.yaml similarity index 100% rename from config/samples/ecluster.uffizzi.com_v1alpha1_ephemeralcluster.yaml rename to src/config/samples/ecluster.uffizzi.com_v1alpha1_ephemeralcluster.yaml diff --git a/config/samples/kustomization.yaml b/src/config/samples/kustomization.yaml similarity index 100% rename from config/samples/kustomization.yaml rename to src/config/samples/kustomization.yaml diff --git a/config/scorecard/bases/config.yaml b/src/config/scorecard/bases/config.yaml similarity index 100% rename from config/scorecard/bases/config.yaml rename to src/config/scorecard/bases/config.yaml diff --git a/config/scorecard/kustomization.yaml b/src/config/scorecard/kustomization.yaml similarity index 100% rename from config/scorecard/kustomization.yaml rename to src/config/scorecard/kustomization.yaml diff --git a/config/scorecard/patches/basic.config.yaml b/src/config/scorecard/patches/basic.config.yaml similarity index 88% rename from config/scorecard/patches/basic.config.yaml rename to src/config/scorecard/patches/basic.config.yaml index c8455f1b..d6644298 100644 --- a/config/scorecard/patches/basic.config.yaml +++ b/src/config/scorecard/patches/basic.config.yaml @@ -1,5 +1,5 @@ - op: add - path: /stages/0/tests/- + path: /stages/0/test/- value: entrypoint: - scorecard-test diff --git a/config/scorecard/patches/olm.config.yaml b/src/config/scorecard/patches/olm.config.yaml similarity index 89% rename from config/scorecard/patches/olm.config.yaml rename to src/config/scorecard/patches/olm.config.yaml index 8680989e..c6dd88f2 100644 --- a/config/scorecard/patches/olm.config.yaml +++ b/src/config/scorecard/patches/olm.config.yaml @@ -1,5 +1,5 @@ - op: add - path: /stages/0/tests/- + path: /stages/0/test/- value: entrypoint: - scorecard-test @@ -9,7 +9,7 @@ suite: olm test: olm-bundle-validation-test - op: add - path: /stages/0/tests/- + path: /stages/0/test/- value: entrypoint: - scorecard-test @@ -19,7 +19,7 @@ suite: olm test: olm-crds-have-validation-test - op: add - path: /stages/0/tests/- + path: /stages/0/test/- value: entrypoint: - scorecard-test @@ -29,7 +29,7 @@ suite: olm test: olm-crds-have-resources-test - op: add - path: /stages/0/tests/- + path: /stages/0/test/- value: entrypoint: - scorecard-test @@ -39,7 +39,7 @@ suite: olm test: olm-spec-descriptors-test - op: add - path: /stages/0/tests/- + path: /stages/0/test/- value: entrypoint: - scorecard-test diff --git a/controllers/constants/constants.go b/src/controllers/constants/constants.go similarity index 100% rename from controllers/constants/constants.go rename to src/controllers/constants/constants.go diff --git a/controllers/etcd/etcd_controller.go b/src/controllers/etcd/etcd_controller.go similarity index 96% rename from controllers/etcd/etcd_controller.go rename to src/controllers/etcd/etcd_controller.go index 32584bd0..e0a0fc10 100644 --- a/controllers/etcd/etcd_controller.go +++ b/src/controllers/etcd/etcd_controller.go @@ -18,8 +18,8 @@ package etcd import ( "context" - uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/constants" + uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/constants" fluxhelmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" diff --git a/controllers/etcd/helm.go b/src/controllers/etcd/helm.go similarity index 88% rename from controllers/etcd/helm.go rename to src/controllers/etcd/helm.go index 2111accf..c798911e 100644 --- a/controllers/etcd/helm.go +++ b/src/controllers/etcd/helm.go @@ -2,10 +2,10 @@ package etcd import ( "context" - "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/constants" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build/etcd" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/constants" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build/etcd" fluxhelmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1" fluxsourcev1 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/pkg/errors" diff --git a/controllers/helm/build/etcd/build.go b/src/controllers/helm/build/etcd/build.go similarity index 84% rename from controllers/helm/build/etcd/build.go rename to src/controllers/helm/build/etcd/build.go index d071834b..0156b59a 100644 --- a/controllers/helm/build/etcd/build.go +++ b/src/controllers/helm/build/etcd/build.go @@ -1,9 +1,9 @@ package etcd import ( - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/constants" - helmtypes "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/types" - etcdhelmtypes "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/types/etcd" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/constants" + helmtypes "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/types" + etcdhelmtypes "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/types/etcd" v1 "k8s.io/api/core/v1" ) diff --git a/controllers/helm/build/tojson.go b/src/controllers/helm/build/tojson.go similarity index 100% rename from controllers/helm/build/tojson.go rename to src/controllers/helm/build/tojson.go diff --git a/controllers/helm/build/vcluster/build.go b/src/controllers/helm/build/vcluster/build.go similarity index 96% rename from controllers/helm/build/vcluster/build.go rename to src/controllers/helm/build/vcluster/build.go index 71affa32..0c2daeb7 100644 --- a/controllers/helm/build/vcluster/build.go +++ b/src/controllers/helm/build/vcluster/build.go @@ -2,11 +2,11 @@ package vcluster import ( "fmt" - "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/constants" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/etcd" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/types" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/types/vcluster" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/constants" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/etcd" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/types" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/types/vcluster" v1 "k8s.io/api/core/v1" ) diff --git a/controllers/helm/build/vcluster/build_test.go b/src/controllers/helm/build/vcluster/build_test.go similarity index 90% rename from controllers/helm/build/vcluster/build_test.go rename to src/controllers/helm/build/vcluster/build_test.go index 907ba093..96338b07 100644 --- a/controllers/helm/build/vcluster/build_test.go +++ b/src/controllers/helm/build/vcluster/build_test.go @@ -1,7 +1,7 @@ package vcluster import ( - "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "testing" ) diff --git a/controllers/helm/types/common.go b/src/controllers/helm/types/common.go similarity index 100% rename from controllers/helm/types/common.go rename to src/controllers/helm/types/common.go diff --git a/controllers/helm/types/etcd/etcd.go b/src/controllers/helm/types/etcd/etcd.go similarity index 93% rename from controllers/helm/types/etcd/etcd.go rename to src/controllers/helm/types/etcd/etcd.go index 0f7588ce..e7cda28a 100644 --- a/controllers/helm/types/etcd/etcd.go +++ b/src/controllers/helm/types/etcd/etcd.go @@ -1,6 +1,8 @@ package etcd -import "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/types" +import ( + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/types" +) type Etcd struct { Global Global `json:"global,omitempty"` diff --git a/controllers/helm/types/vcluster/vcluster.go b/src/controllers/helm/types/vcluster/vcluster.go similarity index 98% rename from controllers/helm/types/vcluster/vcluster.go rename to src/controllers/helm/types/vcluster/vcluster.go index 78286c42..7c18a468 100644 --- a/controllers/helm/types/vcluster/vcluster.go +++ b/src/controllers/helm/types/vcluster/vcluster.go @@ -1,8 +1,8 @@ package vcluster import ( - "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/types" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/types" ) type Common struct { diff --git a/controllers/uffizzicluster/conditions.go b/src/controllers/uffizzicluster/conditions.go similarity index 99% rename from controllers/uffizzicluster/conditions.go rename to src/controllers/uffizzicluster/conditions.go index 697790d8..4957567a 100644 --- a/controllers/uffizzicluster/conditions.go +++ b/src/controllers/uffizzicluster/conditions.go @@ -1,7 +1,7 @@ package uffizzicluster import ( - uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" + uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" fluxhelmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/uffizzicluster/conditions_test.go b/src/controllers/uffizzicluster/conditions_test.go similarity index 100% rename from controllers/uffizzicluster/conditions_test.go rename to src/controllers/uffizzicluster/conditions_test.go diff --git a/controllers/uffizzicluster/deployment.go b/src/controllers/uffizzicluster/deployment.go similarity index 91% rename from controllers/uffizzicluster/deployment.go rename to src/controllers/uffizzicluster/deployment.go index c14cb0a6..8b56d97d 100644 --- a/controllers/uffizzicluster/deployment.go +++ b/src/controllers/uffizzicluster/deployment.go @@ -3,8 +3,8 @@ package uffizzicluster import ( "context" "errors" - v1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build/vcluster" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build/vcluster" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" diff --git a/controllers/uffizzicluster/helm.go b/src/controllers/uffizzicluster/helm.go similarity index 97% rename from controllers/uffizzicluster/helm.go rename to src/controllers/uffizzicluster/helm.go index ab7bbf5f..8d6741b7 100644 --- a/controllers/uffizzicluster/helm.go +++ b/src/controllers/uffizzicluster/helm.go @@ -3,10 +3,10 @@ package uffizzicluster import ( "context" "encoding/json" - uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" - constants "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/constants" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build/vcluster" + uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/constants" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build/vcluster" fluxhelmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1" fluxsourcev1 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/pkg/errors" diff --git a/controllers/uffizzicluster/networkpolicy.go b/src/controllers/uffizzicluster/networkpolicy.go similarity index 93% rename from controllers/uffizzicluster/networkpolicy.go rename to src/controllers/uffizzicluster/networkpolicy.go index a7662562..6ec26b6c 100644 --- a/controllers/uffizzicluster/networkpolicy.go +++ b/src/controllers/uffizzicluster/networkpolicy.go @@ -2,8 +2,8 @@ package uffizzicluster import ( "fmt" - uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build/vcluster" + uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build/vcluster" corev1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/uffizzicluster/statefulset.go b/src/controllers/uffizzicluster/statefulset.go similarity index 92% rename from controllers/uffizzicluster/statefulset.go rename to src/controllers/uffizzicluster/statefulset.go index eafac35a..60cf6df4 100644 --- a/controllers/uffizzicluster/statefulset.go +++ b/src/controllers/uffizzicluster/statefulset.go @@ -3,9 +3,9 @@ package uffizzicluster import ( "context" "errors" - "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" - uffizzicluster "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/etcd" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build/vcluster" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + uffizzicluster "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/etcd" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build/vcluster" appsv1 "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" diff --git a/controllers/uffizzicluster/suite_test.go b/src/controllers/uffizzicluster/suite_test.go similarity index 95% rename from controllers/uffizzicluster/suite_test.go rename to src/controllers/uffizzicluster/suite_test.go index 0cb62a44..41fce8dd 100644 --- a/controllers/uffizzicluster/suite_test.go +++ b/src/controllers/uffizzicluster/suite_test.go @@ -17,6 +17,7 @@ limitations under the License. package uffizzicluster import ( + uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" "path/filepath" "testing" @@ -29,12 +30,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - - uclusteruffizzicomv1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" //+kubebuilder:scaffold:imports ) -// These tests use Ginkgo (BDD-style Go testing framework). Refer to +// These test use Ginkgo (BDD-style Go testing framework). Refer to // http://onsi.github.io/ginkgo/ to learn more about Ginkgo. var cfg *rest.Config diff --git a/controllers/uffizzicluster/uffizzicluster_controller.go b/src/controllers/uffizzicluster/uffizzicluster_controller.go similarity index 98% rename from controllers/uffizzicluster/uffizzicluster_controller.go rename to src/controllers/uffizzicluster/uffizzicluster_controller.go index 668f42b9..1115dd40 100644 --- a/controllers/uffizzicluster/uffizzicluster_controller.go +++ b/src/controllers/uffizzicluster/uffizzicluster_controller.go @@ -19,8 +19,9 @@ package uffizzicluster import ( "context" "encoding/json" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/constants" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build/vcluster" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/constants" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build/vcluster" "github.com/fluxcd/pkg/apis/meta" "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" @@ -34,7 +35,6 @@ import ( controllerruntimesource "sigs.k8s.io/controller-runtime/pkg/source" "time" - v1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" fluxhelmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1" k8serrors "k8s.io/apimachinery/pkg/api/errors" ) diff --git a/controllers/uffizzicluster/vcluster_test.go b/src/controllers/uffizzicluster/vcluster_test.go similarity index 82% rename from controllers/uffizzicluster/vcluster_test.go rename to src/controllers/uffizzicluster/vcluster_test.go index 5d6ece4a..b8fa541a 100644 --- a/controllers/uffizzicluster/vcluster_test.go +++ b/src/controllers/uffizzicluster/vcluster_test.go @@ -17,11 +17,11 @@ limitations under the License. package uffizzicluster import ( - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/constants" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build/vcluster" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/constants" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build/vcluster" "testing" - "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/controllers/uffizzicluster/workload.go b/src/controllers/uffizzicluster/workload.go similarity index 81% rename from controllers/uffizzicluster/workload.go rename to src/controllers/uffizzicluster/workload.go index c9d459cc..9d92aea1 100644 --- a/controllers/uffizzicluster/workload.go +++ b/src/controllers/uffizzicluster/workload.go @@ -2,13 +2,12 @@ package uffizzicluster import ( context "context" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/constants" - "github.com/UffizziCloud/uffizzi-cluster-operator/controllers/helm/build/vcluster" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/api/v1alpha1" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/constants" + "github.com/UffizziCloud/uffizzi-cluster-operator/src/controllers/helm/build/vcluster" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - - v1alpha1 "github.com/UffizziCloud/uffizzi-cluster-operator/api/v1alpha1" ) func (r *UffizziClusterReconciler) getUffizziClusterWorkload(ctx context.Context, uCluster *v1alpha1.UffizziCluster) (runtime.Object, error) { diff --git a/tests/e2e/basic-k3s/00-assert.yaml b/src/test/e2e/basic-k3s/00-assert.yaml similarity index 100% rename from tests/e2e/basic-k3s/00-assert.yaml rename to src/test/e2e/basic-k3s/00-assert.yaml diff --git a/tests/e2e/basic-k3s/00-install.yaml b/src/test/e2e/basic-k3s/00-install.yaml similarity index 100% rename from tests/e2e/basic-k3s/00-install.yaml rename to src/test/e2e/basic-k3s/00-install.yaml From e423fe79bac4f79f04adef27097cafcf7e64c2be Mon Sep 17 00:00:00 2001 From: Vibhav Bobade Date: Fri, 23 Feb 2024 17:44:34 +0530 Subject: [PATCH 2/2] fix: paths in dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c9779cb..dfa7fd24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,8 +14,8 @@ RUN go mod download # Copy the go source COPY main.go main.go -COPY src/api/ api/ -COPY src/controllers/ controllers/ +COPY src/api/ src/api/ +COPY src/controllers/ src/controllers/ # Build # the GOARCH has not a default value to allow the binary be built according to the host where the command