Skip to content

Commit

Permalink
refactor!: rename apiVersion group name (#75)
Browse files Browse the repository at this point in the history
and docker repo name
  • Loading branch information
aabouzaid committed Feb 11, 2024
1 parent 82574ae commit d61661b
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 32 deletions.
8 changes: 4 additions & 4 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ 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.
#

.PHONY: go.build
go.build:
go build -o 'dist' .
go build -o './dist/' .

.PHONY: go.format
go.format:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ 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
annotations:
# 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: ./
Expand Down
4 changes: 2 additions & 2 deletions examples/long-omni-manifest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,15 @@ generators:
```yaml
# merger.yaml
apiVersion: generators.kustomize.aabouzaid.com/v1alpha1
apiVersion: generators.kustomize.devopshive.net/v1alpha1
kind: Merger
metadata:
name: merge
annotations:
# 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: ./
Expand Down
4 changes: 2 additions & 2 deletions examples/long-omni-manifest/merger.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
apiVersion: generators.kustomize.aabouzaid.com/v1alpha1
apiVersion: generators.kustomize.devopshive.net/v1alpha1
kind: Merger
metadata:
name: merge
annotations:
# 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: ./
Expand Down
4 changes: 2 additions & 2 deletions examples/manifest-lists-without-schema/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ generators:
```yaml
# merger.yaml
apiVersion: generators.kustomize.aabouzaid.com/v1alpha1
apiVersion: generators.kustomize.devopshive.net/v1alpha1
kind: Merger
metadata:
name: merge
annotations:
# 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: ./
Expand Down
4 changes: 2 additions & 2 deletions examples/manifest-lists-without-schema/merger.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
apiVersion: generators.kustomize.aabouzaid.com/v1alpha1
apiVersion: generators.kustomize.devopshive.net/v1alpha1
kind: Merger
metadata:
name: merge
annotations:
# 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: ./
Expand Down
4 changes: 2 additions & 2 deletions examples/multiple-manifests-from-single-file/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ generators:
```yaml
# merger.yaml
apiVersion: generators.kustomize.aabouzaid.com/v1alpha1
apiVersion: generators.kustomize.devopshive.net/v1alpha1
kind: Merger
metadata:
name: merge
annotations:
# 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: ./
Expand Down
4 changes: 2 additions & 2 deletions examples/multiple-manifests-from-single-file/merger.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
apiVersion: generators.kustomize.aabouzaid.com/v1alpha1
apiVersion: generators.kustomize.devopshive.net/v1alpha1
kind: Merger
metadata:
name: merge
annotations:
# 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: ./
Expand Down
4 changes: 2 additions & 2 deletions examples/non-manifest-into-configmap-or-secret/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ generators:
```yaml
# merger.yaml
apiVersion: generators.kustomize.aabouzaid.com/v1alpha1
apiVersion: generators.kustomize.devopshive.net/v1alpha1
kind: Merger
metadata:
name: merge
annotations:
# 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: ./
Expand Down
4 changes: 2 additions & 2 deletions examples/non-manifest-into-configmap-or-secret/merger.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
apiVersion: generators.kustomize.aabouzaid.com/v1alpha1
apiVersion: generators.kustomize.devopshive.net/v1alpha1
kind: Merger
metadata:
name: merge
annotations:
# 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: ./
Expand Down
4 changes: 2 additions & 2 deletions examples/testdata/merger.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
apiVersion: generators.kustomize.aabouzaid.com/v1alpha1
apiVersion: generators.kustomize.devopshive.net/v1alpha1
kind: Merger
metadata:
name: merge
annotations:
# 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: ./
Expand Down
2 changes: 1 addition & 1 deletion examples/testdata/resourcelist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/merger/fn.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/merger/types.go
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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"
)
Expand Down

0 comments on commit d61661b

Please sign in to comment.