Merge branch 'main' of github.com:datreeio/admission-webhook-datree i…

…nto change_webhook_version_to_scanner_version
datreeio · Jun 29, 2023 · f6f2b6a · f6f2b6a
2 parents 2cc3ec8 + c2efa3d
commit f6f2b6a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -524,6 +524,14 @@ null
 			<td><pre lang="json">
 null
 </pre>
+</td>
+		</tr>
+		<tr>
+			<td>devMode.enabled</td>
+			<td></td>
+			<td><pre lang="json">
+false
+</pre>
 </td>
 		</tr>
 	</tbody>

diff --git a/Tiltfile b/Tiltfile
@@ -19,7 +19,7 @@ cmd_button(name='enable all',
 
 namespace_create('datree')
 DATREE_TOKEN=os.environ.get('DATREE_TOKEN')
-k8s_yaml(helm('./charts/datree-admission-webhook/', name='admission-webhook', values='internal/fixtures/values.dev.yaml', namespace='datree', set=['securityContext.runAsUser=1000', 'securityContext.readOnlyRootFilesystem=false', 'clusterScanner.image.pullPolicy=Never', "datree.token={}".format(DATREE_TOKEN)]))
+k8s_yaml(helm('./charts/datree-admission-webhook/', name='admission-webhook', values='internal/fixtures/values.dev.yaml', namespace='datree', set=['devMode.enabled=true ','securityContext.runAsUser=1000', 'securityContext.readOnlyRootFilesystem=false', 'clusterScanner.image.pullPolicy=Never', "datree.token={}".format(DATREE_TOKEN)]))
 
 
 
@@ -36,12 +36,12 @@ def debugging():
 
     local_resource(
     name='datree-webhook-server-debuging',
-    serve_cmd='bash ./tilt/scripts/port-forwarding-for-debugging.sh "datree-webhook-server" "8443 5555"',
+    serve_cmd='bash ./tilt/scripts/port-forwarding-for-debugging.sh "datree-webhook-server" "5555"',
     )
 
     local_resource(
         name='cluster-scanner debugging',
-        serve_cmd='bash ./tilt/scripts/port-forwarding-for-debugging.sh "datree-cluster-scanner-server" "8080 5556"',
+        serve_cmd='bash ./tilt/scripts/port-forwarding-for-debugging.sh "datree-cluster-scanner-server" "5556"',
     )
 
     local_resource(

diff --git a/charts/datree-admission-webhook/README.md b/charts/datree-admission-webhook/README.md
@@ -549,6 +549,14 @@ null
 			<td><pre lang="json">
 null
 </pre>
+</td>
+		</tr>
+		<tr>
+			<td>devMode.enabled</td>
+			<td></td>
+			<td><pre lang="json">
+false
+</pre>
 </td>
 		</tr>
 	</tbody>

diff --git a/charts/datree-admission-webhook/templates/namespace-post-delete.yaml b/charts/datree-admission-webhook/templates/namespace-post-delete.yaml
@@ -1,3 +1,4 @@
+{{ if not .Values.devMode.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -39,7 +40,9 @@ spec:
             - >-
               kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io datree-webhook -n {{template "datree.namespace" .}};
               kubectl label ns kube-system {{template "datree.namespace" .}} admission.datree/validate-;
+{{- end }}
 ---
+{{ if not .Values.devMode.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -86,3 +89,4 @@ spec:
               else 
                 echo "Error: Failed to send cluster uninstallation request"; \
               fi
+{{- end }}
diff --git a/charts/datree-admission-webhook/values.yaml b/charts/datree-admission-webhook/values.yaml
@@ -167,3 +167,6 @@ readinessProbe:
   scheme:
   initialDelaySeconds:
   periodSeconds:
+
+devMode:
+  enabled: false