Skip to content

Commit a2470e0

Browse files
committed
Fixing tests
Signed-off-by: Neo2308 <[email protected]>
1 parent b41d425 commit a2470e0

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

Diff for: internal/cmd/operator-sdk/generate/internal/genutil.go

+3-13
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2929
apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
3030
"sigs.k8s.io/controller-runtime/pkg/client"
31-
cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3"
3231
"sigs.k8s.io/yaml"
3332
)
3433

@@ -182,18 +181,9 @@ func GetPackageNameAndLayout(defaultPackageName string) (packageName string, lay
182181
return "", "", err
183182
}
184183
if packageName == "" {
185-
switch {
186-
case cfg.GetVersion().Compare(cfgv3.Version) == 0:
187-
wd, err := os.Getwd()
188-
if err != nil {
189-
return "", "", err
190-
}
191-
packageName = strings.ToLower(filepath.Base(wd))
192-
default:
193-
packageName = cfg.GetProjectName()
194-
if packageName == "" {
195-
return "", "", errors.New("--package <name> must be set if \"projectName\" is not set in the PROJECT config file")
196-
}
184+
packageName = cfg.GetProjectName()
185+
if packageName == "" {
186+
return "", "", errors.New("--package <name> must be set if \"projectName\" is not set in the PROJECT config file")
197187
}
198188
}
199189
layout = projutil.GetProjectLayout(cfg)

Diff for: internal/cmd/operator-sdk/generate/kustomize/manifests.go

-6
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"k8s.io/apimachinery/pkg/runtime/schema"
3131
"k8s.io/apimachinery/pkg/util/validation"
3232
"sigs.k8s.io/kubebuilder/v4/pkg/config"
33-
cfgv3 "sigs.k8s.io/kubebuilder/v4/pkg/config/v3"
3433
"sigs.k8s.io/kubebuilder/v4/pkg/machinery"
3534
"sigs.k8s.io/yaml"
3635

@@ -257,11 +256,6 @@ func getGVKs(cfg config.Config) ([]schema.GroupVersionKind, error) {
257256
}
258257
gvks := make([]schema.GroupVersionKind, len(resources))
259258
for i, gvk := range resources {
260-
// check if the resource has an specific domain
261-
// otherwise use the config.Domain.
262-
if cfg.GetVersion().Compare(cfgv3.Version) == 0 {
263-
gvk.Domain = cfg.GetDomain()
264-
}
265259
gvks[i].Group = gvk.QualifiedGroup()
266260
gvks[i].Version = gvk.Version
267261
gvks[i].Kind = gvk.Kind

0 commit comments

Comments
 (0)