Skip to content

various fixes to scaffold templates #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbarbian-sap merged 1 commit into from
Jul 24, 2026
Merged

various fixes to scaffold templates #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scaffold/templates/examples/sample.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: {{ .groupName }}/{{ .groupVersion }}
kind: {{ .kind }}
metadata:
name: {{ .operatorName | splitList "." | first | trimSuffix "-cop" }}
name: sample
1 change: 0 additions & 1 deletion scaffold/templates/go.mod.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ require (
{{- else }}
github.com/sap/component-operator-runtime {{ .version }}
{{- end }}
k8s.io/apiextensions-apiserver {{ .kubernetesVersion }}
k8s.io/apimachinery {{ .kubernetesVersion }}
k8s.io/client-go {{ .kubernetesVersion }}
k8s.io/code-generator {{ .codeGeneratorVersion }}
Expand Down
4 changes: 1 addition & 3 deletions scaffold/templates/main.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ import (
"strconv"
{{- end }}

apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime"
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/healthz"
Expand Down Expand Up @@ -123,7 +121,7 @@ func main() {
Scheme: scheme,
Client: client.Options{
Cache: &client.CacheOptions{
DisableFor: append(operator.GetUncacheableTypes(), &apiextensionsv1.CustomResourceDefinition{}, &apiregistrationv1.APIService{}),
DisableFor: operator.GetUncacheableTypes(),
},
},
LeaderElection: enableLeaderElection,
Expand Down
6 changes: 3 additions & 3 deletions scaffold/templates/pkg/operator/operator.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ package operator

import (
"flag"
"fmt"

legacyerrors "github.com/pkg/errors"
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
Expand Down Expand Up @@ -114,15 +114,15 @@ func (o *Operator) Setup(mgr ctrl.Manager) error {
// Replace this by a real resource generator (e.g. HelmGenerator or KustomizeGenerator, or your own one).
resourceGenerator, err := manifests.NewDummyGenerator()
if err != nil {
return legacyerrors.Wrap(err, "error initializing resource generator")
return fmt.Errorf("error initializing resource generator: %w", err)
}

if err := component.NewReconciler[*operator{{ .groupVersion }}.{{ .kind }}](
o.options.Name,
resourceGenerator,
component.ReconcilerOptions{},
).SetupWithManager(mgr); err != nil {
return legacyerrors.Wrapf(err, "unable to create controller")
return fmt.Errorf("unable to create controller: %w", err)
}

{{- if or .validatingWebhookEnabled .mutatingWebhookEnabled }}
Expand Down