From 4474d9a600a77df9833d651667378c214033da3a Mon Sep 17 00:00:00 2001
From: Stan <stan@instana.com>
Date: Fri, 23 Oct 2020 13:06:28 +0000
Subject: [PATCH] Publish Helm chart version 0.6.0; App version: 1.189.0

---
 README.md                                                | 4 ++--
 .../instana-autotrace-webhook/templates/_helpers.tpl     | 9 +++++++++
 .../templates/mutating-webhook-and-cert-secret.yaml      | 2 +-
 incubator/instana-autotrace-webhook/values.yaml          | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f987a53..fa8489a 100755
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This project provides a Kubernetes [admission controller mutating webhook](https
 
 ## Requirements
 
-- Kubernetes 1.17+ OR OpenShift 4.5
+- Kubernetes 1.16+ OR OpenShift 4.5+
 - `kubectl` 1.16+
 - Helm 3.2+ (in the setup instructions, we use the new `--create-namespace` flag for maximum comfort)
 
@@ -59,7 +59,7 @@ helm upgrade --namespace instana-autotrace-webhook instana-autotrace-webhook \
   A future version of the Helm chart will deliver native modules for other supported Node.js versions.
 - Environment variables applicable only for Node.js and .NET Core will show up in processes running in other runtimes.
   There is no known side-effect of this, don't get spooked :-)
-- Only `amd64` Kubernetes nodes are currently supported.
+- Only amd64 Kubernetes nodes are currently supported.
 
 ## Configuration
 
diff --git a/incubator/instana-autotrace-webhook/templates/_helpers.tpl b/incubator/instana-autotrace-webhook/templates/_helpers.tpl
index 49f071a..1ff1211 100644
--- a/incubator/instana-autotrace-webhook/templates/_helpers.tpl
+++ b/incubator/instana-autotrace-webhook/templates/_helpers.tpl
@@ -60,6 +60,15 @@ helm.sh/chart: {{ include "instana-autotrace-webhook.chart" . }}
 {{- end }}
 {{- end }}
 
+{{- define "admission-controller-api-versions" }}
+{{- if .Capabilities.APIVersions.Has "admissionregistration.k8s.io/v1" }}
+- v1
+{{- end }}
+{{- if .Capabilities.APIVersions.Has "admissionregistration.k8s.io/v1beta1" }}
+- v1beta1
+{{- end }}
+{{- end }}
+
 {{- define "is_openshift" }}
 {{- .Capabilities.APIVersions.Has "apps.openshift.io/v1" }}
 {{- end }}
\ No newline at end of file
diff --git a/incubator/instana-autotrace-webhook/templates/mutating-webhook-and-cert-secret.yaml b/incubator/instana-autotrace-webhook/templates/mutating-webhook-and-cert-secret.yaml
index 6ca9dd7..6b37a06 100644
--- a/incubator/instana-autotrace-webhook/templates/mutating-webhook-and-cert-secret.yaml
+++ b/incubator/instana-autotrace-webhook/templates/mutating-webhook-and-cert-secret.yaml
@@ -54,6 +54,6 @@ webhooks:
       path: /validate
       port: 443
     caBundle: {{ $ca.Cert | b64enc }}
-  admissionReviewVersions: ['{{ include "k8s-admission-controller-api-version" . }}']
+  admissionReviewVersions: {{ include "admission-controller-api-versions" . | indent 4}}
   sideEffects: NoneOnDryRun
   timeoutSeconds: 5
\ No newline at end of file
diff --git a/incubator/instana-autotrace-webhook/values.yaml b/incubator/instana-autotrace-webhook/values.yaml
index 0730667..73e3671 100644
--- a/incubator/instana-autotrace-webhook/values.yaml
+++ b/incubator/instana-autotrace-webhook/values.yaml
@@ -7,7 +7,7 @@ webhook:
   ssl:
     insecure: false
     caBundle:
-  image: containers.instana.io/instana/release/agent/instana-autotrace-webhook@sha256:726acedd2f0fd4fab9d2a01eda99010186e88f66828bc73c3517ce730884c343
+  image: containers.instana.io/instana/release/agent/instana-autotrace-webhook@sha256:89e41dd0383bbd705e133f636d25ac32d43ea2fd4e0578e66dc0ea2bb2d53895
   imagePullPolicy: Always
   imagePullCredentials:
     registry: containers.instana.io
@@ -22,7 +22,7 @@ autotrace:
   opt_in: false
   failurePolicy: Ignore # We do not want to cause any trouble in scheduling; for local testing, use 'Fail'
   instrumentation:
-    image: instana/instrumentation@sha256:0a506a6a352bfe75e3eebc8b1ed203508cfc7bd1678e7ae49c87b5509fecc2b5
+    image: instana/instrumentation@sha256:97367f3c6862efeebdb71377da9f7eb76118ddaf10251f3a304d5df3d23b0f6b
     imagePullPolicy: Always
   kong:
     enabled: true