From 52f055ff43b264a4f8d6c3dfa66164e5a159b094 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Thu, 19 May 2022 13:12:09 -0700 Subject: [PATCH 01/21] updated makefile --- .../scaffolds/internal/templates/makefile.go | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go index f6bca30..6afedb7 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go @@ -20,6 +20,10 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) +const ( + filePathSep = "*" + "{{ .Resource.QualifiedGroup }}" + "-" + "{{ .Resource.Version }}" +) + var _ machinery.Template = &Makefile{} // Makefile scaffolds the Makefile @@ -34,6 +38,12 @@ type Makefile struct { // // AnsibleOperatorVersion is the version of the ansible-operator binary downloaded by the Makefile. // AnsibleOperatorVersion string + + // Package is the source files package + Package string + + // Name of the operator used for the main file. + ClassName string } // SetTemplateDefaults implements machinery.Template @@ -62,6 +72,10 @@ func (f *Makefile) SetTemplateDefaults() error { } const makefileTemplate = ` + +IMAGE_TAG_BASE ?= example.com/memcached-quarkus-operator +BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) + # Image URL to use all building/pushing image targets IMG ?= {{ .Image }} @@ -91,6 +105,17 @@ docker-build: ## Build docker image with the manager. docker-push: ## Push docker image with the manager. mvn package -Dquarkus.container-image.push=true -Dquarkus.container-image.image=${IMG} +##@Bundle +bundle-generate: + cat target/kubernetes/"*" + "." +"{{ .Resource.QualifiedGroup }}" + "-" + "{{ .Resource.Version }}".yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=memcached-quarkus-operator + operator-sdk bundle validate ./bundle + +bundle-build: + docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) . + +bundle-push: ## Push the bundle image. + docker push $(BUNDLE_IMG) + ##@ Deployment install: ## Install CRDs into the K8s cluster specified in ~/.kube/config. From 7605a9bc18790dac8c49b69525e5b437d370ef3c Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Thu, 19 May 2022 13:21:29 -0700 Subject: [PATCH 02/21] updated makefile --- pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go index 6afedb7..995bed6 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go @@ -29,6 +29,7 @@ var _ machinery.Template = &Makefile{} // Makefile scaffolds the Makefile type Makefile struct { machinery.TemplateMixin + machinery.ResourceMixin // Image is controller manager image name Image string From b8754b2685725861683fb7cb199f60c1fa0d45fd Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Thu, 19 May 2022 13:24:16 -0700 Subject: [PATCH 03/21] updated makefile --- pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go index 995bed6..dc03ffd 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go @@ -108,7 +108,7 @@ docker-push: ## Push docker image with the manager. ##@Bundle bundle-generate: - cat target/kubernetes/"*" + "." +"{{ .Resource.QualifiedGroup }}" + "-" + "{{ .Resource.Version }}".yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=memcached-quarkus-operator + cat target/kubernetes/"*" + "." + "-" + "{{ .Resource.Version }}".yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=memcached-quarkus-operator operator-sdk bundle validate ./bundle bundle-build: From c4341427f17857461c7067703dff5658cb8158f1 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Thu, 19 May 2022 14:38:24 -0700 Subject: [PATCH 04/21] modified content to add changes in Makefile --- pkg/quarkus/v1alpha/scaffolds/api.go | 5 +++++ pkg/quarkus/v1alpha/scaffolds/init.go | 8 ++++---- .../v1alpha/scaffolds/internal/templates/makefile.go | 11 +++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/api.go b/pkg/quarkus/v1alpha/scaffolds/api.go index 402feeb..f4bcd8a 100644 --- a/pkg/quarkus/v1alpha/scaffolds/api.go +++ b/pkg/quarkus/v1alpha/scaffolds/api.go @@ -20,6 +20,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugins" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/controller" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/model" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/util" @@ -77,6 +78,10 @@ func (s *apiScaffolder) Scaffold() error { Package: util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())), ClassName: util.ToClassname(s.resource.Kind), }, + &templates.Makefile{ + Image: "", + KustomizeVersion: "v3.5.4", + }, ) return scaffold.Execute(createAPITemplates...) diff --git a/pkg/quarkus/v1alpha/scaffolds/init.go b/pkg/quarkus/v1alpha/scaffolds/init.go index 6f22ed1..8d9430f 100644 --- a/pkg/quarkus/v1alpha/scaffolds/init.go +++ b/pkg/quarkus/v1alpha/scaffolds/init.go @@ -79,9 +79,9 @@ func (s *initScaffolder) Scaffold() error { &templates.ApplicationPropertiesFile{ ProjectName: s.config.GetProjectName(), }, - &templates.Makefile{ - Image: "", - KustomizeVersion: "v3.5.4", - }, + // &templates.Makefile{ + // Image: "", + // KustomizeVersion: "v3.5.4", + // }, ) } diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go index dc03ffd..7988d7e 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go @@ -40,11 +40,11 @@ type Makefile struct { // // AnsibleOperatorVersion is the version of the ansible-operator binary downloaded by the Makefile. // AnsibleOperatorVersion string - // Package is the source files package - Package string + // // Package is the source files package + // Package string - // Name of the operator used for the main file. - ClassName string + // // Name of the operator used for the main file. + // ClassName string } // SetTemplateDefaults implements machinery.Template @@ -73,7 +73,6 @@ func (f *Makefile) SetTemplateDefaults() error { } const makefileTemplate = ` - IMAGE_TAG_BASE ?= example.com/memcached-quarkus-operator BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) @@ -108,7 +107,7 @@ docker-push: ## Push docker image with the manager. ##@Bundle bundle-generate: - cat target/kubernetes/"*" + "." + "-" + "{{ .Resource.Version }}".yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=memcached-quarkus-operator + cat target/kubernetes/*.{{ .Resource.QualifiedGroup }}-{{ .Resource.Version }}.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=memcached-quarkus-operator operator-sdk bundle validate ./bundle bundle-build: From 7d5502bbd87f2d526da266013f8fbaff858fabf1 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Thu, 19 May 2022 15:22:05 -0700 Subject: [PATCH 05/21] removed unused variable --- pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go index 7988d7e..5f728f6 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go @@ -20,10 +20,6 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" ) -const ( - filePathSep = "*" + "{{ .Resource.QualifiedGroup }}" + "-" + "{{ .Resource.Version }}" -) - var _ machinery.Template = &Makefile{} // Makefile scaffolds the Makefile From 9025bf3bb0f1fbcfd270558d2070472758e63b67 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Tue, 24 May 2022 11:40:29 -0700 Subject: [PATCH 06/21] modified create api subcommand code and added bundle code in Makefile --- pkg/quarkus/v1alpha/api.go | 47 +++++++++++++++++++ pkg/quarkus/v1alpha/init.go | 1 - pkg/quarkus/v1alpha/scaffolds/api.go | 16 +++---- pkg/quarkus/v1alpha/scaffolds/init.go | 8 ++-- .../scaffolds/internal/templates/makefile.go | 20 +------- 5 files changed, 60 insertions(+), 32 deletions(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 4da51b5..988dafc 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -17,7 +17,9 @@ package v1 import ( "errors" "fmt" + "os" + "github.com/spf13/afero" "github.com/spf13/pflag" "sigs.k8s.io/kubebuilder/v3/pkg/config" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" @@ -28,6 +30,8 @@ import ( "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds" ) +const filePath = "Makefile" + type createAPIOptions struct { CRDVersion string Namespaced bool @@ -76,11 +80,39 @@ func (p *createAPISubcommand) Validate() error { } func (p *createAPISubcommand) PostScaffold() error { + // fmt.Printf("Next: define a resource with:$ create api=%s\n", p.resource.QualifiedGroup()) + // fmt.Printf("Next: define a resource with:$ create api=%s\n", p.resource.Version) + // fmt.Printf("Next: define a resource with:$ create api=%s\n", p.config.GetProjectName()) + + // projectName := p.config.GetProjectName() + // groupName := p.resource.QualifiedGroup() + // versionName := p.resource.Version + return nil } func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { scaffolder := scaffolds.NewCreateAPIScaffolder(p.config, *p.resource) + + makefileBytes, err := afero.ReadFile(fs.FS, filePath) + if err != nil { + return err + } + + projectName := p.config.GetProjectName() + groupName := p.resource.QualifiedGroup() + versionName := p.resource.Version + + makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, groupName, versionName, projectName))...) + + var mode os.FileMode = 0644 + if info, err := fs.FS.Stat(filePath); err == nil { + mode = info.Mode() + } + if err := afero.WriteFile(fs.FS, filePath, makefileBytes, mode); err != nil { + return fmt.Errorf("error updating Makefile: %w", err) + } + scaffolder.InjectFS(fs) if err := scaffolder.Scaffold(); err != nil { return err @@ -116,3 +148,18 @@ func (p *createAPISubcommand) InjectResource(res *resource.Resource) error { return nil } + +const ( + makefileBundleVarFragment = ` +##@Bundle +bundle-generate: + cat target/kubernetes/*.%[1]s-%[2]s.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=%[3]s + operator-sdk bundle validate ./bundle + +bundle-build: + docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) . + +bundle-push: ## Push the bundle image. + docker push $(BUNDLE_IMG) +` +) diff --git a/pkg/quarkus/v1alpha/init.go b/pkg/quarkus/v1alpha/init.go index de80641..691e5b1 100644 --- a/pkg/quarkus/v1alpha/init.go +++ b/pkg/quarkus/v1alpha/init.go @@ -113,7 +113,6 @@ func (p *initSubcommand) Validate() error { func (p *initSubcommand) PostScaffold() error { // print follow on instructions to better guide the user - fmt.Printf("Next: define a resource with:\n$ %s create api\n", p.commandName) return nil } diff --git a/pkg/quarkus/v1alpha/scaffolds/api.go b/pkg/quarkus/v1alpha/scaffolds/api.go index f4bcd8a..342b6ad 100644 --- a/pkg/quarkus/v1alpha/scaffolds/api.go +++ b/pkg/quarkus/v1alpha/scaffolds/api.go @@ -15,12 +15,13 @@ package scaffolds import ( + "fmt" + "sigs.k8s.io/kubebuilder/v3/pkg/config" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugins" - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/controller" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds/internal/templates/model" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/util" @@ -60,8 +61,7 @@ func (s *apiScaffolder) Scaffold() error { machinery.WithResource(&s.resource), ) - var createAPITemplates []machinery.Builder - createAPITemplates = append(createAPITemplates, + if err := scaffold.Execute( &model.Model{ Package: util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())), ClassName: util.ToClassname(s.resource.Kind), @@ -78,11 +78,9 @@ func (s *apiScaffolder) Scaffold() error { Package: util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())), ClassName: util.ToClassname(s.resource.Kind), }, - &templates.Makefile{ - Image: "", - KustomizeVersion: "v3.5.4", - }, - ) + ); err != nil { + return fmt.Errorf("error scaffolding APIs: %w", err) + } - return scaffold.Execute(createAPITemplates...) + return nil } diff --git a/pkg/quarkus/v1alpha/scaffolds/init.go b/pkg/quarkus/v1alpha/scaffolds/init.go index 8d9430f..6f22ed1 100644 --- a/pkg/quarkus/v1alpha/scaffolds/init.go +++ b/pkg/quarkus/v1alpha/scaffolds/init.go @@ -79,9 +79,9 @@ func (s *initScaffolder) Scaffold() error { &templates.ApplicationPropertiesFile{ ProjectName: s.config.GetProjectName(), }, - // &templates.Makefile{ - // Image: "", - // KustomizeVersion: "v3.5.4", - // }, + &templates.Makefile{ + Image: "", + KustomizeVersion: "v3.5.4", + }, ) } diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go index 5f728f6..33b0848 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go @@ -22,10 +22,11 @@ import ( var _ machinery.Template = &Makefile{} +const defaultWatchesFile = "Makefile.yaml" + // Makefile scaffolds the Makefile type Makefile struct { machinery.TemplateMixin - machinery.ResourceMixin // Image is controller manager image name Image string @@ -35,12 +36,6 @@ type Makefile struct { // // AnsibleOperatorVersion is the version of the ansible-operator binary downloaded by the Makefile. // AnsibleOperatorVersion string - - // // Package is the source files package - // Package string - - // // Name of the operator used for the main file. - // ClassName string } // SetTemplateDefaults implements machinery.Template @@ -101,17 +96,6 @@ docker-build: ## Build docker image with the manager. docker-push: ## Push docker image with the manager. mvn package -Dquarkus.container-image.push=true -Dquarkus.container-image.image=${IMG} -##@Bundle -bundle-generate: - cat target/kubernetes/*.{{ .Resource.QualifiedGroup }}-{{ .Resource.Version }}.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=memcached-quarkus-operator - operator-sdk bundle validate ./bundle - -bundle-build: - docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) . - -bundle-push: ## Push the bundle image. - docker push $(BUNDLE_IMG) - ##@ Deployment install: ## Install CRDs into the K8s cluster specified in ~/.kube/config. From 9d99a0452344f6ac1faf8345217d08ad555a90fd Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Tue, 24 May 2022 12:11:50 -0700 Subject: [PATCH 07/21] updated and added bundle commands --- pkg/quarkus/v1alpha/api.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 988dafc..1db0794 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -100,10 +100,11 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { } projectName := p.config.GetProjectName() + plurals := p.resource.Plural groupName := p.resource.QualifiedGroup() versionName := p.resource.Version - makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, groupName, versionName, projectName))...) + makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, plurals, groupName, versionName, projectName))...) var mode os.FileMode = 0644 if info, err := fs.FS.Stat(filePath); err == nil { @@ -152,13 +153,16 @@ func (p *createAPISubcommand) InjectResource(res *resource.Resource) error { const ( makefileBundleVarFragment = ` ##@Bundle -bundle-generate: - cat target/kubernetes/*.%[1]s-%[2]s.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=%[3]s +.PHONY: bundle +bundle: ## Generate bundle manifests and metadata, then validate generated files. + cat target/kubernetes/%[1]s.%[2]s-%[3]s.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=%[4]s operator-sdk bundle validate ./bundle -bundle-build: +.PHONY: bundle-build +bundle-build: ## Build the bundle image. docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) . +.PHONY bundle-push bundle-push: ## Push the bundle image. docker push $(BUNDLE_IMG) ` From 484436fef5150b4837d922a9bbbc980011991c12 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Tue, 24 May 2022 12:32:53 -0700 Subject: [PATCH 08/21] updated image tag --- pkg/quarkus/v1alpha/api.go | 14 ++++++++++---- .../scaffolds/internal/templates/makefile.go | 3 --- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 1db0794..58cee94 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -100,11 +100,10 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { } projectName := p.config.GetProjectName() - plurals := p.resource.Plural - groupName := p.resource.QualifiedGroup() - versionName := p.resource.Version - makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, plurals, groupName, versionName, projectName))...) + makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version, projectName))...) + + makefileBytes = append([]byte(fmt.Sprintf(makefileBundleImageFragement, p.config.GetDomain(), projectName)), makefileBytes...) var mode os.FileMode = 0644 if info, err := fs.FS.Stat(filePath); err == nil { @@ -167,3 +166,10 @@ bundle-push: ## Push the bundle image. docker push $(BUNDLE_IMG) ` ) + +const ( + makefileBundleImageFragement = ` +IMAGE_TAG_BASE ?= %[1]s/%[2]s +BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) +` +) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go index 33b0848..a2e191d 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go @@ -64,9 +64,6 @@ func (f *Makefile) SetTemplateDefaults() error { } const makefileTemplate = ` -IMAGE_TAG_BASE ?= example.com/memcached-quarkus-operator -BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) - # Image URL to use all building/pushing image targets IMG ?= {{ .Image }} From 30e8a12d81c4b6a7ba790e4fff9bad280bc63604 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Tue, 24 May 2022 12:37:23 -0700 Subject: [PATCH 09/21] removed comments --- pkg/quarkus/v1alpha/api.go | 8 -------- pkg/quarkus/v1alpha/scaffolds/api.go | 11 ++++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 58cee94..1c24807 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -80,14 +80,6 @@ func (p *createAPISubcommand) Validate() error { } func (p *createAPISubcommand) PostScaffold() error { - // fmt.Printf("Next: define a resource with:$ create api=%s\n", p.resource.QualifiedGroup()) - // fmt.Printf("Next: define a resource with:$ create api=%s\n", p.resource.Version) - // fmt.Printf("Next: define a resource with:$ create api=%s\n", p.config.GetProjectName()) - - // projectName := p.config.GetProjectName() - // groupName := p.resource.QualifiedGroup() - // versionName := p.resource.Version - return nil } diff --git a/pkg/quarkus/v1alpha/scaffolds/api.go b/pkg/quarkus/v1alpha/scaffolds/api.go index 342b6ad..402feeb 100644 --- a/pkg/quarkus/v1alpha/scaffolds/api.go +++ b/pkg/quarkus/v1alpha/scaffolds/api.go @@ -15,8 +15,6 @@ package scaffolds import ( - "fmt" - "sigs.k8s.io/kubebuilder/v3/pkg/config" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" @@ -61,7 +59,8 @@ func (s *apiScaffolder) Scaffold() error { machinery.WithResource(&s.resource), ) - if err := scaffold.Execute( + var createAPITemplates []machinery.Builder + createAPITemplates = append(createAPITemplates, &model.Model{ Package: util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())), ClassName: util.ToClassname(s.resource.Kind), @@ -78,9 +77,7 @@ func (s *apiScaffolder) Scaffold() error { Package: util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())), ClassName: util.ToClassname(s.resource.Kind), }, - ); err != nil { - return fmt.Errorf("error scaffolding APIs: %w", err) - } + ) - return nil + return scaffold.Execute(createAPITemplates...) } From 91a283fa4d42fd1d89f2903b5af822687e92a809 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Tue, 24 May 2022 12:38:09 -0700 Subject: [PATCH 10/21] removed comments --- pkg/quarkus/v1alpha/init.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/quarkus/v1alpha/init.go b/pkg/quarkus/v1alpha/init.go index 691e5b1..de80641 100644 --- a/pkg/quarkus/v1alpha/init.go +++ b/pkg/quarkus/v1alpha/init.go @@ -113,6 +113,7 @@ func (p *initSubcommand) Validate() error { func (p *initSubcommand) PostScaffold() error { // print follow on instructions to better guide the user + fmt.Printf("Next: define a resource with:\n$ %s create api\n", p.commandName) return nil } From aa82175a6954b032dbcc0401b5cac0e51a34948e Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Tue, 24 May 2022 12:38:52 -0700 Subject: [PATCH 11/21] removed comments --- pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go index a2e191d..f6bca30 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/makefile.go @@ -22,8 +22,6 @@ import ( var _ machinery.Template = &Makefile{} -const defaultWatchesFile = "Makefile.yaml" - // Makefile scaffolds the Makefile type Makefile struct { machinery.TemplateMixin From d2a0acdad54ede09cf74ba76dea1a42f091bdf95 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Tue, 24 May 2022 12:40:56 -0700 Subject: [PATCH 12/21] modified projectName if it is emoty according to project path --- pkg/quarkus/v1alpha/api.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 1c24807..0f7c555 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -18,6 +18,8 @@ import ( "errors" "fmt" "os" + "path/filepath" + "strings" "github.com/spf13/afero" "github.com/spf13/pflag" @@ -92,6 +94,13 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { } projectName := p.config.GetProjectName() + if projectName == "" { + dir, err := os.Getwd() + if err != nil { + return fmt.Errorf("error getting current directory: %w", err) + } + projectName = strings.ToLower(filepath.Base(dir)) + } makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version, projectName))...) From d038ebe2c832e7c1ca64315fa21e82d7c8236271 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Wed, 1 Jun 2022 12:07:37 -0700 Subject: [PATCH 13/21] modified code for handling multiple create api commands --- pkg/quarkus/v1alpha/api.go | 98 +++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 18 deletions(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 0f7c555..519d912 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -15,8 +15,10 @@ package v1 import ( + "bufio" "errors" "fmt" + "log" "os" "path/filepath" "strings" @@ -27,6 +29,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/machinery" "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" + "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds" @@ -88,33 +91,39 @@ func (p *createAPISubcommand) PostScaffold() error { func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { scaffolder := scaffolds.NewCreateAPIScaffolder(p.config, *p.resource) - makefileBytes, err := afero.ReadFile(fs.FS, filePath) - if err != nil { - return err - } + var s = fmt.Sprintf(makefileBundleCRDFile, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version) + findOldFilesForReplacement(filePath, "test", "here", s) - projectName := p.config.GetProjectName() - if projectName == "" { - dir, err := os.Getwd() + if !bVal { + makefileBytes, err := afero.ReadFile(fs.FS, filePath) if err != nil { - return fmt.Errorf("error getting current directory: %w", err) + return err } - projectName = strings.ToLower(filepath.Base(dir)) - } - makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version, projectName))...) + projectName := p.config.GetProjectName() + if projectName == "" { + dir, err := os.Getwd() + if err != nil { + return fmt.Errorf("error getting current directory: %w", err) + } + projectName = strings.ToLower(filepath.Base(dir)) + } - makefileBytes = append([]byte(fmt.Sprintf(makefileBundleImageFragement, p.config.GetDomain(), projectName)), makefileBytes...) + makefileBytes = append(makefileBytes, []byte(fmt.Sprintf(makefileBundleVarFragment, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version, projectName))...) - var mode os.FileMode = 0644 - if info, err := fs.FS.Stat(filePath); err == nil { - mode = info.Mode() - } - if err := afero.WriteFile(fs.FS, filePath, makefileBytes, mode); err != nil { - return fmt.Errorf("error updating Makefile: %w", err) + makefileBytes = append([]byte(fmt.Sprintf(makefileBundleImageFragement, p.config.GetDomain(), projectName)), makefileBytes...) + + var mode os.FileMode = 0644 + if info, err := fs.FS.Stat(filePath); err == nil { + mode = info.Mode() + } + if err := afero.WriteFile(fs.FS, filePath, makefileBytes, mode); err != nil { + return fmt.Errorf("error updating Makefile: %w", err) + } } scaffolder.InjectFS(fs) + if err := scaffolder.Scaffold(); err != nil { return err } @@ -150,11 +159,64 @@ func (p *createAPISubcommand) InjectResource(res *resource.Resource) error { return nil } +var bVal bool + +// ReplaceInFile replaces all instances of old with new in the file at path. +func findOldFilesForReplacement(path, old, new, newfile string) error { + + f, err := os.Open(path) + if err != nil { + log.Fatal(err) + } + + // remember to close the file at the end of the program + defer f.Close() + + // read the file line by line using scanner + scanner := bufio.NewScanner(f) + + for scanner.Scan() { + // do something with a line + if scanner.Text() == "## marker" { + bVal = true + break + } + } + + if bVal { + scanner.Scan() + line := scanner.Text() + + splitByPipe := strings.Split(line, "|") + + finalString := strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(splitByPipe[0]), "cat"), "target/kubernetes/kubernetes.yml") + + merge := "cat" + finalString + newfile + " target/kubernetes/kubernetes.yml" + " |" + splitByPipe[1] + // fmt.Printf("merge : %s\n", merge) + + err = util.ReplaceInFile(path, line, merge) + if err != nil { + return err + } + } + + if err := scanner.Err(); err != nil { + return errors.New("unable to find the content to be replaced") + } + return nil +} + +const ( + makefileBundleCRDFile = `target/kubernetes/%[1]s.%[2]s-%[3]s.yml` +) + +//target/kubernetes/%[1]s.%[2]s-%[3]s.yml target/kubernetes/kubernetes.yml const ( makefileBundleVarFragment = ` ##@Bundle .PHONY: bundle bundle: ## Generate bundle manifests and metadata, then validate generated files. +## marker cat target/kubernetes/%[1]s.%[2]s-%[3]s.yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version 0.1.1 --default-channel=stable --channels=stable --package=%[4]s operator-sdk bundle validate ./bundle From 078ea6dfffce66ee0e6333175997b808d93d4746 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Wed, 1 Jun 2022 12:19:44 -0700 Subject: [PATCH 14/21] modified code for handling multiple create api commands --- pkg/quarkus/v1alpha/api.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 519d912..92b7c53 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -37,6 +37,8 @@ import ( const filePath = "Makefile" +var bVal bool + type createAPIOptions struct { CRDVersion string Namespaced bool @@ -92,7 +94,7 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { scaffolder := scaffolds.NewCreateAPIScaffolder(p.config, *p.resource) var s = fmt.Sprintf(makefileBundleCRDFile, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version) - findOldFilesForReplacement(filePath, "test", "here", s) + findOldFilesForReplacement(filePath, s) if !bVal { makefileBytes, err := afero.ReadFile(fs.FS, filePath) @@ -159,10 +161,8 @@ func (p *createAPISubcommand) InjectResource(res *resource.Resource) error { return nil } -var bVal bool - -// ReplaceInFile replaces all instances of old with new in the file at path. -func findOldFilesForReplacement(path, old, new, newfile string) error { +// findOldFilesForReplacement verifies marker (## marker) and if it found then merge new api CRD file to the odler logic +func findOldFilesForReplacement(path, newfile string) error { f, err := os.Open(path) if err != nil { @@ -194,6 +194,7 @@ func findOldFilesForReplacement(path, old, new, newfile string) error { merge := "cat" + finalString + newfile + " target/kubernetes/kubernetes.yml" + " |" + splitByPipe[1] // fmt.Printf("merge : %s\n", merge) + // ReplaceInFile replaces all instances of old with new in the file at path. err = util.ReplaceInFile(path, line, merge) if err != nil { return err From 276d8aa33797e244e7eeb89a77a4ff6ac0ed62a4 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Wed, 1 Jun 2022 12:21:20 -0700 Subject: [PATCH 15/21] removed comments --- pkg/quarkus/v1alpha/api.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 92b7c53..36e6572 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -211,7 +211,6 @@ const ( makefileBundleCRDFile = `target/kubernetes/%[1]s.%[2]s-%[3]s.yml` ) -//target/kubernetes/%[1]s.%[2]s-%[3]s.yml target/kubernetes/kubernetes.yml const ( makefileBundleVarFragment = ` ##@Bundle From c1c01df2e2c3a7ac5fe7d86845ad63182075f73b Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Wed, 1 Jun 2022 14:21:18 -0700 Subject: [PATCH 16/21] resolved some minor changes --- pkg/quarkus/v1alpha/api.go | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 36e6572..2a77f32 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -37,8 +37,6 @@ import ( const filePath = "Makefile" -var bVal bool - type createAPIOptions struct { CRDVersion string Namespaced bool @@ -94,9 +92,9 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error { scaffolder := scaffolds.NewCreateAPIScaffolder(p.config, *p.resource) var s = fmt.Sprintf(makefileBundleCRDFile, p.resource.Plural, p.resource.QualifiedGroup(), p.resource.Version) - findOldFilesForReplacement(filePath, s) + foundLine := findOldFilesForReplacement(filePath, s) - if !bVal { + if !foundLine { makefileBytes, err := afero.ReadFile(fs.FS, filePath) if err != nil { return err @@ -162,7 +160,7 @@ func (p *createAPISubcommand) InjectResource(res *resource.Resource) error { } // findOldFilesForReplacement verifies marker (## marker) and if it found then merge new api CRD file to the odler logic -func findOldFilesForReplacement(path, newfile string) error { +func findOldFilesForReplacement(path, newfile string) bool { f, err := os.Open(path) if err != nil { @@ -174,37 +172,40 @@ func findOldFilesForReplacement(path, newfile string) error { // read the file line by line using scanner scanner := bufio.NewScanner(f) - + var foundMarker bool for scanner.Scan() { // do something with a line if scanner.Text() == "## marker" { - bVal = true + foundMarker = true break } } - if bVal { + if foundMarker { scanner.Scan() - line := scanner.Text() + catLine := scanner.Text() - splitByPipe := strings.Split(line, "|") + splitByPipe := strings.Split(catLine, "|") finalString := strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(splitByPipe[0]), "cat"), "target/kubernetes/kubernetes.yml") - merge := "cat" + finalString + newfile + " target/kubernetes/kubernetes.yml" + " |" + splitByPipe[1] + updatedLine := "cat" + finalString + newfile + " target/kubernetes/kubernetes.yml" + " |" + splitByPipe[1] // fmt.Printf("merge : %s\n", merge) + if err := scanner.Err(); err != nil { + log.Fatal(err, "Failed to scan the line from Makefile") + return false + } + // ReplaceInFile replaces all instances of old with new in the file at path. - err = util.ReplaceInFile(path, line, merge) + err = util.ReplaceInFile(path, catLine, updatedLine) if err != nil { - return err + log.Fatal(err, "Failed to Replace in Makefile") + return false } } - if err := scanner.Err(); err != nil { - return errors.New("unable to find the content to be replaced") - } - return nil + return foundMarker } const ( From 9f3c96e34e64bf64c581f6c296050d68a3972e64 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Wed, 1 Jun 2022 14:45:50 -0700 Subject: [PATCH 17/21] uodate space --- pkg/quarkus/v1alpha/api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 2a77f32..5f3e859 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -189,7 +189,7 @@ func findOldFilesForReplacement(path, newfile string) bool { finalString := strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(splitByPipe[0]), "cat"), "target/kubernetes/kubernetes.yml") - updatedLine := "cat" + finalString + newfile + " target/kubernetes/kubernetes.yml" + " |" + splitByPipe[1] + updatedLine := " " + "cat" + finalString + newfile + " target/kubernetes/kubernetes.yml" + " |" + splitByPipe[1] // fmt.Printf("merge : %s\n", merge) if err := scanner.Err(); err != nil { From 5048145fe10c6a6ef52119860dbad3c81bba4ba9 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Wed, 1 Jun 2022 21:06:48 -0700 Subject: [PATCH 18/21] modified minor changes --- pkg/quarkus/v1alpha/api.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 5f3e859..e867cb8 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -225,7 +225,7 @@ bundle: ## Generate bundle manifests and metadata, then validate generated file bundle-build: ## Build the bundle image. docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) . -.PHONY bundle-push +.PHONY: bundle-push bundle-push: ## Push the bundle image. docker push $(BUNDLE_IMG) ` @@ -233,6 +233,7 @@ bundle-push: ## Push the bundle image. const ( makefileBundleImageFragement = ` +VERSION ?= 0.0.1 IMAGE_TAG_BASE ?= %[1]s/%[2]s BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) ` From 28a3ba68ea8b0734145f3b8788b437298973d6b4 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Thu, 2 Jun 2022 08:11:54 -0700 Subject: [PATCH 19/21] added logs for plugin Makefile --- go.mod | 3 ++- go.sum | 1 + pkg/quarkus/v1alpha/api.go | 12 +++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3a229a1..2f9a411 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,8 @@ require ( github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/gobuffalo/flect v0.2.3 // indirect github.com/nxadm/tail v1.4.8 // indirect - github.com/spf13/afero v1.6.0 // indirect + github.com/sirupsen/logrus v1.8.1 + github.com/spf13/afero v1.6.0 golang.org/x/mod v0.4.2 // indirect golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect diff --git a/go.sum b/go.sum index 7968f4b..3cb0b10 100644 --- a/go.sum +++ b/go.sum @@ -445,6 +445,7 @@ github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index e867cb8..5b196a2 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -18,25 +18,27 @@ import ( "bufio" "errors" "fmt" - "log" "os" "path/filepath" "strings" + "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds" + log "github.com/sirupsen/logrus" "github.com/spf13/afero" "github.com/spf13/pflag" + "sigs.k8s.io/kubebuilder/v3/pkg/config" "sigs.k8s.io/kubebuilder/v3/pkg/machinery" "sigs.k8s.io/kubebuilder/v3/pkg/model/resource" "sigs.k8s.io/kubebuilder/v3/pkg/plugin" "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util" - - "github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds" ) const filePath = "Makefile" +// var log = logf.Log.WithName("proxy") + type createAPIOptions struct { CRDVersion string Namespaced bool @@ -193,14 +195,14 @@ func findOldFilesForReplacement(path, newfile string) bool { // fmt.Printf("merge : %s\n", merge) if err := scanner.Err(); err != nil { - log.Fatal(err, "Failed to scan the line from Makefile") + log.Error(err, "Unable to scan existing bundle target command from the Makefile. New bundle target command being created. This may overwrite any existing commands.") return false } // ReplaceInFile replaces all instances of old with new in the file at path. err = util.ReplaceInFile(path, catLine, updatedLine) if err != nil { - log.Fatal(err, "Failed to Replace in Makefile") + log.Error(err, "Unable to replace existing bundle target command from the Makefile. New bundle target command being created. This may overwrite any existing commands.") return false } } From ebbab67803d878ac0fd3943f8eed1bed7ce95354 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Thu, 2 Jun 2022 08:16:27 -0700 Subject: [PATCH 20/21] remove comments from plugin Makefile --- pkg/quarkus/v1alpha/api.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 5b196a2..0653c01 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -192,7 +192,6 @@ func findOldFilesForReplacement(path, newfile string) bool { finalString := strings.TrimSuffix(strings.TrimPrefix(strings.TrimSpace(splitByPipe[0]), "cat"), "target/kubernetes/kubernetes.yml") updatedLine := " " + "cat" + finalString + newfile + " target/kubernetes/kubernetes.yml" + " |" + splitByPipe[1] - // fmt.Printf("merge : %s\n", merge) if err := scanner.Err(); err != nil { log.Error(err, "Unable to scan existing bundle target command from the Makefile. New bundle target command being created. This may overwrite any existing commands.") From 1e55597c8db8add5e229a0909b9d9107614e44e3 Mon Sep 17 00:00:00 2001 From: laxmikantbpandhare Date: Thu, 2 Jun 2022 08:22:11 -0700 Subject: [PATCH 21/21] remove comments from plugin Makefile --- pkg/quarkus/v1alpha/api.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/quarkus/v1alpha/api.go b/pkg/quarkus/v1alpha/api.go index 0653c01..665b05d 100644 --- a/pkg/quarkus/v1alpha/api.go +++ b/pkg/quarkus/v1alpha/api.go @@ -37,8 +37,6 @@ import ( const filePath = "Makefile" -// var log = logf.Log.WithName("proxy") - type createAPIOptions struct { CRDVersion string Namespaced bool