Merge branch 'release/0.48.0' into main

airyhq · Aug 18, 2022 · b18ee48 · b18ee48
2 parents 62bf227 + 20340df
commit b18ee48
Show file tree

Hide file tree

Showing 326 changed files with 6,645 additions and 3,793 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -26,6 +26,12 @@
         "properties": "never"
       }
     ],
+    "@typescript-eslint/ban-ts-comment": [
+      "error",
+      {
+        "ts-ignore": "allow-with-description"
+      }
+    ],
     "react/prop-types": 0,
     "@typescript-eslint/no-unused-vars": [
       "error",
@@ -53,4 +59,4 @@
       "version": "16.12"
     }
   }
-}
+}
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,7 @@ package-lock.json
 *.tfstate.*
 .terraform.tfstate.lock.info
 .terraform.lock.hcl
+/terraform
 
 # Kubernetes
 .kubeconfig

diff --git a/BUILD b/BUILD
@@ -181,6 +181,7 @@ exports_files(
 # gazelle:proto disable_global
 # gazelle:build_file_name BUILD
 # gazelle:prefix
+# gazelle:exclude infrastructure/terraform
 gazelle(name = "gazelle")
 
 nogo(

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.47.4
+0.48.0
diff --git a/WORKSPACE b/WORKSPACE
@@ -10,9 +10,9 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "com_github_airyhq_bazel_tools",
-    commit = "50e7c808d9e7f5d839fda7898168143e75326878",
+    commit = "6ea38fe01069589ad57e66ae43c6d320fd18e3e5",
     remote = "https://github.com/airyhq/bazel-tools.git",
-    shallow_since = "1657698793 +0200",
+    shallow_since = "1660208058 +0200",
 )
 
 load("@com_github_airyhq_bazel_tools//:repositories.bzl", "airy_bazel_tools_dependencies", "airy_jvm_deps")
@@ -191,3 +191,10 @@ load("@com_github_airyhq_bazel_tools//helm:helm.bzl", "helm_tool")
 helm_tool(
     name = "helm_binary",
 )
+
+### Minikube
+load("@com_github_airyhq_bazel_tools//minikube:minikube.bzl", "minikube_tool")
+
+minikube_tool(
+    name = "minikube_binary",
+)
diff --git a/backend/api/contacts/helm/BUILD b/backend/api/contacts/helm/BUILD
@@ -0,0 +1,3 @@
+load("//tools/build:helm.bzl", "helm_ruleset_core_version")
+
+helm_ruleset_core_version()
diff --git a/...charts/api/charts/api-contacts/Chart.yaml → backend/api/contacts/helm/Chart.yaml b/...charts/api/charts/api-contacts/Chart.yaml → backend/api/contacts/helm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for the Api Contacts app
-name: contacts
-version: 0-develop
+name: api-contacts
+version: 0-alpha
diff --git a/...pi-communication/templates/configmap.yaml → ...pi/contacts/helm/templates/configmap.yaml b/...pi-communication/templates/configmap.yaml → ...pi/contacts/helm/templates/configmap.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "{{ .Values.component }}"
+  name: "{{ .Values.name }}"
   labels:
     core.airy.co/managed: "true"
     core.airy.co/mandatory: "{{ .Values.mandatory }}"
-    core.airy.co/component: "{{ .Values.component }}"
+    core.airy.co/component: "{{ .Values.name }}"
   annotations:
     core.airy.co/enabled: "{{ .Values.enabled }}"
diff --git a/...i-communication/templates/deployment.yaml → ...i/contacts/helm/templates/deployment.yaml b/...i-communication/templates/deployment.yaml → ...i/contacts/helm/templates/deployment.yaml
@@ -1,18 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: api-communication
+  name: {{ .Values.name }}
   labels:
-    app: api-communication
+    app: {{ .Values.name }}
     type: api
     core.airy.co/managed: "true"
     core.airy.co/mandatory: "{{ .Values.mandatory }}"
-    core.airy.co/component: "{{ .Values.component }}"
+    core.airy.co/component: "{{ .Values.name }}"
 spec:
-  replicas: 1
+  replicas: {{ if .Values.enabled }} 1 {{ else }} 0 {{ end }}
   selector:
     matchLabels:
-      app: api-communication
+      app: {{ .Values.name }}
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       labels:
-        app: api-communication
+        app: {{ .Values.name }}
         WorkerType: "{{ default "NodeGroup" .Values.global.workerType }}"
     spec:
       containers:
@@ -34,7 +34,7 @@ spec:
           - configMapRef:
               name: kafka-config
           - configMapRef:
-              name: "{{ .Values.component }}"
+              name: "{{ .Values.name }}"
         livenessProbe:
           httpGet:
             path: /actuator/health

diff --git a/.../api-communication/templates/service.yaml → .../api/contacts/helm/templates/service.yaml b/.../api-communication/templates/service.yaml → .../api/contacts/helm/templates/service.yaml
@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.component }}
+  name: "{{ .Values.name }}"
   labels:
     core.airy.co/prometheus: spring
