Update helm chart

manifests/charts/aeraki/Chart.yaml

@@ -34,10 +34,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "1.0.4"

manifests/charts/aeraki/templates/applicationprotocol.yaml

@@ -0,0 +1,32 @@
+# Copyright Aeraki Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+apiVersion: metaprotocol.aeraki.io/v1alpha1
+kind: ApplicationProtocol
+metadata:
+  name: dubbo
+  namespace: istio-system
+spec:
+  protocol: dubbo
+  codec: aeraki.meta_protocol.codec.dubbo
+---
+apiVersion: metaprotocol.aeraki.io/v1alpha1
+kind: ApplicationProtocol
+metadata:
+  name: thrift
+  namespace: istio-system
+spec:
+  protocol: thrift
+  codec: aeraki.meta_protocol.codec.thrift

manifests/charts/aeraki/templates/applicationprotocols-crd.yaml

@@ -0,0 +1,61 @@
+# Copyright Aeraki Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    "helm.sh/resource-policy": keep
+  labels:
+    app: aeraki
+    chart: aeraki
+    heritage: Tiller
+    release: aeraki
+  name: applicationprotocols.metaprotocol.aeraki.io
+spec:
+  group: metaprotocol.aeraki.io
+  names:
+    categories:
+    - aeraki-io
+    - metaprotocol-aeraki-io
+    kind: ApplicationProtocol
+    listKind: ApplicationProtocolList
+    plural: applicationprotocols
+    singular: applicationprotocol
+  scope: Namespaced
+  versions:
+  - name: v1alpha1
+    schema:
+      openAPIV3Schema:
+        properties:
+          spec:
+            description: ApplicationProtocol defines an application protocol built
+              on top of MetaProtocol.
+            properties:
+              codec:
+                format: string
+                type: string
+              protocol:
+                format: string
+                type: string
+            type: object
+          status:
+            type: object
+            x-kubernetes-preserve-unknown-fields: true
+        type: object
+    served: true
+    storage: true
+    subresources:
+      status: {}

manifests/charts/aeraki/templates/clusterrole.yaml

@@ -37,6 +37,7 @@ rules:
   - apiGroups:
       - redis.aeraki.io
       - dubbo.aeraki.io
+      - metaprotocol.aeraki.io
     resources:
       - '*'
     verbs:

manifests/charts/aeraki/templates/configmap.yaml

@@ -0,0 +1,76 @@
+# Copyright Aeraki Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  annotations:
+  name: aeraki-bootstrap-config
+data:
+  custom_bootstrap.json: |-
+    {
+       "static_resources":{
+          "clusters":[
+             {
+                "name":"aeraki-xds",
+                "type":"STRICT_DNS",
+                "connect_timeout":"1s",
+                "max_requests_per_connection":1,
+                "circuit_breakers":{
+                   "thresholds":[
+                      {
+                         "max_connections":100000,
+                         "max_pending_requests":100000,
+                         "max_requests":100000
+                      },
+                      {
+                         "priority":"HIGH",
+                         "max_connections":100000,
+                         "max_pending_requests":100000,
+                         "max_requests":100000
+                      }
+                   ]
+                },
+                "http2_protocol_options":{
+
+                },
+                "upstream_connection_options":{
+                   "tcp_keepalive":{
+                      "keepalive_time":300
+                   }
+                },
+                "load_assignment":{
+                   "cluster_name":"aeraki-xds",
+                   "endpoints":[
+                      {
+                         "lb_endpoints":[
+                            {
+                               "endpoint":{
+                                  "address":{
+                                     "socket_address":{
+                                        "address":"aeraki-xds.istio-system",
+                                        "port_value":15010
+                                     }
+                                  }
+                               }
+                            }
+                         ]
+                      }
+                   ]
+                }
+             }
+          ]
+       }
+    }

manifests/charts/aeraki/templates/deployment.yaml

@@ -42,14 +42,33 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            - name: ISTIOD_ADDR
-              value: {{ .Values.ISTIOD_ADDR }}
-            - name: NAMESPACE
+            - name: AERAKI_IS_MASTER
+              value: {{ .Values.AERAKI_ENV.AERAKI_IS_MASTER }}
+            - name: AERAKI_ISTIOD_ADDR
+              value: {{ .Values.AERAKI_ENV.AERAKI_ISTIOD_ADDR }}
+            - name: AERAKI_CLUSTER_ID
+              value: {{ .Values.AERAKI_ENV.AERAKI_CLUSTER_ID }}
+            # In case of TCM, Istio config store can be a different k8s API server from the one Aeraki is running with
+            - name: AERAKI_ISTIO_CONFIG_STORE_SECRET
+              value: {{ .Values.AERAKI_ENV.AERAKI_ISTIO_CONFIG_STORE_SECRET }}
+            - name: AERAKI_XDS_LISTEN_ADDR
+              value: {{ .Values.AERAKI_ENV.AERAKI_XDS_LISTEN_ADDR }}
+            - name: AERAKI_LOG_LEVEL
+              value: {{ .Values.AERAKI_ENV.AERAKI_LOG_LEVEL }}
+            - name: AERAKI_NAMESPACE
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: ISTIO_CONFIG_STORE_SECRET
-              value: {{ .Values.ISTIO_CONFIG_STORE_SECRET }}
+            - name: AERAKI_SERVER_ID
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+          volumeMounts:
+            - name: istiod-ca-cert
+              mountPath: /var/run/secrets/istio
+              readOnly: true
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
 #          ports:
 #            - name: http
 #              containerPort: 80
@@ -62,8 +81,11 @@ spec:
 #            httpGet:
 #              path: /
 #              port: http
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
+      volumes:
+        - name: istiod-ca-cert
+          configMap:
+            name: istio-ca-root-cert
+            defaultMode: 420
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}