Skip to content
This repository has been archived by the owner on Mar 5, 2024. It is now read-only.

Helm chart v4 release compatibility #439

Merged
merged 4 commits into from
Jan 4, 2021
Merged

Helm chart v4 release compatibility #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3158b48
Change helm chart to use the new grpc keepalive options
stefansedich Nov 12, 2020
da0b169
oops
stefansedich Nov 12, 2020
0e461cf
Add support for new server keepalive and max-connection options
stefansedich Nov 13, 2020
ed3500c
Add allowRouteRegexp changes
stefansedich Dec 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions helm/kiam/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: kiam
version: 5.10.0
appVersion: 3.6
version: 6.0.0
appVersion: 4.0
description: Integrate AWS IAM with Kubernetes
keywords:
- kiam
Expand Down
2 changes: 1 addition & 1 deletion helm/kiam/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ The following table lists the configurable parameters of the kiam chart and thei
| `agent.image.tag` | Agent image tag | `v3.6` |
| `agent.image.pullPolicy` | Agent image pull policy | `IfNotPresent` |
| `agent.dnsPolicy` | Agent pod DNS policy | `ClusterFirstWithHostNet` |
| `agent.whiteListRouteRegexp` | Agent pod whitelist metadata API path argument regex | `{}` |
| `agent.allowRouteRegexp` | Agent metadata proxy server only allows accesses to paths matching this regexp | `{}` |
| `agent.extraArgs` | Additional agent container arguments | `{}` |
| `agent.extraEnv` | Additional agent container environment variables | `{}` |
| `agent.extraHostPathMounts` | Additional agent container hostPath mounts | `[]` |
Expand Down
8 changes: 4 additions & 4 deletions helm/kiam/templates/agent-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ spec:
- --prometheus-listen-addr=0.0.0.0:{{ .Values.agent.prometheus.port }}
- --prometheus-sync-interval={{ .Values.agent.prometheus.syncInterval }}
{{- end }}
{{- if .Values.agent.whiteListRouteRegexp }}
- --whitelist-route-regexp={{ .Values.agent.whiteListRouteRegexp }}
{{- if .Values.agent.allowRouteRegexp }}
- --allow-route-regexp={{ .Values.agent.allowRouteRegexp }}
{{- end }}
- --gateway-timeout-creation={{ .Values.agent.gatewayTimeoutCreation }}
{{- if .Values.agent.keepaliveParams.time }}
- --grpc-keepalive-time-ms={{ .Values.agent.keepaliveParams.time }}
- --grpc-keepalive-time-duration={{ .Values.agent.keepaliveParams.time }}
{{- end }}
{{- if .Values.agent.keepaliveParams.timeout }}
- --grpc-keepalive-timeout-ms={{ .Values.agent.keepaliveParams.timeout }}
- --grpc-keepalive-timeout-duration={{ .Values.agent.keepaliveParams.timeout }}
{{- end }}
{{- if .Values.agent.keepaliveParams.PermitWithoutStream }}
- --grpc-keepalive-permit-without-stream
Expand Down
15 changes: 15 additions & 0 deletions helm/kiam/templates/server-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,21 @@ spec:
- --prometheus-listen-addr=0.0.0.0:{{ .Values.server.prometheus.port }}
- --prometheus-sync-interval={{ .Values.server.prometheus.syncInterval }}
{{- end }}
{{- if .Values.server.keepaliveParams.time }}
- --grpc-keepalive-time-duration={{ .Values.server.keepaliveParams.time }}
{{- end }}
{{- if .Values.server.keepaliveParams.timeout }}
- --grpc-keepalive-timeout-duration={{ .Values.server.keepaliveParams.timeout }}
{{- end }}
{{- if .Values.server.keepaliveParams.maxConnectionIdle }}
- --grpc-max-connection-idle-duration={{ .Values.server.keepaliveParams.maxConnectionIdle }}
{{- end }}
{{- if .Values.server.keepaliveParams.maxConnectionAge }}
- --grpc-max-connection-age-duration={{ .Values.server.keepaliveParams.maxConnectionAge }}
{{- end }}
{{- if .Values.server.keepaliveParams.maxConnectionAgeGrace }}
- --grpc-max-connection-age-grace-duration={{ .Values.server.keepaliveParams.maxConnectionAgeGrace }}
{{- end }}
{{- range $key, $value := .Values.server.extraArgs }}
{{- if $value }}
- --{{ $key }}={{ $value }}
Expand Down
15 changes: 15 additions & 0 deletions helm/kiam/templates/server-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,21 @@ spec:
- --prometheus-listen-addr=0.0.0.0:{{ .Values.server.prometheus.port }}
- --prometheus-sync-interval={{ .Values.server.prometheus.syncInterval }}
{{- end }}
{{- if .Values.server.keepaliveParams.time }}
- --grpc-keepalive-time-duration={{ .Values.server.keepaliveParams.time }}
{{- end }}
{{- if .Values.server.keepaliveParams.timeout }}
- --grpc-keepalive-timeout-duration={{ .Values.server.keepaliveParams.timeout }}
{{- end }}
{{- if .Values.server.keepaliveParams.maxConnectionIdle }}
- --grpc-max-connection-idle-duration={{ .Values.server.keepaliveParams.maxConnectionIdle }}
{{- end }}
{{- if .Values.server.keepaliveParams.maxConnectionAge }}
- --grpc-max-connection-age-duration={{ .Values.server.keepaliveParams.maxConnectionAge }}
{{- end }}
{{- if .Values.server.keepaliveParams.maxConnectionAgeGrace }}
- --grpc-max-connection-age-grace-duration={{ .Values.server.keepaliveParams.maxConnectionAgeGrace }}
{{- end }}
{{- range $key, $value := .Values.server.extraArgs }}
{{- if $value }}
- --{{ $key }}={{ $value }}
Expand Down
17 changes: 13 additions & 4 deletions helm/kiam/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ agent:

image:
repository: quay.io/uswitch/kiam
tag: v3.6
tag: v4.0
pullPolicy: IfNotPresent

## agent whitelist of proxy routes matching this reg-ex
## agent permits only request paths matching this reg-ex
##
# whiteListRouteRegexp:
# allowRouteRegexp:


## Logging settings
Expand Down Expand Up @@ -201,7 +201,7 @@ server:

image:
repository: quay.io/uswitch/kiam
tag: v3.6
tag: v4.0
pullPolicy: IfNotPresent

## Run as Deployment instead of Daemonset
Expand Down Expand Up @@ -313,6 +313,15 @@ server:
##
gatewayTimeoutCreation: 1s

## gRPC keepalive variables
##
keepaliveParams:
time:
timeout:
maxConnectionIdle:
maxConnectionAge:
maxConnectionAgeGrace:

## Server probe configuration
probes:
serverAddress: 127.0.0.1
Expand Down