disable sidecar injection from service mesh

Signed-off-by: zufardhiyaulhaq <[email protected]>
zufardhiyaulhaq · Sep 4, 2021 · f65c9cc · f65c9cc
1 parent b49ca8c
commit f65c9cc
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
-  # <user>:<password>
-  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
@@ -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
@@ -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 }}