diff --git a/.golangci.yml b/.golangci.yml index e193972..619b9af 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,7 +6,7 @@ linters-settings: lines: 100 statements: 50 gci: - local-prefixes: github.com/vmware-tanzu-labs/operator-builder + local-prefixes: github.com/nukleros/operator-builder goconst: min-len: 2 min-occurrences: 2 @@ -26,7 +26,7 @@ linters-settings: gocyclo: min-complexity: 15 goimports: - local-prefixes: github.com/vmware-tanzu-labs/operator-builder + local-prefixes: github.com/nukleros/operator-builder golint: min-confidence: 0 gomnd: @@ -43,10 +43,10 @@ linters-settings: settings: printf: funcs: - - (github.com/vmware-tanzu-labs/operator-builder/pkg/logutils.Log).Infof - - (github.com/vmware-tanzu-labs/operator-builder/logutils.Log).Warnf - - (github.com/vmware-tanzu-labs/operator-builder/pkg/logutils.Log).Errorf - - (github.com/vmware-tanzu-labs/operator-builder/pkg/logutils.Log).Fatalf + - (github.com/nukleros/operator-builder/pkg/logutils.Log).Infof + - (github.com/nukleros/operator-builder/logutils.Log).Warnf + - (github.com/nukleros/operator-builder/pkg/logutils.Log).Errorf + - (github.com/nukleros/operator-builder/pkg/logutils.Log).Fatalf lll: line-length: 140 maligned: diff --git a/README.md b/README.md index 7871225..6d671d1 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -[![Go Reference](https://pkg.go.dev/badge/github.com/vmware-tanzu-labs/operator-builder.svg)](https://pkg.go.dev/github.com/vmware-tanzu-labs/operator-builder) -[![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/vmware-tanzu-labs/operator-builder)](https://golang.org/) -[![Go Report Card](https://goreportcard.com/badge/github.com/vmware-tanzu-labs/operator-builder)](https://goreportcard.com/report/github.com/vmware-tanzu-labs/operator-builder) -[![GitHub](https://img.shields.io/github/license/vmware-tanzu-labs/operator-builder)](https://github.com/vmware-tanzu-labs/operator-builder/blob/main/LICENSE)[![GitHub release (latest by date)](https://img.shields.io/github/v/release/vmware-tanzu-labs/operator-builder)](https://github.com/vmware-tanzu-labs/operator-builder/releases) -[![Hombrew](https://img.shields.io/badge/dynamic/json.svg?url=https://raw.githubusercontent.com/vmware-tanzu-labs/homebrew-tap/master/Info/operator-builder.json&query=$.versions.stable&label=homebrew)](https://github.com/vmware-tanzu-labs/operator-builder/releases) +[![Go Reference](https://pkg.go.dev/badge/github.com/nukleros/operator-builder.svg)](https://pkg.go.dev/github.com/nukleros/operator-builder) +[![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/nukleros/operator-builder)](https://golang.org/) +[![Go Report Card](https://goreportcard.com/badge/github.com/nukleros/operator-builder)](https://goreportcard.com/report/github.com/nukleros/operator-builder) +[![GitHub](https://img.shields.io/github/license/nukleros/operator-builder)](https://github.com/nukleros/operator-builder/blob/main/LICENSE)[![GitHub release (latest by date)](https://img.shields.io/github/v/release/nukleros/operator-builder)](https://github.com/nukleros/operator-builder/releases) +[![Hombrew](https://img.shields.io/badge/dynamic/json.svg?url=https://raw.githubusercontent.com/nukleros/homebrew-tap/master/Info/operator-builder.json&query=$.versions.stable&label=homebrew)](https://github.com/nukleros/operator-builder/releases) -![Github Downloads (by Release)](https://img.shields.io/github/downloads/vmware-tanzu-labs/operator-builder/total.svg) +![Github Downloads (by Release)](https://img.shields.io/github/downloads/nukleros/operator-builder/total.svg) # Operator Builder diff --git a/cmd/operator-builder/main.go b/cmd/operator-builder/main.go index 277ae9a..7b2cf10 100644 --- a/cmd/operator-builder/main.go +++ b/cmd/operator-builder/main.go @@ -7,7 +7,7 @@ package main import ( log "github.com/sirupsen/logrus" - "github.com/vmware-tanzu-labs/operator-builder/pkg/cli" + "github.com/nukleros/operator-builder/pkg/cli" ) func main() { diff --git a/docs/markers.md b/docs/markers.md index 8f0d3e6..7d30df4 100644 --- a/docs/markers.md +++ b/docs/markers.md @@ -34,6 +34,7 @@ field for your workload. | [type](#type-required) | string{string, int, bool} | true | | [default](#default-optional) | [type](#supported-field-types) | false | | [replace](#replace-optional) | string | false | +| [arbitrary](#arbitrary-optional) | bool | false | | [description](#description-optional) | string | false | ### Name (required if Parent is unspecified) @@ -46,15 +47,15 @@ ex. +operator-builder:field:name=myName ### Parent (required if Name is unspecified) -The parent field in which you wish to substitute. Currently, only `metadata.name` is supported. This -will allow you to use the parent name as a value in the child resource. +The parent field in which you wish to substitute. Currently, only `metadata.name` is supported. +This will allow you to use the parent name as a value in the child resource. ex. +operator-builder:field:parent=metadata.name ### Type (required) The other required field is the `type` field which specifies the data type for -the value. +the value. [#supported-field-types]() The supported data types are: @@ -128,6 +129,69 @@ data: justtesting: myoption ``` +### Arbitrary (optional) + +If you wish to create a field for a custom resource that does not directly map +to a value in a child resource, mark a field as arbitrary. + +Here is an example of how to mark a field as arbitrary: + +```yaml +--- +# +operator-builder:field:name=nginx.installType,arbitrary,default="deployment",type=string,description=` +# +kubebuilder:validation:Enum=deployment;daemonset +# Method of install nginx ingress controller. One of: deployment | daemonset.` +apiVersion: v1 +kind: Namespace +metadata: + # +operator-builder:field:name=namespace,default="nukleros-ingress-system",type=string,description=` + # Namespace to use for ingress support services.` + name: nukleros-ingress-system +``` + +On the first line you can see the `nginx.installType` custom resource field is +marked as arbitrary with the `arbitrary` marker field. Where you place this +marker is unimportant but it is recommended you put all arbitrary fields at the +beginning of one chosen manifest for ease of maintenance. + +This will result in a custom resource sample that looks as follows: + +```yaml +apiVersion: platform.addons.nukleros.io/v1alpha1 +kind: IngressComponent +metadata: + name: ingresscomponent-sample +spec: + #collection: + #name: "supportservices-sample" + #namespace: "" + nginx: + installType: "deployment" # <---- arbitary field + image: "nginx/nginx-ingress" + version: "2.3.0" + replicas: 2 + namespace: "nukleros-ingress-system" +``` + +This arbitrary field will not map to any child resource value. However it can +be leveraged by some custom mutation code or by a resource marker such as this: + +```yaml +--- +# +operator-builder:resource:field=nginx.installType,value="deployment",include +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-ingress + namespace: nukleros-ingress-system # +operator-builder:field:name=namespace,default="nukleros-ingress-system",type=string +... +``` + +The marker on line one indicates the deployment resource only be created if +`nginx.installType` has a value of `deployment` (as shown in the custom resource +sample above). In this example, we are providing an option to install the Nginx +Ingress Controller as a deployment _or_ a daemonset. + ### Description (optional) An optional description can be provided which will be used in the source code as @@ -213,6 +277,12 @@ resource. Defined as `+operator-builder:resource` this marker can be used to control a specific resource with arguments in the marker. +Note: a resource marker must reference a field defined by a field marker. If +you include a resource marker with a unique field name that is not also defined +by a field marker you will get an error. You may use an [arbitrary field](#arbitrary-optional) +on a field marker if you don't wish to associate the field with a value in a +child resource. + | Field | Type | Required | | --------------------------------------------------- | ------------------------------ | -------- | | [field](#field--collectionfield-required) | string | true | diff --git a/go.mod b/go.mod index 6a54d1b..79e84ed 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/vmware-tanzu-labs/operator-builder +module github.com/nukleros/operator-builder go 1.17 diff --git a/internal/markers/inspect/inspector.go b/internal/markers/inspect/inspector.go index 3466af9..58059d2 100644 --- a/internal/markers/inspect/inspector.go +++ b/internal/markers/inspect/inspector.go @@ -5,8 +5,8 @@ package inspect import ( - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/marker" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/parser" + "github.com/nukleros/operator-builder/internal/markers/marker" + "github.com/nukleros/operator-builder/internal/markers/parser" ) type Inspector struct { diff --git a/internal/markers/inspect/yaml.go b/internal/markers/inspect/yaml.go index 5e2e1d4..841cfcd 100644 --- a/internal/markers/inspect/yaml.go +++ b/internal/markers/inspect/yaml.go @@ -12,7 +12,7 @@ import ( "gopkg.in/yaml.v3" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/parser" + "github.com/nukleros/operator-builder/internal/markers/parser" ) type YAMLResult struct { diff --git a/internal/markers/lexer/lexer_test.go b/internal/markers/lexer/lexer_test.go index df1cda9..7b6e352 100644 --- a/internal/markers/lexer/lexer_test.go +++ b/internal/markers/lexer/lexer_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/lexer" + "github.com/nukleros/operator-builder/internal/markers/lexer" ) func GetTestLexer(buf string) *lexer.Lexer { diff --git a/internal/markers/marker/argument.go b/internal/markers/marker/argument.go index e8b4692..435aeae 100644 --- a/internal/markers/marker/argument.go +++ b/internal/markers/marker/argument.go @@ -10,7 +10,7 @@ import ( "reflect" "strings" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/parser" + "github.com/nukleros/operator-builder/internal/markers/parser" ) var ( diff --git a/internal/markers/marker/registry.go b/internal/markers/marker/registry.go index 5c046e7..2d9b2e6 100644 --- a/internal/markers/marker/registry.go +++ b/internal/markers/marker/registry.go @@ -4,7 +4,7 @@ package marker -import "github.com/vmware-tanzu-labs/operator-builder/internal/markers/parser" +import "github.com/nukleros/operator-builder/internal/markers/parser" type Registry struct { registry map[string]*Definition diff --git a/internal/markers/parser/consumed.go b/internal/markers/parser/consumed.go index c58acba..65d840a 100644 --- a/internal/markers/parser/consumed.go +++ b/internal/markers/parser/consumed.go @@ -4,7 +4,7 @@ package parser -import "github.com/vmware-tanzu-labs/operator-builder/internal/markers/lexer" +import "github.com/nukleros/operator-builder/internal/markers/lexer" func (p *Parser) consumed(lxt lexer.LexemeType) bool { if p.peek().Type == lxt { diff --git a/internal/markers/parser/parser.go b/internal/markers/parser/parser.go index a3d91a7..82475a1 100644 --- a/internal/markers/parser/parser.go +++ b/internal/markers/parser/parser.go @@ -7,7 +7,7 @@ package parser import ( "bytes" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/lexer" + "github.com/nukleros/operator-builder/internal/markers/lexer" ) type stateFn func(*Parser) stateFn diff --git a/internal/markers/parser/peek.go b/internal/markers/parser/peek.go index 387a3e6..5ea7f2c 100644 --- a/internal/markers/parser/peek.go +++ b/internal/markers/parser/peek.go @@ -4,7 +4,7 @@ package parser -import "github.com/vmware-tanzu-labs/operator-builder/internal/markers/lexer" +import "github.com/nukleros/operator-builder/internal/markers/lexer" func (p *Parser) peek() lexer.Lexeme { if p.peekCount > 0 { diff --git a/internal/markers/parser/state.go b/internal/markers/parser/state.go index d6a6c54..8dbd5b5 100644 --- a/internal/markers/parser/state.go +++ b/internal/markers/parser/state.go @@ -8,7 +8,7 @@ import ( "errors" "strconv" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/lexer" + "github.com/nukleros/operator-builder/internal/markers/lexer" ) func startParse(p *Parser) stateFn { diff --git a/internal/plugins/config/v1/api.go b/internal/plugins/config/v1/api.go index 428af76..972678f 100644 --- a/internal/plugins/config/v1/api.go +++ b/internal/plugins/config/v1/api.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - workloadconfig "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/config" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + workloadconfig "github.com/nukleros/operator-builder/internal/workload/v1/config" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) type createAPISubcommand struct { diff --git a/internal/plugins/config/v1/init.go b/internal/plugins/config/v1/init.go index f4f539d..2f4f058 100644 --- a/internal/plugins/config/v1/init.go +++ b/internal/plugins/config/v1/init.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - workloadconfig "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/config" + workloadconfig "github.com/nukleros/operator-builder/internal/workload/v1/config" ) type initSubcommand struct { diff --git a/internal/plugins/config/v1/plugin.go b/internal/plugins/config/v1/plugin.go index d22002d..aaf590d 100644 --- a/internal/plugins/config/v1/plugin.go +++ b/internal/plugins/config/v1/plugin.go @@ -9,7 +9,7 @@ import ( cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins" + "github.com/nukleros/operator-builder/internal/plugins" ) const pluginName = "config." + plugins.DefaultNameQualifier diff --git a/internal/plugins/license/v1/init.go b/internal/plugins/license/v1/init.go index f4ff67b..2e1f3b5 100644 --- a/internal/plugins/license/v1/init.go +++ b/internal/plugins/license/v1/init.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "github.com/vmware-tanzu-labs/operator-builder/internal/license" + "github.com/nukleros/operator-builder/internal/license" ) var _ plugin.InitSubcommand = &initSubcommand{} diff --git a/internal/plugins/license/v1/plugin.go b/internal/plugins/license/v1/plugin.go index 4720107..3b8d1df 100644 --- a/internal/plugins/license/v1/plugin.go +++ b/internal/plugins/license/v1/plugin.go @@ -9,7 +9,7 @@ import ( cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins" + "github.com/nukleros/operator-builder/internal/plugins" ) const pluginName = "license." + plugins.DefaultNameQualifier diff --git a/internal/plugins/workload/v1/api.go b/internal/plugins/workload/v1/api.go index e42c780..39f0f35 100644 --- a/internal/plugins/workload/v1/api.go +++ b/internal/plugins/workload/v1/api.go @@ -13,10 +13,10 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/subcommand" - workloadconfig "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/config" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/subcommand" + workloadconfig "github.com/nukleros/operator-builder/internal/workload/v1/config" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) type createAPISubcommand struct { diff --git a/internal/plugins/workload/v1/init.go b/internal/plugins/workload/v1/init.go index c1ec824..b549c87 100644 --- a/internal/plugins/workload/v1/init.go +++ b/internal/plugins/workload/v1/init.go @@ -12,10 +12,10 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/subcommand" - workloadconfig "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/config" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/subcommand" + workloadconfig "github.com/nukleros/operator-builder/internal/workload/v1/config" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) type initSubcommand struct { diff --git a/internal/plugins/workload/v1/plugin.go b/internal/plugins/workload/v1/plugin.go index 38c2813..4bed644 100644 --- a/internal/plugins/workload/v1/plugin.go +++ b/internal/plugins/workload/v1/plugin.go @@ -9,7 +9,7 @@ import ( cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins" + "github.com/nukleros/operator-builder/internal/plugins" ) const pluginName = "workload." + plugins.DefaultNameQualifier diff --git a/internal/plugins/workload/v1/scaffolds/api.go b/internal/plugins/workload/v1/scaffolds/api.go index 3e1d9fc..a133ecb 100644 --- a/internal/plugins/workload/v1/scaffolds/api.go +++ b/internal/plugins/workload/v1/scaffolds/api.go @@ -16,17 +16,17 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/api" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/api/resources" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/cli" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/config/crd" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/config/samples" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/controller" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/int/dependencies" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/int/mutate" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/test/e2e" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/api" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/api/resources" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/cli" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/config/crd" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/config/samples" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/controller" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/int/dependencies" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/int/mutate" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/test/e2e" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) const boilerplatePath = "hack/boilerplate.go.txt" diff --git a/internal/plugins/workload/v1/scaffolds/init.go b/internal/plugins/workload/v1/scaffolds/init.go index 7a599a4..dc4cdc4 100644 --- a/internal/plugins/workload/v1/scaffolds/init.go +++ b/internal/plugins/workload/v1/scaffolds/init.go @@ -13,10 +13,10 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/cli" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/test/e2e" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/cli" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/test/e2e" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var _ plugins.Scaffolder = &initScaffolder{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/api/resources/constants.go b/internal/plugins/workload/v1/scaffolds/templates/api/resources/constants.go index 7e809a0..200d33a 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/api/resources/constants.go +++ b/internal/plugins/workload/v1/scaffolds/templates/api/resources/constants.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var _ machinery.Template = &Constants{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/api/resources/definition.go b/internal/plugins/workload/v1/scaffolds/templates/api/resources/definition.go index 9915855..8531365 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/api/resources/definition.go +++ b/internal/plugins/workload/v1/scaffolds/templates/api/resources/definition.go @@ -9,8 +9,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/manifests" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/manifests" ) var _ machinery.Template = &Definition{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/api/resources/mutate.go b/internal/plugins/workload/v1/scaffolds/templates/api/resources/mutate.go index 9976d53..80c27fa 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/api/resources/mutate.go +++ b/internal/plugins/workload/v1/scaffolds/templates/api/resources/mutate.go @@ -8,8 +8,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/manifests" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/manifests" ) var ( diff --git a/internal/plugins/workload/v1/scaffolds/templates/api/resources/resources.go b/internal/plugins/workload/v1/scaffolds/templates/api/resources/resources.go index 7f6dc36..6471e87 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/api/resources/resources.go +++ b/internal/plugins/workload/v1/scaffolds/templates/api/resources/resources.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1/scaffolds/templates/config/samples" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/plugins/workload/v1/scaffolds/templates/config/samples" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var _ machinery.Template = &Resources{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/api/types.go b/internal/plugins/workload/v1/scaffolds/templates/api/types.go index cbee6c3..2376178 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/api/types.go +++ b/internal/plugins/workload/v1/scaffolds/templates/api/types.go @@ -12,8 +12,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var _ machinery.Template = &Types{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_generate.go b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_generate.go index bb6f252..1a335e0 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_generate.go +++ b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_generate.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) const ( diff --git a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_generate_sub.go b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_generate_sub.go index 2bd7b20..e3db0c3 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_generate_sub.go +++ b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_generate_sub.go @@ -10,9 +10,9 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var _ machinery.Template = &CmdGenerateSub{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_init.go b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_init.go index 2fd027f..6fcb002 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_init.go +++ b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_init.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) const ( diff --git a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_init_sub.go b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_init_sub.go index 6263493..4a93ade 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_init_sub.go +++ b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_init_sub.go @@ -10,9 +10,9 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var _ machinery.Template = &CmdInitSub{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_root.go b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_root.go index 23eb3b2..e268e2b 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_root.go +++ b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_root.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var ( diff --git a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_version.go b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_version.go index 36f27d9..e725c78 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_version.go +++ b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_version.go @@ -9,7 +9,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) const ( diff --git a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_version_sub.go b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_version_sub.go index 1beadfa..70a0af8 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_version_sub.go +++ b/internal/plugins/workload/v1/scaffolds/templates/cli/cmd_version_sub.go @@ -9,9 +9,9 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var ( diff --git a/internal/plugins/workload/v1/scaffolds/templates/cli/main.go b/internal/plugins/workload/v1/scaffolds/templates/cli/main.go index 7084fe6..7e28745 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/cli/main.go +++ b/internal/plugins/workload/v1/scaffolds/templates/cli/main.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" ) var _ machinery.Template = &Main{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/config/samples/crd_sample.go b/internal/plugins/workload/v1/scaffolds/templates/config/samples/crd_sample.go index 6447635..551f31a 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/config/samples/crd_sample.go +++ b/internal/plugins/workload/v1/scaffolds/templates/config/samples/crd_sample.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var _ machinery.Template = &CRDSample{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/controller/controller.go b/internal/plugins/workload/v1/scaffolds/templates/controller/controller.go index 7d064b7..a224ed9 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/controller/controller.go +++ b/internal/plugins/workload/v1/scaffolds/templates/controller/controller.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var _ machinery.Template = &Controller{} @@ -186,7 +186,7 @@ func (r *{{ .Resource.Kind }}Reconciler) Reconcile(ctx context.Context, request if !apierrs.IsNotFound(err) { return ctrl.Result{}, err } - + return ctrl.Result{}, nil } diff --git a/internal/plugins/workload/v1/scaffolds/templates/controller/phases.go b/internal/plugins/workload/v1/scaffolds/templates/controller/phases.go index a9fe2ba..cf5107a 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/controller/phases.go +++ b/internal/plugins/workload/v1/scaffolds/templates/controller/phases.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/utils" ) var _ machinery.Template = &Controller{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/dockerfile.go b/internal/plugins/workload/v1/scaffolds/templates/dockerfile.go index 94bf119..7e3c3bb 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/dockerfile.go +++ b/internal/plugins/workload/v1/scaffolds/templates/dockerfile.go @@ -7,7 +7,7 @@ package templates import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/utils" ) const ( diff --git a/internal/plugins/workload/v1/scaffolds/templates/gomod.go b/internal/plugins/workload/v1/scaffolds/templates/gomod.go index 7a4b5c6..ba29092 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/gomod.go +++ b/internal/plugins/workload/v1/scaffolds/templates/gomod.go @@ -7,7 +7,7 @@ package templates import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/utils" ) var _ machinery.Template = &GoMod{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/int/dependencies/component.go b/internal/plugins/workload/v1/scaffolds/templates/int/dependencies/component.go index 06d088e..ec302ca 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/int/dependencies/component.go +++ b/internal/plugins/workload/v1/scaffolds/templates/int/dependencies/component.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/utils" ) var _ machinery.Template = &Component{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/int/mutate/component.go b/internal/plugins/workload/v1/scaffolds/templates/int/mutate/component.go index 79c8a52..576185b 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/int/mutate/component.go +++ b/internal/plugins/workload/v1/scaffolds/templates/int/mutate/component.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/utils" ) var _ machinery.Template = &Component{} diff --git a/internal/plugins/workload/v1/scaffolds/templates/readme.go b/internal/plugins/workload/v1/scaffolds/templates/readme.go index f314469..860cb5d 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/readme.go +++ b/internal/plugins/workload/v1/scaffolds/templates/readme.go @@ -30,7 +30,7 @@ func (f *Readme) SetTemplateDefaults() error { } const readmefileTemplate = `A Kubernetes operator built with -[operator-builder](https://github.com/vmware-tanzu-labs/operator-builder). +[operator-builder](https://github.com/nukleros/operator-builder). ## Local Development & Testing diff --git a/internal/plugins/workload/v1/scaffolds/templates/test/e2e/workloads.go b/internal/plugins/workload/v1/scaffolds/templates/test/e2e/workloads.go index ca0294c..26951a7 100644 --- a/internal/plugins/workload/v1/scaffolds/templates/test/e2e/workloads.go +++ b/internal/plugins/workload/v1/scaffolds/templates/test/e2e/workloads.go @@ -11,8 +11,8 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) const ( diff --git a/internal/workload/v1/commands/companion/cli.go b/internal/workload/v1/commands/companion/cli.go index e702998..6a065a8 100644 --- a/internal/workload/v1/commands/companion/cli.go +++ b/internal/workload/v1/commands/companion/cli.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/utils" ) const ( diff --git a/internal/workload/v1/commands/subcommand/create_api.go b/internal/workload/v1/commands/subcommand/create_api.go index be2e8c2..ee46cc4 100644 --- a/internal/workload/v1/commands/subcommand/create_api.go +++ b/internal/workload/v1/commands/subcommand/create_api.go @@ -9,9 +9,9 @@ import ( "fmt" "path/filepath" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/config" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/markers" + "github.com/nukleros/operator-builder/internal/workload/v1/config" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/markers" ) var ( diff --git a/internal/workload/v1/commands/subcommand/init.go b/internal/workload/v1/commands/subcommand/init.go index 8cdcfb5..58ad105 100644 --- a/internal/workload/v1/commands/subcommand/init.go +++ b/internal/workload/v1/commands/subcommand/init.go @@ -5,7 +5,7 @@ package subcommand import ( - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/config" + "github.com/nukleros/operator-builder/internal/workload/v1/config" ) // Init runs the process logic for a config processor when running the `init` diff --git a/internal/workload/v1/commands/subcommand/init_config.go b/internal/workload/v1/commands/subcommand/init_config.go index 4c6e57f..47d69e4 100644 --- a/internal/workload/v1/commands/subcommand/init_config.go +++ b/internal/workload/v1/commands/subcommand/init_config.go @@ -12,8 +12,8 @@ import ( "gopkg.in/yaml.v3" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var ( diff --git a/internal/workload/v1/config/parse.go b/internal/workload/v1/config/parse.go index c94c939..0c72d91 100644 --- a/internal/workload/v1/config/parse.go +++ b/internal/workload/v1/config/parse.go @@ -13,8 +13,8 @@ import ( "gopkg.in/yaml.v3" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var ( diff --git a/internal/workload/v1/config/processor.go b/internal/workload/v1/config/processor.go index 63b107b..6760567 100644 --- a/internal/workload/v1/config/processor.go +++ b/internal/workload/v1/config/processor.go @@ -7,7 +7,7 @@ package config import ( "errors" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var ErrConfigMustExist = errors.New("no workload config provided - workload config required") diff --git a/internal/workload/v1/config/validate.go b/internal/workload/v1/config/validate.go index 6fa2471..6224455 100644 --- a/internal/workload/v1/config/validate.go +++ b/internal/workload/v1/config/validate.go @@ -10,7 +10,7 @@ import ( structvalidator "github.com/go-playground/validator" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" ) var ( diff --git a/internal/workload/v1/kinds/api.go b/internal/workload/v1/kinds/api.go index f430b9a..ab24ade 100644 --- a/internal/workload/v1/kinds/api.go +++ b/internal/workload/v1/kinds/api.go @@ -12,8 +12,8 @@ import ( "reflect" "strings" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/markers" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/markers" ) var ErrOverwriteExistingValue = errors.New("an attempt to overwrite existing value was made") diff --git a/internal/workload/v1/kinds/api_internal_test.go b/internal/workload/v1/kinds/api_internal_test.go index 6cc2f21..4fc3522 100644 --- a/internal/workload/v1/kinds/api_internal_test.go +++ b/internal/workload/v1/kinds/api_internal_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/markers" + "github.com/nukleros/operator-builder/internal/workload/v1/markers" ) func TestAPIFields_GenerateSampleSpec(t *testing.T) { diff --git a/internal/workload/v1/kinds/collection.go b/internal/workload/v1/kinds/collection.go index 5580f38..b5b7747 100644 --- a/internal/workload/v1/kinds/collection.go +++ b/internal/workload/v1/kinds/collection.go @@ -10,11 +10,11 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/manifests" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/markers" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/rbac" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/manifests" + "github.com/nukleros/operator-builder/internal/workload/v1/markers" + "github.com/nukleros/operator-builder/internal/workload/v1/rbac" ) var ErrMissingRequiredFields = errors.New("missing required fields") diff --git a/internal/workload/v1/kinds/collection_internal_test.go b/internal/workload/v1/kinds/collection_internal_test.go index 181637f..61b3342 100644 --- a/internal/workload/v1/kinds/collection_internal_test.go +++ b/internal/workload/v1/kinds/collection_internal_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" ) func Test_CollectionSetNames(t *testing.T) { diff --git a/internal/workload/v1/kinds/component.go b/internal/workload/v1/kinds/component.go index babbc76..e84c29a 100644 --- a/internal/workload/v1/kinds/component.go +++ b/internal/workload/v1/kinds/component.go @@ -10,11 +10,11 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/manifests" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/markers" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/rbac" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/manifests" + "github.com/nukleros/operator-builder/internal/workload/v1/markers" + "github.com/nukleros/operator-builder/internal/workload/v1/rbac" ) var ErrNoComponentsOnComponent = errors.New("cannot set component workloads on a component workload - only on collections") diff --git a/internal/workload/v1/kinds/component_internal_test.go b/internal/workload/v1/kinds/component_internal_test.go index 896f041..d57a5a9 100644 --- a/internal/workload/v1/kinds/component_internal_test.go +++ b/internal/workload/v1/kinds/component_internal_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" ) func Test_ComponentSetNames(t *testing.T) { diff --git a/internal/workload/v1/kinds/standalone.go b/internal/workload/v1/kinds/standalone.go index 78465d2..88be0f5 100644 --- a/internal/workload/v1/kinds/standalone.go +++ b/internal/workload/v1/kinds/standalone.go @@ -10,11 +10,11 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/manifests" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/markers" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/rbac" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/manifests" + "github.com/nukleros/operator-builder/internal/workload/v1/markers" + "github.com/nukleros/operator-builder/internal/workload/v1/rbac" ) var ErrNoComponentsOnStandalone = errors.New("cannot set component workloads on a component workload - only on collections") diff --git a/internal/workload/v1/kinds/standalone_internal_test.go b/internal/workload/v1/kinds/standalone_internal_test.go index 0e4235a..b889551 100644 --- a/internal/workload/v1/kinds/standalone_internal_test.go +++ b/internal/workload/v1/kinds/standalone_internal_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" ) func Test_StandaloneSetNames(t *testing.T) { diff --git a/internal/workload/v1/kinds/workload.go b/internal/workload/v1/kinds/workload.go index 4bbfe8e..b282cfc 100644 --- a/internal/workload/v1/kinds/workload.go +++ b/internal/workload/v1/kinds/workload.go @@ -18,11 +18,11 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/inspect" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/companion" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/manifests" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/markers" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/rbac" + "github.com/nukleros/operator-builder/internal/markers/inspect" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/companion" + "github.com/nukleros/operator-builder/internal/workload/v1/manifests" + "github.com/nukleros/operator-builder/internal/workload/v1/markers" + "github.com/nukleros/operator-builder/internal/workload/v1/rbac" ) // WorkloadAPISpec sample fields which may be used in things like testing or diff --git a/internal/workload/v1/manifests/child_resource.go b/internal/workload/v1/manifests/child_resource.go index 02de977..a3b3639 100644 --- a/internal/workload/v1/manifests/child_resource.go +++ b/internal/workload/v1/manifests/child_resource.go @@ -11,9 +11,9 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/markers" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/rbac" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/markers" + "github.com/nukleros/operator-builder/internal/workload/v1/rbac" ) var ( diff --git a/internal/workload/v1/manifests/manifest.go b/internal/workload/v1/manifests/manifest.go index 0f403b3..fa7245b 100644 --- a/internal/workload/v1/manifests/manifest.go +++ b/internal/workload/v1/manifests/manifest.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/markers" + "github.com/nukleros/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/workload/v1/markers" ) var ErrProcessManifest = errors.New("error processing manifest file") diff --git a/internal/workload/v1/markers/collection_field_marker.go b/internal/workload/v1/markers/collection_field_marker.go index 4b9b5b2..d30f8c5 100644 --- a/internal/workload/v1/markers/collection_field_marker.go +++ b/internal/workload/v1/markers/collection_field_marker.go @@ -7,7 +7,7 @@ package markers import ( "fmt" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/marker" + "github.com/nukleros/operator-builder/internal/markers/marker" ) const ( @@ -116,6 +116,14 @@ func (cfm *CollectionFieldMarker) IsForCollection() bool { return cfm.forCollection } +func (cfm *CollectionFieldMarker) IsArbitrary() bool { + if cfm.Arbitrary == nil { + return false + } + + return *cfm.Arbitrary +} + func (cfm *CollectionFieldMarker) SetOriginalValue(value string) { if cfm.GetReplaceText() != "" { cfm.originalValue = cfm.GetReplaceText() diff --git a/internal/workload/v1/markers/collection_field_marker_internal_test.go b/internal/workload/v1/markers/collection_field_marker_internal_test.go index 58ce740..f3975d3 100644 --- a/internal/workload/v1/markers/collection_field_marker_internal_test.go +++ b/internal/workload/v1/markers/collection_field_marker_internal_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/marker" + "github.com/nukleros/operator-builder/internal/markers/marker" ) func TestCollectionFieldMarker_String(t *testing.T) { diff --git a/internal/workload/v1/markers/field_marker.go b/internal/workload/v1/markers/field_marker.go index 53c896d..d17837f 100644 --- a/internal/workload/v1/markers/field_marker.go +++ b/internal/workload/v1/markers/field_marker.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/marker" + "github.com/nukleros/operator-builder/internal/markers/marker" ) var ( @@ -33,6 +33,7 @@ type FieldMarker struct { Default interface{} `marker:",optional"` Replace *string Parent *string + Arbitrary *bool // other values which we use to pass information forCollection bool @@ -42,11 +43,18 @@ type FieldMarker struct { //nolint:gocritic //needed to implement string interface func (fm FieldMarker) String() string { - return fmt.Sprintf("FieldMarker{Name: %s Type: %v Description: %q Default: %v}", + var arbitraryBool bool + + if fm.Arbitrary != nil { + arbitraryBool = *fm.Arbitrary + } + + return fmt.Sprintf("FieldMarker{Name: %s Type: %v Description: %q Default: %v Arbitrary: %v}", fm.GetName(), fm.Type, fm.GetDescription(), fm.Default, + arbitraryBool, ) } @@ -133,6 +141,14 @@ func (fm *FieldMarker) IsForCollection() bool { return fm.forCollection } +func (fm *FieldMarker) IsArbitrary() bool { + if fm.Arbitrary == nil { + return false + } + + return *fm.Arbitrary +} + func (fm *FieldMarker) SetOriginalValue(value string) { if fm.GetReplaceText() != "" { fm.originalValue = fm.GetReplaceText() diff --git a/internal/workload/v1/markers/field_marker_internal_test.go b/internal/workload/v1/markers/field_marker_internal_test.go index ee78df9..8715344 100644 --- a/internal/workload/v1/markers/field_marker_internal_test.go +++ b/internal/workload/v1/markers/field_marker_internal_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/marker" + "github.com/nukleros/operator-builder/internal/markers/marker" ) func TestFieldMarker_String(t *testing.T) { @@ -17,12 +17,14 @@ func TestFieldMarker_String(t *testing.T) { testName := "fmtest" testString := "fm test" + testBool := false type fields struct { Name *string Type FieldType Description *string Default interface{} + Arbitrary *bool } tests := []struct { @@ -37,8 +39,9 @@ func TestFieldMarker_String(t *testing.T) { Type: FieldString, Description: &testString, Default: testName, + Arbitrary: &testBool, }, - want: "FieldMarker{Name: fmtest Type: string Description: \"fm test\" Default: fmtest}", + want: "FieldMarker{Name: fmtest Type: string Description: \"fm test\" Default: fmtest Arbitrary: false}", }, { name: "ensure field with nil values output matches expected", @@ -47,8 +50,9 @@ func TestFieldMarker_String(t *testing.T) { Type: FieldString, Description: nil, Default: testName, + Arbitrary: nil, }, - want: "FieldMarker{Name: fmtest Type: string Description: \"\" Default: fmtest}", + want: "FieldMarker{Name: fmtest Type: string Description: \"\" Default: fmtest Arbitrary: false}", }, } diff --git a/internal/workload/v1/markers/markers.go b/internal/workload/v1/markers/markers.go index 19d12bf..4df157b 100644 --- a/internal/workload/v1/markers/markers.go +++ b/internal/workload/v1/markers/markers.go @@ -12,9 +12,9 @@ import ( "gopkg.in/yaml.v3" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/inspect" - markerparser "github.com/vmware-tanzu-labs/operator-builder/internal/markers/marker" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/markers/inspect" + markerparser "github.com/nukleros/operator-builder/internal/markers/marker" + "github.com/nukleros/operator-builder/internal/utils" ) var ( @@ -49,6 +49,7 @@ type FieldMarkerProcessor interface { IsCollectionFieldMarker() bool IsFieldMarker() bool IsForCollection() bool + IsArbitrary() bool SetDescription(string) SetOriginalValue(string) @@ -284,9 +285,14 @@ func setComments(marker FieldMarkerProcessor, result *inspect.YAMLResult, key, v value.LineComment = strings.ReplaceAll(value.LineComment, replaceText, appendText) } -// setValue will set the value appropriately. This is based on whether the marker has -// requested replacement text. +// setValue will set the value appropriately. If the marker is arbitrary, no +// value need be set - return immediately. If the marker has requested +// replacement text this is set. func setValue(marker FieldMarkerProcessor, value *yaml.Node) error { + if marker.IsArbitrary() { + return nil + } + const varTag = "!!var" const strTag = "!!str" diff --git a/internal/workload/v1/markers/markers_internal_test.go b/internal/workload/v1/markers/markers_internal_test.go index d0f71df..9e13604 100644 --- a/internal/workload/v1/markers/markers_internal_test.go +++ b/internal/workload/v1/markers/markers_internal_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/inspect" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/parser" + "github.com/nukleros/operator-builder/internal/markers/inspect" + "github.com/nukleros/operator-builder/internal/markers/parser" ) func TestContainsMarkerType(t *testing.T) { diff --git a/internal/workload/v1/markers/resource_marker.go b/internal/workload/v1/markers/resource_marker.go index fe98ddc..be066b4 100644 --- a/internal/workload/v1/markers/resource_marker.go +++ b/internal/workload/v1/markers/resource_marker.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/marker" + "github.com/nukleros/operator-builder/internal/markers/marker" ) var ( diff --git a/internal/workload/v1/markers/resource_marker_internal_test.go b/internal/workload/v1/markers/resource_marker_internal_test.go index c61e4f9..01ee1fd 100644 --- a/internal/workload/v1/markers/resource_marker_internal_test.go +++ b/internal/workload/v1/markers/resource_marker_internal_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/vmware-tanzu-labs/operator-builder/internal/markers/marker" + "github.com/nukleros/operator-builder/internal/markers/marker" ) func TestResourceMarker_String(t *testing.T) { diff --git a/internal/workload/v1/rbac/role_rule.go b/internal/workload/v1/rbac/role_rule.go index ba5ba07..f8a8286 100644 --- a/internal/workload/v1/rbac/role_rule.go +++ b/internal/workload/v1/rbac/role_rule.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/utils" ) var ( diff --git a/internal/workload/v1/rbac/rules.go b/internal/workload/v1/rbac/rules.go index 12ea6e6..8ca1725 100644 --- a/internal/workload/v1/rbac/rules.go +++ b/internal/workload/v1/rbac/rules.go @@ -10,7 +10,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/vmware-tanzu-labs/operator-builder/internal/utils" + "github.com/nukleros/operator-builder/internal/utils" ) type Rules []Rule diff --git a/pkg/cli/init.go b/pkg/cli/init.go index f3f875a..79e06f8 100644 --- a/pkg/cli/init.go +++ b/pkg/cli/init.go @@ -17,9 +17,9 @@ import ( golangv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v2" golangv3 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3" - configv1 "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/config/v1" - licensev1 "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/license/v1" - workloadv1 "github.com/vmware-tanzu-labs/operator-builder/internal/plugins/workload/v1" + configv1 "github.com/nukleros/operator-builder/internal/plugins/config/v1" + licensev1 "github.com/nukleros/operator-builder/internal/plugins/license/v1" + workloadv1 "github.com/nukleros/operator-builder/internal/plugins/workload/v1" ) var version = "unstable" diff --git a/pkg/cli/init_config.go b/pkg/cli/init_config.go index 134c469..8e85cf1 100644 --- a/pkg/cli/init_config.go +++ b/pkg/cli/init_config.go @@ -10,9 +10,9 @@ import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/commands/subcommand" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/kinds" - "github.com/vmware-tanzu-labs/operator-builder/internal/workload/v1/manifests" + "github.com/nukleros/operator-builder/internal/workload/v1/commands/subcommand" + "github.com/nukleros/operator-builder/internal/workload/v1/kinds" + "github.com/nukleros/operator-builder/internal/workload/v1/manifests" ) var ( diff --git a/pkg/cli/license.go b/pkg/cli/license.go index 9f90aaf..daf1bec 100644 --- a/pkg/cli/license.go +++ b/pkg/cli/license.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/vmware-tanzu-labs/operator-builder/internal/license" + "github.com/nukleros/operator-builder/internal/license" ) func NewUpdateLicenseCmd() *cobra.Command {