From fc7b5676c22d77a79f8c0e3bbbf62e6b98fbe595 Mon Sep 17 00:00:00 2001 From: Antonin Stefanutti Date: Mon, 31 Jul 2023 17:39:30 +0200 Subject: [PATCH 1/2] Fix: add missing --output-base option to applyconfiguration-gen --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a4f47970e..c6115a28e 100644 --- a/Makefile +++ b/Makefile @@ -183,6 +183,7 @@ generate-client-files: code-generator --input-dirs="github.com/project-codeflare/codeflare-operator/api/codeflare/v1alpha1" \ --go-header-file="hack/boilerplate.go.txt" \ --output-package="github.com/project-codeflare/codeflare-operator/client/applyconfiguration" \ + --output-base="." \ --trim-path-prefix "github.com/project-codeflare/codeflare-operator" $(CLIENT_GEN) \ --input="codeflare/v1alpha1" \ From d1931d3c15ef83aac5ee52f5dced79f61e93852b Mon Sep 17 00:00:00 2001 From: Antonin Stefanutti Date: Mon, 31 Jul 2023 17:40:30 +0200 Subject: [PATCH 2/2] client: Add missing ControllerImage field to apply configuration --- client/applyconfiguration/codeflare/v1alpha1/mcadspec.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/client/applyconfiguration/codeflare/v1alpha1/mcadspec.go b/client/applyconfiguration/codeflare/v1alpha1/mcadspec.go index c7cb170a5..9358586be 100644 --- a/client/applyconfiguration/codeflare/v1alpha1/mcadspec.go +++ b/client/applyconfiguration/codeflare/v1alpha1/mcadspec.go @@ -33,6 +33,7 @@ type MCADSpecApplyConfiguration struct { QuotaRestURL *string `json:"quotaRestURL,omitempty"` PodCreationTimeout *int `json:"podCreationTimeout,omitempty"` ControllerResources *v1.ResourceRequirements `json:"controllerResources,omitempty"` + ControllerImage *string `json:"controllerImage,omitempty"` } // MCADSpecApplyConfiguration constructs an declarative configuration of the MCADSpec type for use with @@ -104,3 +105,11 @@ func (b *MCADSpecApplyConfiguration) WithControllerResources(value v1.ResourceRe b.ControllerResources = &value return b } + +// WithControllerImage sets the ControllerImage field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the ControllerImage field is set to the value of the last call. +func (b *MCADSpecApplyConfiguration) WithControllerImage(value string) *MCADSpecApplyConfiguration { + b.ControllerImage = &value + return b +}