Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.

Commit 5abc30d

Browse files
committed
Feedback
1 parent 0f71f1e commit 5abc30d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pkg/controller/nginxingresscontroller/crds.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func kicCRDs() ([]*v1beta1.CustomResourceDefinition, error) {
3939
return nil, fmt.Errorf("failed to open the CRD manifest %v: %v", path, err)
4040
}
4141

42-
var crd *v1beta1.CustomResourceDefinition
42+
var crd v1beta1.CustomResourceDefinition
4343

4444
err = yaml.NewYAMLOrJSONDecoder(f, decoderBufferSize).Decode(&crd)
4545

@@ -52,7 +52,7 @@ func kicCRDs() ([]*v1beta1.CustomResourceDefinition, error) {
5252
return nil, fmt.Errorf("failed to close the CRD manifest %v: %v", path, err)
5353
}
5454

55-
crds = append(crds, crd)
55+
crds = append(crds, &crd)
5656
}
5757

5858
return crds, nil

pkg/controller/nginxingresscontroller/nginxingresscontroller_controller.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,18 @@ func isLocal() bool {
6666
func createKICCustomResourceDefinitions(mgr manager.Manager) error {
6767
reqLogger := log.WithValues("Request.Namespace", "", "Request.Name", "nginxingresscontroller-controller")
6868

69+
if isLocal() {
70+
reqLogger.Info("Skipping KIC CRDs creation; not running in a cluster")
71+
return nil
72+
}
73+
6974
// Create CRDs with a different client (apiextensions)
7075
apixClient, err := apixv1beta1client.NewForConfig(mgr.GetConfig())
7176
if err != nil {
7277
reqLogger.Error(err, "unable to create client for CRD registration")
7378
return err
7479
}
7580

76-
if isLocal() {
77-
reqLogger.Info("Skipping KIC CRDs creation; not running in a cluster")
78-
return nil
79-
}
80-
8181
crds, err := kicCRDs()
8282

8383
if err != nil {

0 commit comments

Comments
 (0)