allow additional resources

Author: slamdev

charts/envoy/Chart.yaml

@@ -3,7 +3,7 @@ name: envoy
 description: |-
   Helm chart to deploy [envoy](https://www.envoyproxy.io/).
 type: application
-version: 0.0.15
+version: 0.0.16
 appVersion: "v1.18.2"
 home: https://github.com/slamdev/helm-charts/tree/master/charts/envoy
 icon: https://www.envoyproxy.io/docs/envoy/latest/_static/envoy-logo.png

charts/envoy/README.md

@@ -1,6 +1,6 @@
 # envoy
 
-![Version: 0.0.15](https://img.shields.io/badge/Version-0.0.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.18.2](https://img.shields.io/badge/AppVersion-v1.18.2-informational?style=flat-square)
+![Version: 0.0.16](https://img.shields.io/badge/Version-0.0.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.18.2](https://img.shields.io/badge/AppVersion-v1.18.2-informational?style=flat-square)
 
 Helm chart to deploy [envoy](https://www.envoyproxy.io/).
 
@@ -16,6 +16,7 @@ Helm chart to deploy [envoy](https://www.envoyproxy.io/).
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| additionalResources | list | `[]` | list of additional resources to create (are processed via `tpl` function) |
 | affinity | object | `{}` | affinity for scheduler pod assignment |
 | args | list | `[]` | extra args to pass to container |
 | configYaml | string | `"admin:\n  access_log_path: /tmp/admin_access.log\n  address:\n    socket_address:\n      protocol: TCP\n      address: 0.0.0.0\n      port_value: 9901\nstatic_resources:\n  listeners:\n  - name: listener_0\n    address:\n      socket_address:\n        protocol: TCP\n        address: 0.0.0.0\n        port_value: 10000\n    filter_chains:\n    - filters:\n      - name: envoy.filters.network.http_connection_manager\n        typed_config:\n          \"@type\": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager\n          stat_prefix: ingress_http\n          access_log:\n          - name: envoy.access_loggers.file\n            typed_config:\n              \"@type\": type.googleapis.com/envoy.extensions.access_loggers.file.v3.FileAccessLog\n              # For the demo config in the Docker container we use:\n              #   - system logs -> `/dev/stderr`\n              #   - (listener) access_logs -> `/dev/stdout`\n              path: /dev/stdout\n          route_config:\n            name: local_route\n            virtual_hosts:\n            - name: local_service\n              domains: [\"*\"]\n              routes:\n              - match:\n                  prefix: \"/\"\n                route:\n                  host_rewrite_literal: www.envoyproxy.io\n                  cluster: service_envoyproxy_io\n          http_filters:\n          - name: envoy.filters.http.router\n  clusters:\n  - name: service_envoyproxy_io\n    connect_timeout: 30s\n    type: LOGICAL_DNS\n    # Comment out the following line to test on v6 networks\n    dns_lookup_family: V4_ONLY\n    lb_policy: ROUND_ROBIN\n    load_assignment:\n      cluster_name: service_envoyproxy_io\n      endpoints:\n      - lb_endpoints:\n        - endpoint:\n            address:\n              socket_address:\n                address: www.envoyproxy.io\n                port_value: 443\n    transport_socket:\n      name: envoy.transport_sockets.tls\n      typed_config:\n        \"@type\": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext\n        sni: www.envoyproxy.io"` | config yaml |

charts/envoy/templates/_helpers.tpl

@@ -68,3 +68,13 @@ Create the tag for the docker image to use
 {{- define "envoy.tag" -}}
 {{- .Values.image.tag | default .Chart.AppVersion -}}
 {{- end -}}
+
+{{/*
+envoy.rawResource will create a resource template that can be
+merged with each item in `.Values.additionalResources`.
+*/}}
+{{- define "envoy.rawResource" -}}
+metadata:
+  labels:
+    {{- include "envoy.labels" . | nindent 4 }}
+{{- end }}

charts/envoy/templates/additional-resources.yaml

@@ -0,0 +1,5 @@
+{{- $template := fromYaml (include "envoy.rawResource" .) -}}
+{{- range $i, $t := .Values.additionalResources }}
+---
+{{ toYaml (merge (tpl $t $ | fromYaml) $template) -}}
+{{- end }}

charts/envoy/values.yaml

@@ -147,6 +147,24 @@ containerPorts:
 # containerPort -- container port, should match admin port_value from config.yaml
 containerAdminPort: 9901
 
+# additionalResources -- list of additional resources to create (are processed via `tpl` function)
+additionalResources: []
+# - |
+#   apiVersion: v1
+#   kind: ConfigMap
+#   metadata:
+#     name: {{ include "envoy.fullname" . }}-cm
+#     namespace: {{ .Release.Namespace }}
+#
+# - |
+#    apiVersion: v1
+#    kind: Secret
+#    metadata:
+#      name: {{ include "envoy.fullname" . }}-s
+#      namespace: {{ .Release.Namespace }}
+#    stringData:
+#      mykey: my-value
+
 # configYaml -- config yaml
 configYaml: |-
   admin: