Merge pull request #5865 from abhi-kn/channel-crd

added service to fetch knative channel crds
openshift · Jul 7, 2020 · 9bf0541 · 9bf0541
2 parents 31f4ded + d3987a3
commit 9bf0541
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 0 deletions.
diff --git a/cmd/bridge/main.go b/cmd/bridge/main.go
@@ -574,6 +574,24 @@ func main() {
 		knative.EventSourceFilter,
 	)
 
+	srv.KnativeChannelCRDLister = server.NewResourceLister(
+		resourceListerToken,
+		&url.URL{
+			Scheme: k8sEndpoint.Scheme,
+			Host:   k8sEndpoint.Host,
+			Path:   "/apis/apiextensions.k8s.io/v1/customresourcedefinitions",
+			RawQuery: url.Values{
+				"labelSelector": {"duck.knative.dev/addressable=true,messaging.knative.dev/subscribable=true"},
+			}.Encode(),
+		},
+		&http.Client{
+			Transport: &http.Transport{
+				TLSClientConfig: srv.K8sProxyConfig.TLSClientConfig,
+			},
+		},
+		knative.ChannelFilter,
+	)
+
 	listenURL := bridge.ValidateFlagIsURL("listen", *fListen)
 	switch listenURL.Scheme {
 	case "http":

diff --git a/pkg/knative/types.go b/pkg/knative/types.go
@@ -40,3 +40,6 @@ type EventSourceList struct {
 	// items list individual EventSourceDefinition objects
 	Items []EventSourceDefinition `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
+
+// ChannelList is a list of CRD per Channel
+type ChannelList = EventSourceList
diff --git a/pkg/knative/utils.go b/pkg/knative/utils.go
@@ -26,3 +26,18 @@ func EventSourceFilter(w http.ResponseWriter, r *http.Response) {
 		serverutils.SendResponse(w, http.StatusInternalServerError, serverutils.ApiError{Err: err.Error()})
 	}
 }
+
+// ChannelFilter shall filter partial metadata from knative channel CRDs before propagating
+func ChannelFilter(w http.ResponseWriter, r *http.Response) {
+	var channelList ChannelList
+
+	if err := json.NewDecoder(r.Body).Decode(&channelList); err != nil {
+		plog.Errorf("Channel CRD response deserialization failed: %s", err)
+		serverutils.SendResponse(w, http.StatusInternalServerError, serverutils.ApiError{Err: err.Error()})
+	}
+
+	if err := json.NewEncoder(w).Encode(channelList); err != nil {
+		plog.Errorf("Channel CRD response serialization failed: %s", err)
+		serverutils.SendResponse(w, http.StatusInternalServerError, serverutils.ApiError{Err: err.Error()})
+	}
+}
diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -113,6 +113,7 @@ type Server struct {
 	// A lister for resource listing of a particular kind
 	MonitoringDashboardConfigMapLister ResourceLister
 	KnativeEventSourceCRDLister        ResourceLister
+	KnativeChannelCRDLister            ResourceLister
 	HelmChartRepoProxyConfig           *proxy.Config
 	GOARCH                             string
 	GOOS                               string
@@ -352,6 +353,7 @@ func (s *Server) HTTPHandler() http.Handler {
 
 	handle("/api/console/monitoring-dashboard-config", authHandler(s.handleMonitoringDashboardConfigmaps))
 	handle("/api/console/knative-event-sources", authHandler(s.handleKnativeEventSourceCRDs))
+	handle("/api/console/knative-channels", authHandler(s.handleKnativeChannelCRDs))
 	handle("/api/console/version", authHandler(s.versionHandler))
 
 	// Helm Endpoints
@@ -399,6 +401,10 @@ func (s *Server) handleKnativeEventSourceCRDs(w http.ResponseWriter, r *http.Req
 	s.KnativeEventSourceCRDLister.HandleResources(w, r)
 }
 
+func (s *Server) handleKnativeChannelCRDs(w http.ResponseWriter, r *http.Request) {
+	s.KnativeChannelCRDLister.HandleResources(w, r)
+}
+
 func (s *Server) indexHandler(w http.ResponseWriter, r *http.Request) {
 	jsg := &jsGlobals{
 		ConsoleVersion:        version.Version,