Readd teams and applications

.gitignore

@@ -29,3 +29,6 @@ lib-esm
 
 # binaries
 /bin
+
+# temporary files
+/tmp

Makefile

@@ -1,12 +1,11 @@
-BRANCH      ?= $(shell git rev-parse --abbrev-ref HEAD)
-BUILDTIME   ?= $(shell date '+%Y-%m-%d@%H:%M:%S')
-BUILDUSER   ?= $(shell id -un)
-REPO        ?= github.com/kobsio/kobs
-REVISION    ?= $(shell git rev-parse HEAD)
-VERSION     ?= $(shell git describe --tags)
+BRANCH    ?= $(shell git rev-parse --abbrev-ref HEAD)
+BUILDTIME ?= $(shell date '+%Y-%m-%d@%H:%M:%S')
+BUILDUSER ?= $(shell id -un)
+REPO      ?= github.com/kobsio/kobs
+REVISION  ?= $(shell git rev-parse HEAD)
+VERSION   ?= $(shell git describe --tags)
 
-PLUGINS ?= $(shell find ./proto -name '*.proto' | sed -e 's/^.\/proto\///' | sed -e 's/.proto//')
-CRDS    ?= application team template
+CRDS ?= team application
 
 .PHONY: build
 build:
@@ -18,34 +17,23 @@ build:
 		-o ./bin/kobs ./cmd/kobs;
 
 .PHONY: generate
-generate: generate-proto generate-crds
-
-.PHONY: generate-proto
-generate-proto:
-	for plugin in $(PLUGINS); do \
-		mkdir -p pkg/api/plugins/$$plugin/proto; \
-		mkdir -p app/src/proto; \
-		protoc --proto_path=proto --go_out=pkg/api/plugins/$$plugin/proto --go_opt=paths=source_relative --go-grpc_out=pkg/api/plugins/$$plugin/proto --go-grpc_opt=paths=source_relative --deepcopy_out=pkg/api/plugins/$$plugin/proto --js_out=import_style=commonjs:app/src/proto --plugin=protoc-gen-ts=app/node_modules/.bin/protoc-gen-ts --ts_out=service=grpc-web:app/src/proto --grpc-web_out=import_style=commonjs,mode=grpcwebtext:app/src/proto proto/$$plugin.proto; \
-		rm -rf ./pkg/api/plugins/$$plugin/proto/$$plugin\_deepcopy.gen.go; \
-		mv ./pkg/api/plugins/$$plugin/proto/github.com/kobsio/kobs/pkg/api/plugins/$$plugin/proto/$$plugin\_deepcopy.gen.go ./pkg/api/plugins/$$plugin/proto; \
-		rm -rf ./pkg/api/plugins/$$plugin/proto/github.com; \
-	done
+generate: generate-crds
 
 .PHONY: generate-crds
 generate-crds:
 	for crd in $(CRDS); do \
-		${GOPATH}/src/k8s.io/code-generator/generate-groups.sh "deepcopy,client,informer,lister" github.com/kobsio/kobs/pkg/api/plugins/$$crd github.com/kobsio/kobs/pkg/api/plugins/$$crd/apis $$crd:v1alpha1 --output-base ./tmp; \
-		rm -rf ./pkg/api/plugins/$$crd/apis/$$crd/v1alpha1/zz_generated.deepcopy.go; \
-		rm -rf ./pkg/api/plugins/$$crd/clientset; \
-		rm -rf ./pkg/api/plugins/$$crd/informers; \
-		rm -rf ./pkg/api/plugins/$$crd/listers; \
-		mv ./tmp/github.com/kobsio/kobs/pkg/api/plugins/$$crd/apis/$$crd/v1alpha1/zz_generated.deepcopy.go ./pkg/api/plugins/$$crd/apis/$$crd/v1alpha1; \
-		mv ./tmp/github.com/kobsio/kobs/pkg/api/plugins/$$crd/clientset ./pkg/api/plugins/$$crd/clientset; \
-		mv ./tmp/github.com/kobsio/kobs/pkg/api/plugins/$$crd/informers ./pkg/api/plugins/$$crd/informers; \
-		mv ./tmp/github.com/kobsio/kobs/pkg/api/plugins/$$crd/listers ./pkg/api/plugins/$$crd/listers; \
+		${GOPATH}/src/k8s.io/code-generator/generate-groups.sh "deepcopy,client,informer,lister" github.com/kobsio/kobs/pkg/api/clients/$$crd github.com/kobsio/kobs/pkg/api/apis $$crd:v1beta1 --output-base ./tmp; \
+		rm -rf ./pkg/api/apis/$$crd/v1beta1/zz_generated.deepcopy.go; \
+		rm -rf ./pkg/api/clients/$$crd/clientset; \
+		rm -rf ./pkg/api/clients/$$crd/informers; \
+		rm -rf ./pkg/api/clients/$$crd/listers; \
+		mv ./tmp/github.com/kobsio/kobs/pkg/api/apis/$$crd/v1beta1/zz_generated.deepcopy.go ./pkg/api/apis/$$crd/v1beta1; \
+		mv ./tmp/github.com/kobsio/kobs/pkg/api/clients/$$crd/clientset ./pkg/api/clients/$$crd/clientset; \
+		mv ./tmp/github.com/kobsio/kobs/pkg/api/clients/$$crd/informers ./pkg/api/clients/$$crd/informers; \
+		mv ./tmp/github.com/kobsio/kobs/pkg/api/clients/$$crd/listers ./pkg/api/clients/$$crd/listers; \
 		rm -rf ./tmp; \
 	done
-	-controller-gen "crd:crdVersions={v1},trivialVersions=true" paths="./..." output:crd:artifacts:config=deploy/kustomize/crds; \
+	controller-gen "crd:crdVersions={v1},trivialVersions=true" paths="./..." output:crd:artifacts:config=deploy/kustomize/crds; \
 
 .PHONY: release-major
 release-major:

app/package.json

@@ -4,8 +4,10 @@
   "private": true,
   "proxy": "http://localhost:15220",
   "dependencies": {
+    "@kobsio/plugin-applications": "*",
     "@kobsio/plugin-core": "*",
     "@kobsio/plugin-resources": "*",
+    "@kobsio/plugin-teams": "*",
     "@types/node": "^12.0.0",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",

app/src/index.tsx

@@ -5,11 +5,15 @@ import ReactDOM from 'react-dom';
 // first party plugins from the /plugins folder.
 import { App } from '@kobsio/plugin-core';
 import resourcesPlugin from '@kobsio/plugin-resources';
+import teamsPlugin from '@kobsio/plugin-teams';
+import applicationsPlugin from '@kobsio/plugin-applications';
 
 ReactDOM.render(
   <React.StrictMode>
     <App plugins={{
       ...resourcesPlugin,
+      ...teamsPlugin,
+      ...applicationsPlugin,
     }} />
   </React.StrictMode>,
   document.getElementById('root')

deploy/docker/kobs/config.yaml

@@ -2,7 +2,17 @@ clusters:
   providers:
     - provider: kubeconfig
       kubeconfig:
-        path: ${HOME}/.kube/config
+        # path: ${HOME}/.kube/config
+        path: ${HOME}/Documents/kubeconfig/kubeconfig
+
+plugins:
+  resources:
+    forbidden:
+      - secrets
+
+  applications:
+    topologyCacheDuration: 1m
+    teamsCacheDuration: 1m
 
 prometheus:
   - name: Prometheus