+    core.airy.co/component: "{{ .Values.name }}"
 spec:
   ports:
     - name: web
@@ -12,4 +13,4 @@ spec:
       protocol: TCP
   type: NodePort
   selector:
-    app: {{ .Values.component }}
+    app: "{{ .Values.name }}"
diff --git a/backend/api/contacts/helm/values.yaml b/backend/api/contacts/helm/values.yaml
@@ -0,0 +1,9 @@
+name: api-contacts
+mandatory: false
+enabled: true
+image: api/contacts
+resources: {}
+global:
+  containerRegistry: ghcr.io/airyhq
+  busyboxImage: ghcr.io/airyhq/infrastructure/busybox:latest
+  workerType:
diff --git a/backend/media/helm/BUILD b/backend/media/helm/BUILD
@@ -0,0 +1,3 @@
+load("//tools/build:helm.bzl", "helm_ruleset_core_version")
+
+helm_ruleset_core_version()
diff --git a/...s/charts/media/charts/resolver/Chart.yaml → backend/media/helm/Chart.yaml b/...s/charts/media/charts/resolver/Chart.yaml → backend/media/helm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for the Media Resolver app
-name: resolver
-version: 0-develop
+name: media-resolver
+version: 0-alpha
diff --git a/...ts/api-websocket/templates/configmap.yaml → backend/media/helm/templates/configmap.yaml b/...ts/api-websocket/templates/configmap.yaml → backend/media/helm/templates/configmap.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "{{ .Values.component }}"
+  name: "{{ .Values.name }}"
   labels:
     core.airy.co/managed: "true"
     core.airy.co/mandatory: "{{ .Values.mandatory }}"
-    core.airy.co/component: "{{ .Values.component }}"
+    core.airy.co/component: "{{ .Values.name }}"
   annotations:
     core.airy.co/enabled: "{{ .Values.enabled }}"
diff --git a/...charts/resolver/templates/deployment.yaml → backend/media/helm/templates/deployment.yaml b/...charts/resolver/templates/deployment.yaml → backend/media/helm/templates/deployment.yaml
@@ -1,18 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: media-resolver
+  name: "{{ .Values.name }}"
   labels:
-    app: media-resolver
+    app: "{{ .Values.name }}"
     type: media
     core.airy.co/managed: "true"
     core.airy.co/mandatory: "{{ .Values.mandatory }}"
-    core.airy.co/component: "{{ .Values.component }}"
+    core.airy.co/component: "{{ .Values.name }}"
 spec:
-  replicas: 0
+  replicas: {{ if .Values.enabled }} 1 {{ else }} 0 {{ end }}
   selector:
     matchLabels:
-      app: media-resolver
+      app: "{{ .Values.name }}"
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       labels:
-        app: media-resolver
+        app: "{{ .Values.name }}"
         WorkerType: "{{ default "NodeGroup" .Values.global.workerType }}"
     spec:
       containers:

diff --git a/.../charts/source-api/templates/service.yaml → backend/media/helm/templates/service.yaml b/.../charts/source-api/templates/service.yaml → backend/media/helm/templates/service.yaml
@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: source-api
+  name: "{{ .Values.name }}"
   labels:
     core.airy.co/prometheus: spring
+    core.airy.co/component: "{{ .Values.name }}"
 spec:
   ports:
     - name: web
@@ -12,4 +13,4 @@ spec:
       protocol: TCP
   type: NodePort
   selector:
-    app: source-api
+    app: "{{ .Values.name }}"
diff --git a/backend/media/helm/values.yaml b/backend/media/helm/values.yaml
@@ -0,0 +1,9 @@
+name: media-resolver
+mandatory: false
+enabled: false
+image: media/resolver
+resources: {}
+global:
+  containerRegistry: ghcr.io/airyhq
+  busyboxImage: ghcr.io/airyhq/infrastructure/busybox:latest
+  workerType:
diff --git a/backend/sources/api/helm/BUILD b/backend/sources/api/helm/BUILD
@@ -0,0 +1,3 @@
+load("//tools/build:helm.bzl", "helm_ruleset_core_version")
+
+helm_ruleset_core_version()
diff --git a/.../integration/charts/source-api/Chart.yaml → backend/sources/api/helm/Chart.yaml b/.../integration/charts/source-api/Chart.yaml → backend/sources/api/helm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for the Sources Chatplugin app
-name: source-api
-version: 0-develop
+name: integration-source-api
+version: 0-alpha
diff --git a/...rts/api-contacts/templates/configmap.yaml → ...sources/api/helm/templates/configmap.yaml b/...rts/api-contacts/templates/configmap.yaml → ...sources/api/helm/templates/configmap.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: "{{ .Values.component }}"
+  name: "{{ .Values.name }}"
   labels:
     core.airy.co/managed: "true"
     core.airy.co/mandatory: "{{ .Values.mandatory }}"
