fix: Creation of ingress resource with k8s trigger (#1434)

* fix: Creation of ingress resource with k8s trigger Signed-off-by: Daniel Soifer <daniel.soifer@codefresh.io> * used plural namer lib Signed-off-by: Daniel Soifer <daniel.soifer@codefresh.io> * added another test Signed-off-by: Daniel Soifer <daniel.soifer@codefresh.io> * codegen Signed-off-by: Daniel Soifer <daniel.soifer@codefresh.io>
argoproj · Nov 18, 2021 · 7ad6027 · 7ad6027
1 parent 5c50e1b
commit 7ad6027
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -71,7 +71,7 @@ require (
 	k8s.io/apimachinery v0.21.1
 	k8s.io/client-go v0.21.1
 	k8s.io/code-generator v0.20.4
-	k8s.io/gengo v0.0.0-20201113003025-83324d819ded
+	k8s.io/gengo v0.0.0-20211115164449-b448ea381d54
 	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
 	sigs.k8s.io/controller-runtime v0.7.0
 	sigs.k8s.io/controller-tools v0.6.0

diff --git a/go.sum b/go.sum
@@ -1495,8 +1495,9 @@ k8s.io/component-base v0.20.4 h1:gdvPs4G11e99meQnW4zN+oYOjH8qkLz1sURrAzvKWqc=
 k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE=
 k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/gengo v0.0.0-20211115164449-b448ea381d54 h1:LTfmarWsAxo+qlLq6d4FunAM9ZQSq8i6QI+/btzVk+U=
+k8s.io/gengo v0.0.0-20211115164449-b448ea381d54/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

diff --git a/sensors/triggers/triggers.go b/sensors/triggers/triggers.go
@@ -17,18 +17,23 @@ limitations under the License.
 package triggers
 
 import (
-	"fmt"
-	"strings"
-
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/gengo/namer"
+	"k8s.io/gengo/types"
 )
 
 func GetGroupVersionResource(obj *unstructured.Unstructured) schema.GroupVersionResource {
 	gvk := obj.GroupVersionKind()
+	resource := namer.NewAllLowercasePluralNamer(nil).Name(&types.Type{
+		Name: types.Name{
+			Name: gvk.Kind,
+		},
+	})
+
 	return schema.GroupVersionResource{
 		Group:    gvk.Group,
 		Version:  gvk.Version,
-		Resource: fmt.Sprintf("%ss", strings.ToLower(gvk.Kind)),
+		Resource: resource,
 	}
 }
diff --git a/sensors/triggers/triggers_test.go b/sensors/triggers/triggers_test.go
@@ -25,12 +25,19 @@ import (
 )
 
 func TestGetGroupVersionResource(t *testing.T) {
-	deployment := newUnstructured("apps/v1", "Deployment", "fake", "test")
-	expectedGVR := schema.GroupVersionResource{
+	deployment := newUnstructured("apps/v1", "Deployment", "fake", "test-deployment")
+	expectedDeploymentGVR := schema.GroupVersionResource{
 		Group:    "apps",
 		Version:  "v1",
 		Resource: "deployments",
 	}
-	result := GetGroupVersionResource(deployment)
-	assert.Equal(t, expectedGVR, result)
+	assert.Equal(t, expectedDeploymentGVR, GetGroupVersionResource(deployment))
+
+	ingress := newUnstructured("networking.k8s.io/v1", "Ingress", "fake", "test-ingress")
+	expectedIngressGVR := schema.GroupVersionResource{
+		Group:    "networking.k8s.io",
+		Version:  "v1",
+		Resource: "ingresses",
+	}
+	assert.Equal(t, expectedIngressGVR, GetGroupVersionResource(ingress))
 }