address review

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/kong/deck v1.18.1
 	github.com/kong/go-kong v0.38.0
-	github.com/kong/kubernetes-telemetry v0.0.0-20230214134628-61a122724c2b
+	github.com/kong/kubernetes-telemetry v0.0.1
 	github.com/kong/kubernetes-testing-framework v0.29.0
 	github.com/lithammer/dedent v1.1.0
 	github.com/miekg/dns v1.1.50

go.sum

@@ -587,8 +587,8 @@ github.com/kong/deck v1.18.1 h1:ApY1RA1Qk68hgdraRaxJbRbLAJz4iIuI+QSjwCFFxTU=
 github.com/kong/deck v1.18.1/go.mod h1:cHU6K+Z4DmTqVr0dYFZHZKiizVe0cXI3c5HT2itAzL8=
 github.com/kong/go-kong v0.38.0 h1:FEsFuowZbTGnONQXmylqDAp8zvnS/EwP4Bu1vLT+dC4=
 github.com/kong/go-kong v0.38.0/go.mod h1:4xT4uMMGcysH3qOqm458JyIbDBUw8MVAQIi+DP8ggtc=
-github.com/kong/kubernetes-telemetry v0.0.0-20230214134628-61a122724c2b h1:x0e8kBAnWPgj0IAllJ+0GA3UaG11w/FeO97qgHjur0A=
-github.com/kong/kubernetes-telemetry v0.0.0-20230214134628-61a122724c2b/go.mod h1:Xx/nvVhDK6+uy/wTG4YMyt+KGwuCRMQEUnw15XoUgtU=
+github.com/kong/kubernetes-telemetry v0.0.1 h1:ZX91j+/KzxMJdcO3WGht/CJ+FpSZIhpSYcP20lLjBCY=
+github.com/kong/kubernetes-telemetry v0.0.1/go.mod h1:Xx/nvVhDK6+uy/wTG4YMyt+KGwuCRMQEUnw15XoUgtU=
 github.com/kong/kubernetes-testing-framework v0.29.0 h1:EbU+EHn9ha1GjNeJytmzLeMgxSiTHpMsgg/KPf0r5pw=
 github.com/kong/kubernetes-testing-framework v0.29.0/go.mod h1:WwIbJTTB0aPEmYGV5MudEqOQ9lz9GqYT6ZS5U+vxaf4=
 github.com/kong/semver/v4 v4.0.1 h1:DIcNR8W3gfx0KabFBADPalxxsp+q/5COwIFkkhrFQ2Y=

internal/manager/telemetry/manager.go

@@ -163,7 +163,6 @@ func createManager(
 	return m, nil
 }
 
-// feature-gateway=false;feature-combinedroutes=false.
 func featureGatesToTelemetryPayload(featureGates map[string]bool) types.ProviderReport {
 	report := make(types.ProviderReport)
 	for k, v := range featureGates {
@@ -172,35 +171,3 @@ func featureGatesToTelemetryPayload(featureGates map[string]bool) types.Provider
 	}
 	return report
 }
-
-// signal=kic-ping
-// feature-combinedroutes=true
-// feature-gateway=true
-// feature-gatewayalpha=true
-// feature-knative=false
-//
-// hn=P-Maek-MBP
-// uptime=3
-// v=NOT_SET
-// k8s_arch=linux/arm64
-// k8s_provider=kind
-// k8sv=v1.26.0
-// k8sv_semver=v1.26.0
-// k8s_gateways_count=0
-// k8s_nodes_count=1
-// k8s_pods_count=14
-// k8s_services_count=6;
-
-// signal=kic-ping
-// uptime=3600
-// v=2.8.0
-// k8sv=v1.24.8
-// kv=2.8.3
-// db=off
-// id=4ef7d6df-553e-4c02-be63-e9e4f3a83014
-// hn=ingress-kong-8479884f54-pmfvw
-//
-// feature-knative=false
-// feature-gateway=true
-// feature-gatewayalpha=false
-// feature-combinedroutes=true;;;mdist="all113"

internal/manager/telemetry/manager_test.go

@@ -15,10 +15,12 @@ import (
 	"github.com/kong/kubernetes-telemetry/pkg/types"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	apitypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/version"
+
 	fakediscovery "k8s.io/client-go/discovery/fake"
 	testdynclient "k8s.io/client-go/dynamic/fake"
 	testk8sclient "k8s.io/client-go/kubernetes/fake"
@@ -134,8 +136,9 @@ func TestCreateManager(t *testing.T) {
 func prepareScheme(t *testing.T) *runtime.Scheme {
 	scheme := runtime.NewScheme()
 	require.NoError(t, testk8sclient.AddToScheme(scheme))
-	// This doesn't work :(
-	// https://kubernetes.slack.com/archives/C0EG7JC6T/p1676125039126589
+	// Note: this has no effect on the object listing because pluralising gateways
+	// does not work.
+	// Ref: https://github.com/kubernetes/kubernetes/pull/110053
 	require.NoError(t, gatewayv1beta1.Install(scheme))
 	return scheme
 }
@@ -202,7 +205,6 @@ func prepareObjects(pod apitypes.NamespacedName) []runtime.Object {
 				},
 			},
 		},
-		// &gatewayv1beta1.Gateway{},
 
 		setRandomUUIDName(&corev1.Node{}),
 		setRandomUUIDName(&corev1.Node{}),