-    core.airy.co/component: "{{ .Values.component }}"
+    core.airy.co/component: "{{ .Values.name }}"
   annotations:
     core.airy.co/enabled: "{{ .Values.enabled }}"
diff --git a/...arts/source-api/templates/deployment.yaml → ...ources/api/helm/templates/deployment.yaml b/...arts/source-api/templates/deployment.yaml → ...ources/api/helm/templates/deployment.yaml
@@ -1,18 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: source-api
+  name: "{{ .Values.name }}"
   labels:
-    app: source-api
+    app: "{{ .Values.name }}"
     type: sources
     core.airy.co/managed: "true"
     core.airy.co/mandatory: "{{ .Values.mandatory }}"
-    core.airy.co/component: "{{ .Values.component }}"
+    core.airy.co/component: "{{ .Values.name }}"
 spec:
-  replicas: 0
+  replicas: {{ if .Values.enabled }} 1 {{ else }} 0 {{ end }}
   selector:
     matchLabels:
-      app: source-api
+      app: "{{ .Values.name }}"
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       labels:
-        app: source-api
+        app: "{{ .Values.name }}"
     spec:
       containers:
       - name: app
@@ -33,7 +33,7 @@ spec:
           - configMapRef:
               name: kafka-config
           - configMapRef:
-              name: "{{ .Values.component }}"
+              name: "{{ .Values.name }}"
         env:
         - name: jwtSecret
           valueFrom:

diff --git a/...harts/api-contacts/templates/service.yaml → ...d/sources/api/helm/templates/service.yaml b/...harts/api-contacts/templates/service.yaml → ...d/sources/api/helm/templates/service.yaml
@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ .Values.component }}"
+  name: "{{ .Values.name }}"
   labels:
     core.airy.co/prometheus: spring
+    core.airy.co/component: "{{ .Values.name }}"
 spec:
   ports:
     - name: web
@@ -12,4 +13,4 @@ spec:
       protocol: TCP
   type: NodePort
   selector:
-    app: "{{ .Values.component }}"
+    app: "{{ .Values.name }}"
diff --git a/backend/sources/api/helm/values.yaml b/backend/sources/api/helm/values.yaml
@@ -0,0 +1,9 @@
+name: integration-source-api
+mandatory: false
+enabled: false
+image: sources/api
+resources: {}
+global:
+  containerRegistry: ghcr.io/airyhq
+  busyboxImage: ghcr.io/airyhq/infrastructure/busybox:latest
+  workerType:
diff --git a/backend/sources/chat-plugin/helm/BUILD b/backend/sources/chat-plugin/helm/BUILD
@@ -0,0 +1,3 @@
+load("//tools/build:helm.bzl", "helm_ruleset_core_version")
+
+helm_ruleset_core_version()
diff --git a/...arts/sources/charts/chatplugin/Chart.yaml → backend/sources/chat-plugin/helm/Chart.yaml b/...arts/sources/charts/chatplugin/Chart.yaml → backend/sources/chat-plugin/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for the Sources Chatplugin app
 name: sources-chatplugin
-version: 0
+version: 0-alpha
diff --git a/...tplugin/templates/backend/deployment.yaml → ...in/helm/templates/backend/deployment.yaml b/...tplugin/templates/backend/deployment.yaml → ...in/helm/templates/backend/deployment.yaml
@@ -1,18 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: sources-chatplugin
+  name: "{{ .Values.name }}"
   labels:
-    app: sources-chatplugin
+    app: "{{ .Values.name }}"
     type: sources
     core.airy.co/managed: "true"
     core.airy.co/mandatory: "{{ .Values.mandatory }}"
-    core.airy.co/component: "{{ .Values.component }}"
+    core.airy.co/component: "{{ .Values.name }}"
 spec:
-  replicas: 1
+  replicas: {{ if .Values.enabled }} 1 {{ else }} 0 {{ end }}
   selector:
     matchLabels:
-      app: sources-chatplugin
+      app: "{{ .Values.name }}"
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -21,7 +21,7 @@ spec:
   template:
     metadata:
       labels:
-        app: sources-chatplugin
+        app: "{{ .Values.name }}"
         WorkerType: "{{ default "NodeGroup" .Values.global.workerType }}"
     spec:
       containers:
@@ -34,7 +34,7 @@ spec:
           - configMapRef:
               name: kafka-config
           - configMapRef:
-              name: "{{ .Values.component }}"
+              name: "{{ .Values.name }}"
         env:
         - name: jwtSecret
           valueFrom:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		load("//tools/build:helm.bzl", "helm_ruleset_core_version")

		helm_ruleset_core_version()