From b6ba752d83b6cafe0c12b5e93bf6b3265428d50e Mon Sep 17 00:00:00 2001 From: Greg Haynes Date: Mon, 2 Oct 2023 21:35:39 +0000 Subject: [PATCH] Remove adsk internal domains --- .gitignore | 3 +- api/v1alpha1/groupversion_info.go | 4 +- api/v1alpha1/localbuild_types.go | 2 +- go.mod | 2 +- main.go | 2 +- pkg/apps/image.go | 6 +- pkg/build/build.go | 6 +- pkg/cmd/create/root.go | 4 +- pkg/cmd/gitserver/create/root.go | 14 ++-- pkg/cmd/gitserver/root.go | 2 +- pkg/cmd/root.go | 4 +- pkg/controllers/crd.go | 4 +- pkg/controllers/gitserver/controller.go | 4 +- pkg/controllers/gitserver/controller_test.go | 4 +- pkg/controllers/gitserver/image.go | 10 +-- pkg/controllers/gitserver/image_test.go | 6 +- pkg/controllers/localbuild/argo.go | 6 +- pkg/controllers/localbuild/argo_test.go | 2 +- pkg/controllers/localbuild/controller.go | 8 +- .../idpbuilder.adskeng.net_gitservers.yaml | 70 ----------------- .../idpbuilder.adskeng.net_localbuilds.yaml | 75 ------------------- pkg/controllers/run.go | 6 +- pkg/k8s/schema.go | 2 +- pkg/kind/registry.go | 4 +- pkg/kind/registry_test.go | 2 +- pkg/util/fs_test.go | 2 +- 26 files changed, 55 insertions(+), 199 deletions(-) delete mode 100644 pkg/controllers/resources/idpbuilder.adskeng.net_gitservers.yaml delete mode 100644 pkg/controllers/resources/idpbuilder.adskeng.net_localbuilds.yaml diff --git a/.gitignore b/.gitignore index 8942e9b3..bff296e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ idpbuilder bin/* .DS_Store -cover.out \ No newline at end of file +cover.out +pkg/controllers/resources/* \ No newline at end of file diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index b6ef07aa..3714e3e7 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/api/v1alpha1/groupversion_info.go @@ -1,5 +1,5 @@ // +kubebuilder:object:generate=true -// +groupName=idpbuilder.adskeng.net +// +groupName=idpbuilder.cnoe.io package v1alpha1 import ( @@ -9,7 +9,7 @@ import ( var ( // GroupVersion is group version used to register these objects - GroupVersion = schema.GroupVersion{Group: "idpbuilder.adskeng.net", Version: "v1alpha1"} + GroupVersion = schema.GroupVersion{Group: "idpbuilder.cnoe.io", Version: "v1alpha1"} // SchemeBuilder is used to add go types to the GroupVersionKind scheme SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} diff --git a/api/v1alpha1/localbuild_types.go b/api/v1alpha1/localbuild_types.go index ece6155e..3ba5f3b8 100644 --- a/api/v1alpha1/localbuild_types.go +++ b/api/v1alpha1/localbuild_types.go @@ -3,7 +3,7 @@ package v1alpha1 import ( "fmt" - "git.autodesk.com/forge-cd-services/idpbuilder/globals" + "github.com/cnoe-io/idpbuilder/globals" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/go.mod b/go.mod index 9c99477f..caaa742a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.autodesk.com/forge-cd-services/idpbuilder +module github.com/cnoe-io/idpbuilder go 1.20 diff --git a/main.go b/main.go index 2c70007d..4f5ffcf9 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ package main -import "git.autodesk.com/forge-cd-services/idpbuilder/pkg/cmd" +import "github.com/cnoe-io/idpbuilder/pkg/cmd" func main() { cmd.Execute() diff --git a/pkg/apps/image.go b/pkg/apps/image.go index 67cc12bf..9a5ab164 100644 --- a/pkg/apps/image.go +++ b/pkg/apps/image.go @@ -10,9 +10,9 @@ import ( "os" "path/filepath" - "git.autodesk.com/forge-cd-services/idpbuilder/globals" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/docker" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/util" + "github.com/cnoe-io/idpbuilder/globals" + "github.com/cnoe-io/idpbuilder/pkg/docker" + "github.com/cnoe-io/idpbuilder/pkg/util" "github.com/docker/docker/api/types" registryTypes "github.com/docker/docker/api/types/registry" diff --git a/pkg/build/build.go b/pkg/build/build.go index 40b8c80b..5d2be830 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -3,9 +3,9 @@ package build import ( "context" - "git.autodesk.com/forge-cd-services/idpbuilder/api/v1alpha1" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/controllers" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/kind" + "github.com/cnoe-io/idpbuilder/api/v1alpha1" + "github.com/cnoe-io/idpbuilder/pkg/controllers" + "github.com/cnoe-io/idpbuilder/pkg/kind" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" diff --git a/pkg/cmd/create/root.go b/pkg/cmd/create/root.go index d1c14a91..2892a43a 100644 --- a/pkg/cmd/create/root.go +++ b/pkg/cmd/create/root.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/build" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/k8s" + "github.com/cnoe-io/idpbuilder/pkg/build" + "github.com/cnoe-io/idpbuilder/pkg/k8s" "github.com/spf13/cobra" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/log/zap" diff --git a/pkg/cmd/gitserver/create/root.go b/pkg/cmd/gitserver/create/root.go index e47fde8e..cda928dc 100644 --- a/pkg/cmd/gitserver/create/root.go +++ b/pkg/cmd/gitserver/create/root.go @@ -7,13 +7,13 @@ import ( "os" "path/filepath" - "git.autodesk.com/forge-cd-services/idpbuilder/api/v1alpha1" - "git.autodesk.com/forge-cd-services/idpbuilder/globals" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/apps" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/controllers" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/docker" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/k8s" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/kind" + "github.com/cnoe-io/idpbuilder/api/v1alpha1" + "github.com/cnoe-io/idpbuilder/globals" + "github.com/cnoe-io/idpbuilder/pkg/apps" + "github.com/cnoe-io/idpbuilder/pkg/controllers" + "github.com/cnoe-io/idpbuilder/pkg/docker" + "github.com/cnoe-io/idpbuilder/pkg/k8s" + "github.com/cnoe-io/idpbuilder/pkg/kind" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/clientcmd" diff --git a/pkg/cmd/gitserver/root.go b/pkg/cmd/gitserver/root.go index 3bf95b7f..92734b08 100644 --- a/pkg/cmd/gitserver/root.go +++ b/pkg/cmd/gitserver/root.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/cmd/gitserver/create" + "github.com/cnoe-io/idpbuilder/pkg/cmd/gitserver/create" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go index 23f666ce..9812314f 100644 --- a/pkg/cmd/root.go +++ b/pkg/cmd/root.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/cmd/create" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/cmd/gitserver" + "github.com/cnoe-io/idpbuilder/pkg/cmd/create" + "github.com/cnoe-io/idpbuilder/pkg/cmd/gitserver" "github.com/spf13/cobra" ) diff --git a/pkg/controllers/crd.go b/pkg/controllers/crd.go index ca7660fc..7b295900 100644 --- a/pkg/controllers/crd.go +++ b/pkg/controllers/crd.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/k8s" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/util" + "github.com/cnoe-io/idpbuilder/pkg/k8s" + "github.com/cnoe-io/idpbuilder/pkg/util" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/controllers/gitserver/controller.go b/pkg/controllers/gitserver/controller.go index 70456ab9..4da4e6ed 100644 --- a/pkg/controllers/gitserver/controller.go +++ b/pkg/controllers/gitserver/controller.go @@ -6,8 +6,8 @@ import ( "io/fs" "time" - "git.autodesk.com/forge-cd-services/idpbuilder/api/v1alpha1" - "git.autodesk.com/forge-cd-services/idpbuilder/globals" + "github.com/cnoe-io/idpbuilder/api/v1alpha1" + "github.com/cnoe-io/idpbuilder/globals" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" diff --git a/pkg/controllers/gitserver/controller_test.go b/pkg/controllers/gitserver/controller_test.go index dfcdd368..6172ef84 100644 --- a/pkg/controllers/gitserver/controller_test.go +++ b/pkg/controllers/gitserver/controller_test.go @@ -9,8 +9,8 @@ import ( "testing/fstest" "time" - "git.autodesk.com/forge-cd-services/idpbuilder/api/v1alpha1" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/k8s" + "github.com/cnoe-io/idpbuilder/api/v1alpha1" + "github.com/cnoe-io/idpbuilder/pkg/k8s" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controllers/gitserver/image.go b/pkg/controllers/gitserver/image.go index bd518f1a..0ed34715 100644 --- a/pkg/controllers/gitserver/image.go +++ b/pkg/controllers/gitserver/image.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "git.autodesk.com/forge-cd-services/idpbuilder/api/v1alpha1" - "git.autodesk.com/forge-cd-services/idpbuilder/globals" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/apps" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/docker" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/kind" + "github.com/cnoe-io/idpbuilder/api/v1alpha1" + "github.com/cnoe-io/idpbuilder/globals" + "github.com/cnoe-io/idpbuilder/pkg/apps" + "github.com/cnoe-io/idpbuilder/pkg/docker" + "github.com/cnoe-io/idpbuilder/pkg/kind" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/log" ) diff --git a/pkg/controllers/gitserver/image_test.go b/pkg/controllers/gitserver/image_test.go index fd1b81cd..62c55916 100644 --- a/pkg/controllers/gitserver/image_test.go +++ b/pkg/controllers/gitserver/image_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "git.autodesk.com/forge-cd-services/idpbuilder/api/v1alpha1" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/apps" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/docker" + "github.com/cnoe-io/idpbuilder/api/v1alpha1" + "github.com/cnoe-io/idpbuilder/pkg/apps" + "github.com/cnoe-io/idpbuilder/pkg/docker" "github.com/docker/docker/api/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" controllerruntime "sigs.k8s.io/controller-runtime" diff --git a/pkg/controllers/localbuild/argo.go b/pkg/controllers/localbuild/argo.go index bdcc4fc2..b6545501 100644 --- a/pkg/controllers/localbuild/argo.go +++ b/pkg/controllers/localbuild/argo.go @@ -4,9 +4,9 @@ import ( "context" "embed" - "git.autodesk.com/forge-cd-services/idpbuilder/api/v1alpha1" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/k8s" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/util" + "github.com/cnoe-io/idpbuilder/api/v1alpha1" + "github.com/cnoe-io/idpbuilder/pkg/k8s" + "github.com/cnoe-io/idpbuilder/pkg/util" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controllers/localbuild/argo_test.go b/pkg/controllers/localbuild/argo_test.go index 6f89a0ac..276ccfed 100644 --- a/pkg/controllers/localbuild/argo_test.go +++ b/pkg/controllers/localbuild/argo_test.go @@ -3,7 +3,7 @@ package localbuild import ( "testing" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/k8s" + "github.com/cnoe-io/idpbuilder/pkg/k8s" ) func TestGetRawInstallResources(t *testing.T) { diff --git a/pkg/controllers/localbuild/controller.go b/pkg/controllers/localbuild/controller.go index 3c58bc30..98fca8ee 100644 --- a/pkg/controllers/localbuild/controller.go +++ b/pkg/controllers/localbuild/controller.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "git.autodesk.com/forge-cd-services/idpbuilder/api/v1alpha1" - "git.autodesk.com/forge-cd-services/idpbuilder/globals" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/apps" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/resources/localbuild" argov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/cnoe-io/idpbuilder/api/v1alpha1" + "github.com/cnoe-io/idpbuilder/globals" + "github.com/cnoe-io/idpbuilder/pkg/apps" + "github.com/cnoe-io/idpbuilder/pkg/resources/localbuild" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controllers/resources/idpbuilder.adskeng.net_gitservers.yaml b/pkg/controllers/resources/idpbuilder.adskeng.net_gitservers.yaml deleted file mode 100644 index ded3efdc..00000000 --- a/pkg/controllers/resources/idpbuilder.adskeng.net_gitservers.yaml +++ /dev/null @@ -1,70 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.12.0 - name: gitservers.idpbuilder.adskeng.net -spec: - group: idpbuilder.adskeng.net - names: - kind: GitServer - listKind: GitServerList - plural: gitservers - singular: gitserver - scope: Namespaced - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - properties: - source: - properties: - embedded: - description: Emedded enables the image containing the go binary - embedded contents - type: boolean - image: - description: Image specifies a docker image to use. Specifying - this disables installation of embedded applications. - type: string - type: object - type: object - status: - properties: - deploymentAvailable: - type: boolean - host: - description: Host is the host value of the ingress rule - type: string - imageID: - description: ImageID is the id of the most recently generated docker - image or empty if no image has been created - type: string - observedGeneration: - description: ObservedGeneration is the 'Generation' of the Service - that was last processed by the controller. - format: int64 - type: integer - required: - - deploymentAvailable - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/pkg/controllers/resources/idpbuilder.adskeng.net_localbuilds.yaml b/pkg/controllers/resources/idpbuilder.adskeng.net_localbuilds.yaml deleted file mode 100644 index daacb207..00000000 --- a/pkg/controllers/resources/idpbuilder.adskeng.net_localbuilds.yaml +++ /dev/null @@ -1,75 +0,0 @@ ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.12.0 - name: localbuilds.idpbuilder.adskeng.net -spec: - group: idpbuilder.adskeng.net - names: - kind: Localbuild - listKind: LocalbuildList - plural: localbuilds - singular: localbuild - scope: Cluster - versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - properties: - packageConfigs: - properties: - argoPackageConfigs: - description: ArgoPackageConfigSpec Allows for configuration of - the ArgoCD Installation. If no fields are specified then the - binary embedded resources will be used to intall ArgoCD. - properties: - enabled: - description: Enabled controls whether to install ArgoCD. - type: boolean - type: object - embeddedArgoApplicationsPackageConfigs: - description: EmbeddedArgoApplicationsPackageConfigSpec Controls - the installation of the embedded argo applications. - properties: - enabled: - description: Enabled controls whether to install the embedded - argo applications and the associated GitServer - type: boolean - type: object - type: object - type: object - status: - properties: - argoAppsCreated: - type: boolean - argoAvailable: - type: boolean - gitServerAvailable: - type: boolean - observedGeneration: - description: ObservedGeneration is the 'Generation' of the Service - that was last processed by the controller. - format: int64 - type: integer - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/pkg/controllers/run.go b/pkg/controllers/run.go index 778ff1d7..ffc42d58 100644 --- a/pkg/controllers/run.go +++ b/pkg/controllers/run.go @@ -3,9 +3,9 @@ package controllers import ( "context" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/apps" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/controllers/gitserver" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/controllers/localbuild" + "github.com/cnoe-io/idpbuilder/pkg/apps" + "github.com/cnoe-io/idpbuilder/pkg/controllers/gitserver" + "github.com/cnoe-io/idpbuilder/pkg/controllers/localbuild" "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/manager" ) diff --git a/pkg/k8s/schema.go b/pkg/k8s/schema.go index d44c97cc..a2d37746 100644 --- a/pkg/k8s/schema.go +++ b/pkg/k8s/schema.go @@ -1,8 +1,8 @@ package k8s import ( - "git.autodesk.com/forge-cd-services/idpbuilder/api/v1alpha1" argov1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/cnoe-io/idpbuilder/api/v1alpha1" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" diff --git a/pkg/kind/registry.go b/pkg/kind/registry.go index c9b49bc7..7ce316be 100644 --- a/pkg/kind/registry.go +++ b/pkg/kind/registry.go @@ -6,8 +6,8 @@ import ( "io" "os" - "git.autodesk.com/forge-cd-services/idpbuilder/globals" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/docker" + "github.com/cnoe-io/idpbuilder/globals" + "github.com/cnoe-io/idpbuilder/pkg/docker" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" diff --git a/pkg/kind/registry_test.go b/pkg/kind/registry_test.go index d1e4a79f..ffedc851 100644 --- a/pkg/kind/registry_test.go +++ b/pkg/kind/registry_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "git.autodesk.com/forge-cd-services/idpbuilder/pkg/docker" + "github.com/cnoe-io/idpbuilder/pkg/docker" "github.com/docker/docker/api/types" ctrl "sigs.k8s.io/controller-runtime" ) diff --git a/pkg/util/fs_test.go b/pkg/util/fs_test.go index 5298231e..da0a692e 100644 --- a/pkg/util/fs_test.go +++ b/pkg/util/fs_test.go @@ -8,7 +8,7 @@ import ( "testing" "testing/fstest" - "git.autodesk.com/forge-cd-services/idpbuilder/globals" + "github.com/cnoe-io/idpbuilder/globals" "github.com/google/go-cmp/cmp" )