From f65c9ccda9d60247fd3c927646bc22cd507ee347 Mon Sep 17 00:00:00 2001 From: zufardhiyaulhaq Date: Sat, 4 Sep 2021 16:29:12 +0200 Subject: [PATCH] disable sidecar injection from service mesh Signed-off-by: zufardhiyaulhaq --- .github/workflows/master.yml | 6 ++++-- .github/workflows/pullrequest.yml | 6 ++++-- README.md | 2 +- charts/ngrok-operator/README.md | 2 +- charts/ngrok-operator/values.yaml | 2 +- charts/releases/ngrok-operator-1.1.0.tgz | Bin 4155 -> 4155 bytes examples/http/simple/ngrok.yaml | 5 ----- pkg/builder/pod_builder.go | 7 +++++++ pkg/utils/utils.go | 4 ++-- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 9066972..d4d9b60 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -97,5 +97,7 @@ jobs: run: kubectl apply -f ./examples/deployment - name: deploy ngrok run: kubectl apply -f ./examples/http/simple - - run: sleep 180 - - run: kubectl get ngrok -A + - name: waiting ngrok-operator to start + run: sleep 180 + - name: check ngrok object + run: kubectl get ngrok -A diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 2cd9015..cb42944 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -88,5 +88,7 @@ jobs: run: kubectl apply -f ./examples/deployment - name: deploy ngrok run: kubectl apply -f ./examples/http/simple - - run: sleep 180 - - run: kubectl get ngrok -A + - name: waiting ngrok-operator to start + run: sleep 180 + - name: check ngrok object + run: kubectl get ngrok -A diff --git a/README.md b/README.md index c1b7eb3..3263e0c 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ https://ngrok.zufardhiyaulhaq.com |-----|------|---------|-------------| | operator.image | string | `"zufardhiyaulhaq/ngrok-operator"` | | | operator.replica | int | `1` | | -| operator.tag | string | `"v1.1.0"` | | +| operator.tag | string | `"v1.2.0"` | | | resources.limits.cpu | string | `"200m"` | | | resources.limits.memory | string | `"100Mi"` | | | resources.requests.cpu | string | `"100m"` | | diff --git a/charts/ngrok-operator/README.md b/charts/ngrok-operator/README.md index c1b7eb3..3263e0c 100644 --- a/charts/ngrok-operator/README.md +++ b/charts/ngrok-operator/README.md @@ -40,7 +40,7 @@ https://ngrok.zufardhiyaulhaq.com |-----|------|---------|-------------| | operator.image | string | `"zufardhiyaulhaq/ngrok-operator"` | | | operator.replica | int | `1` | | -| operator.tag | string | `"v1.1.0"` | | +| operator.tag | string | `"v1.2.0"` | | | resources.limits.cpu | string | `"200m"` | | | resources.limits.memory | string | `"100Mi"` | | | resources.requests.cpu | string | `"100m"` | | diff --git a/charts/ngrok-operator/values.yaml b/charts/ngrok-operator/values.yaml index e253c55..6fca7f1 100644 --- a/charts/ngrok-operator/values.yaml +++ b/charts/ngrok-operator/values.yaml @@ -2,7 +2,7 @@ operator: # image of ngrok-operator image: "zufardhiyaulhaq/ngrok-operator" # tag of ngrok-operator image - tag: "v1.1.0" + tag: "v1.2.0" # number of replica for deployment replica: 1 diff --git a/charts/releases/ngrok-operator-1.1.0.tgz b/charts/releases/ngrok-operator-1.1.0.tgz index db5a6932afea2a8942558e0a18c0fd6936b9dca4..363330961ce7955677cc85a0db67312915a69384 100644 GIT binary patch delta 4118 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 USr72900030|1@&sQvh%P0NDU1?f?J) delta 4118 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 UUk?`iD*yoh|0Nca5&&=j00HkNTmS$7 diff --git a/examples/http/simple/ngrok.yaml b/examples/http/simple/ngrok.yaml index 28c8b05..18c11c9 100644 --- a/examples/http/simple/ngrok.yaml +++ b/examples/http/simple/ngrok.yaml @@ -39,11 +39,6 @@ spec: # bind an HTTPS or HTTP endpoint or both bind_tls: both - # auth protect your http - # with user password combination - # : - auth: user:password - # enable inspection # only works for http protocol inspect: true diff --git a/pkg/builder/pod_builder.go b/pkg/builder/pod_builder.go index 01b1fa0..efa0205 100644 --- a/pkg/builder/pod_builder.go +++ b/pkg/builder/pod_builder.go @@ -39,6 +39,13 @@ func (n *NgrokPodBuilder) Build() (*corev1.Pod, error) { "app": n.Name, "generated": "ngrok-operator", }, + Annotations: map[string]string{ + "sidecar.istio.io/inject": "false", + "linkerd.io/inject": "disabled", + "kuma.io/sidecar-injection": "disabled", + "appmesh.k8s.aws/sidecarInjectorWebhook": "disabled", + "injector.nsm.nginx.com/auto-inject": "false", + }, }, Spec: corev1.PodSpec{ Containers: []corev1.Container{ diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 63f98bf..6dcad2d 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -29,9 +29,9 @@ tunnels: {{ if eq .Protocol "http" }} inspect: {{ .Inspect }} - {{if .Auth }} + {{if .AuthToken }}{{if .Auth }} auth: {{ .Auth }} - {{ end }} + {{ end }}{{ end }} {{if .HostHeader }} host_header: {{ .HostHeader }} {{ end }}