diff --git a/.goreleaser.yml b/.goreleaser.yml index 3f0f74a..0e52545 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -20,10 +20,10 @@ archives: format: zip dockers: - image_templates: - - "ghcr.io/aabouzaid/kustomize-generator-merger:latest" - - "ghcr.io/aabouzaid/kustomize-generator-merger:{{ .Major }}" - - "ghcr.io/aabouzaid/kustomize-generator-merger:{{ .Major }}.{{ .Minor }}" - - "ghcr.io/aabouzaid/kustomize-generator-merger:{{ .Major }}.{{ .Minor }}.{{ .Patch }}" + - "ghcr.io/devopshivehq/kustomize-generator-merger:latest" + - "ghcr.io/devopshivehq/kustomize-generator-merger:{{ .Major }}" + - "ghcr.io/devopshivehq/kustomize-generator-merger:{{ .Major }}.{{ .Minor }}" + - "ghcr.io/devopshivehq/kustomize-generator-merger:{{ .Major }}.{{ .Minor }}.{{ .Patch }}" build_flag_templates: - "--pull" # OCI annotations: https://github.com/opencontainers/image-spec/blob/main/annotations.md diff --git a/Makefile b/Makefile index 868f896..b65c9e7 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ schema.generate: paths=./... output:crd:dir=pkg/merger/schema; \ sed -e 's/CustomResourceDefinition/KRMFunctionDefinition/g' \ -e 's|apiextensions.k8s.io/v1|config.kubernetes.io/v1alpha1|g' \ - -i pkg/merger/schema/generators.kustomize.aabouzaid.com_mergers.yaml + -i pkg/merger/schema/generators.kustomize.devopshive.net_mergers.yaml # # Golang targets. @@ -26,7 +26,7 @@ schema.generate: .PHONY: go.build go.build: - go build -o 'dist' . + go build -o './dist/' . .PHONY: go.format go.format: diff --git a/README.md b/README.md index 4445c3d..39fe542 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ and for more details on the challenge of providing OpenAPI schema to merge files ```yaml --- -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -68,7 +68,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/long-omni-manifest/README.md b/examples/long-omni-manifest/README.md index c2d95ae..d280619 100644 --- a/examples/long-omni-manifest/README.md +++ b/examples/long-omni-manifest/README.md @@ -95,7 +95,7 @@ generators: ```yaml # merger.yaml -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -103,7 +103,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/long-omni-manifest/merger.yaml b/examples/long-omni-manifest/merger.yaml index 8f7c53e..08735ef 100644 --- a/examples/long-omni-manifest/merger.yaml +++ b/examples/long-omni-manifest/merger.yaml @@ -1,5 +1,5 @@ --- -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -7,7 +7,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/manifest-lists-without-schema/README.md b/examples/manifest-lists-without-schema/README.md index aa129e5..6e602de 100644 --- a/examples/manifest-lists-without-schema/README.md +++ b/examples/manifest-lists-without-schema/README.md @@ -63,7 +63,7 @@ generators: ```yaml # merger.yaml -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -71,7 +71,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/manifest-lists-without-schema/merger.yaml b/examples/manifest-lists-without-schema/merger.yaml index 56aec1e..70ab408 100644 --- a/examples/manifest-lists-without-schema/merger.yaml +++ b/examples/manifest-lists-without-schema/merger.yaml @@ -1,5 +1,5 @@ --- -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -7,7 +7,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/multiple-manifests-from-single-file/README.md b/examples/multiple-manifests-from-single-file/README.md index 21db4cb..144223e 100644 --- a/examples/multiple-manifests-from-single-file/README.md +++ b/examples/multiple-manifests-from-single-file/README.md @@ -111,7 +111,7 @@ generators: ```yaml # merger.yaml -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -119,7 +119,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/multiple-manifests-from-single-file/merger.yaml b/examples/multiple-manifests-from-single-file/merger.yaml index aaaff18..8ec3a16 100644 --- a/examples/multiple-manifests-from-single-file/merger.yaml +++ b/examples/multiple-manifests-from-single-file/merger.yaml @@ -1,5 +1,5 @@ --- -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -7,7 +7,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/non-manifest-into-configmap-or-secret/README.md b/examples/non-manifest-into-configmap-or-secret/README.md index f821bbd..47098b6 100644 --- a/examples/non-manifest-into-configmap-or-secret/README.md +++ b/examples/non-manifest-into-configmap-or-secret/README.md @@ -57,7 +57,7 @@ generators: ```yaml # merger.yaml -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -65,7 +65,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/non-manifest-into-configmap-or-secret/merger.yaml b/examples/non-manifest-into-configmap-or-secret/merger.yaml index 6caf0bd..709b08c 100644 --- a/examples/non-manifest-into-configmap-or-secret/merger.yaml +++ b/examples/non-manifest-into-configmap-or-secret/merger.yaml @@ -1,5 +1,5 @@ --- -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -7,7 +7,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/testdata/merger.yaml b/examples/testdata/merger.yaml index c54339c..27cd8bd 100644 --- a/examples/testdata/merger.yaml +++ b/examples/testdata/merger.yaml @@ -1,5 +1,5 @@ --- -apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 +apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge @@ -7,7 +7,7 @@ metadata: # Containerized KRM function. config.kubernetes.io/function: | container: - image: ghcr.io/aabouzaid/kustomize-generator-merger + image: ghcr.io/devopshivehq/kustomize-generator-merger mounts: - type: bind src: ./ diff --git a/examples/testdata/resourcelist.yaml b/examples/testdata/resourcelist.yaml index 52c4f1e..55cf22e 100644 --- a/examples/testdata/resourcelist.yaml +++ b/examples/testdata/resourcelist.yaml @@ -4,7 +4,7 @@ kind: ResourceList metadata: name: krm-function-input functionConfig: - apiVersion: generators.kustomize.aabouzaid.com/v1alpha1 + apiVersion: generators.kustomize.devopshive.net/v1alpha1 kind: Merger metadata: name: merge diff --git a/pkg/merger/fn.go b/pkg/merger/fn.go index 38edd99..24e3bd1 100644 --- a/pkg/merger/fn.go +++ b/pkg/merger/fn.go @@ -11,7 +11,7 @@ import ( "sigs.k8s.io/kustomize/kyaml/yaml" ) -//go:embed "schema/generators.kustomize.aabouzaid.com_mergers.yaml" +//go:embed "schema/generators.kustomize.devopshive.net_mergers.yaml" var mergerSchemaDefinition string // Schema returns the OpenAPI schema definition for Merger. diff --git a/pkg/merger/schema/generators.kustomize.aabouzaid.com_mergers.yaml b/pkg/merger/schema/generators.kustomize.devopshive.net_mergers.yaml similarity index 97% rename from pkg/merger/schema/generators.kustomize.aabouzaid.com_mergers.yaml rename to pkg/merger/schema/generators.kustomize.devopshive.net_mergers.yaml index 07c4ac7..afaddb1 100644 --- a/pkg/merger/schema/generators.kustomize.aabouzaid.com_mergers.yaml +++ b/pkg/merger/schema/generators.kustomize.devopshive.net_mergers.yaml @@ -7,9 +7,9 @@ kind: KRMFunctionDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 - name: mergers.generators.kustomize.aabouzaid.com + name: mergers.generators.kustomize.devopshive.net spec: - group: generators.kustomize.aabouzaid.com + group: generators.kustomize.devopshive.net names: kind: Merger listKind: MergerList diff --git a/pkg/merger/types.go b/pkg/merger/types.go index b6baa3a..e6b9462 100644 --- a/pkg/merger/types.go +++ b/pkg/merger/types.go @@ -1,7 +1,7 @@ // The types of the merger package. // KubeBuilder markers are used to auto-generate OpenAPI schema for the plugin. // -// +groupName=generators.kustomize.aabouzaid.com +// +groupName=generators.kustomize.devopshive.net // +versionName=v1alpha1 // +kubebuilder:validation:Required @@ -14,7 +14,7 @@ import ( // Merger manifest configuration. const ( - ResourceGroup string = "generators.kustomize.aabouzaid.com" + ResourceGroup string = "generators.kustomize.devopshive.net" ResourceVersion string = "v1alpha1" ResourceKind string = "Merger" )