chore: update build process

ZEISS · Nov 28, 2024 · e4969d2 · e4969d2
1 parent f93d725
commit e4969d2
Show file tree

Hide file tree

Showing 134 changed files with 1,122 additions and 10,279 deletions.
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -13,7 +13,6 @@ import (
 	"github.com/zeiss/typhoon/pkg/flow/reconciler/transformation"
 	"github.com/zeiss/typhoon/pkg/flow/reconciler/xmltojsontransformation"
 	"github.com/zeiss/typhoon/pkg/flow/reconciler/xslttransformation"
-	"github.com/zeiss/typhoon/pkg/routing/reconciler/filter"
 	"github.com/zeiss/typhoon/pkg/routing/reconciler/splitter"
 	"github.com/zeiss/typhoon/pkg/sources/reconciler/azservicebusqueuesource"
 	"github.com/zeiss/typhoon/pkg/sources/reconciler/azservicebussource"
@@ -61,7 +60,6 @@ func main() {
 		// extensions
 		function.NewController,
 		// routing
-		filter.NewController,
 		splitter.NewController,
 	)
 }
diff --git a/config/200-clusterroles.yaml b/config/200-clusterroles.yaml
@@ -225,9 +225,6 @@ rules:
   # Only multi-tenant components receive permissions via RoleBindings to
   # interact with the Kubernetes API.
   resourceNames:
-  - awssnssource-adapter
-  - zendesksource-adapter
-  - filter-adapter
   - splitter-adapter
   verbs:
   - update
@@ -421,48 +418,6 @@ rules:
 
 ---
 
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: filter-adapter
-  labels:
-    app.kubernetes.io/part-of: typhoon
-rules:
-- apiGroups:
-  - ''
-  resources:
-  - events
-  verbs:
-  - create
-  - patch
-  - update
-- apiGroups:
-  - ''
-  resources:
-  - configmaps
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - routing.typhoon.zeiss.com
-  resources:
-  - filters
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - get
-  - create
-  - update
-
----
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

diff --git a/config/202-clusterrolebindings.yaml b/config/202-clusterrolebindings.yaml
@@ -54,21 +54,6 @@ roleRef:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
-metadata:
-  name: filter-adapter
-  labels:
-    app.kubernetes.io/part-of: typhoon
-subjects:
-- kind: ServiceAccount
-  name: typhoon-controller
-  namespace: typhoon
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: filter-adapter
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
 metadata:
   name: splitter-adapter
   labels:

diff --git a/config/500-controller.yaml b/config/500-controller.yaml
@@ -77,8 +77,6 @@ spec:
         - name: XMLTOJSONTRANSFORMATION_IMAGE
           value: ko://github.com/zeiss/typhoon/cmd/xmltojsontransformation-adapter
         # Routing adapters
-        - name: FILTER_IMAGE
-          value: ko://github.com/zeiss/typhoon/cmd/filter-adapter
         - name: SPLITTER_IMAGE
           value: ko://github.com/zeiss/typhoon/cmd/splitter-adapter
         # Custom build adapters

diff --git a/hack/inc.codegen.mk b/hack/inc.codegen.mk
@@ -27,43 +27,40 @@ deepcopy:
 	@echo "+ Generating deepcopy funcs for $(API_GROUPS)"
 	$(GO_RUN_TOOLS) k8s.io/code-generator/cmd/deepcopy-gen \
 		--go-header-file hack/copyright.go.txt \
-		--input-dirs $(subst $(space),$(comma),$(api-import-paths)) \
-		--trim-path-prefix $(PKG)/ \
-		--output-base . \
-		--output-file-base zz_generated.deepcopy
+		--output-file zz_generated.deepcopy.go \
+		$(find_dirs_containing_comment_tags "+k8s:deepcopy-gen=")
 
 client:
 	@echo "+ Generating clientsets for $(API_GROUPS)"
 	@rm -rf pkg/client/generated/clientset
-	$(GO_RUN_TOOLS) k8s.io/code-generator/cmd/client-gen \
-		--go-header-file hack/copyright.go.txt \
-		--input $(subst $(space),$(comma),$(API_GROUPS)) \
-		--input-base $(PKG)/pkg/apis \
-		--trim-path-prefix $(PKG)/ \
-		--output-base . \
-		--output-package $(PKG)/pkg/client/generated/clientset
+		echo "+ Generating clientsets for $$apigrp" ; \
+		$(GO_RUN_TOOLS) k8s.io/code-generator/cmd/client-gen \
+			--fake-clientset=true \
+			--input $(subst $(space),$(comma),$(API_GROUPS)) \
+			--input-base $(PKG)/pkg/apis \
+			--go-header-file hack/copyright.go.txt \
+			--output-pkg $(PKG)/pkg/client/generated/clientset \
+			--output-dir pkg/client/generated/clientset; \
 
 lister:
 	@echo "+ Generating listers for $(API_GROUPS)"
 	@rm -rf pkg/client/generated/listers
 	$(GO_RUN_TOOLS) k8s.io/code-generator/cmd/lister-gen \
 		--go-header-file hack/copyright.go.txt \
-		--input-dirs $(subst $(space),$(comma),$(api-import-paths)) \
-		--trim-path-prefix $(PKG)/ \
-		--output-base . \
-		--output-package $(PKG)/pkg/client/generated/listers
+		--output-pkg $(PKG)/pkg/client/generated/listers \
+		--output-dir pkg/client/generated/listers \
+		${api-import-paths}
 
 informer:
 	@echo "+ Generating informers for $(API_GROUPS)"
 	@rm -rf pkg/client/generated/informers
 	$(GO_RUN_TOOLS) k8s.io/code-generator/cmd/informer-gen \
 		--go-header-file hack/copyright.go.txt \
-		--input-dirs $(subst $(space),$(comma),$(api-import-paths)) \
-		--output-package $(PKG)/pkg/client/generated/informers \
-		--trim-path-prefix $(PKG)/ \
-		--output-base . \
+		--output-pkg $(PKG)/pkg/client/generated/informers \
+		--output-dir pkg/client/generated/informers \
 		--versioned-clientset-package $(PKG)/pkg/client/generated/clientset/internalclientset \
-		--listers-package $(PKG)/pkg/client/generated/listers
+		--listers-package $(PKG)/pkg/client/generated/listers \
+		${api-import-paths}
 
 injection:
 	@echo "+ Generating injection for $(API_GROUPS)"

diff --git a/hack/lib/build/archive.sh b/hack/lib/build/archive.sh