Skip to content

Commit 9fbc9d0

Browse files
committed
Update charts with latest changes
1 parent 765c268 commit 9fbc9d0

File tree

8 files changed

+3
-123
lines changed

8 files changed

+3
-123
lines changed

wiz-admission-controller/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ type: application
55
# This is the chart version. This version number should be incremented each time you make changes
66
# to the chart and its templates, including the app version.
77
# Versions are expected to follow Semantic Versioning (https://semver.org/)
8-
version: 3.12.0-preview.4
8+
version: 3.12.0-preview.5
99

1010
# This is the version number of the application being deployed. This version number should be
1111
# incremented each time you make changes to the application. Versions are not expected to

wiz-admission-controller/templates/NOTES.txt

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,8 @@ For uninstalling the wiz admission controller you need to delete helm hooks reso
55
{{- if not .Values.webhook.secret.name }}
66
3. Delete certificates secret - kubectl delete -n {{ .Release.Namespace }} secret {{ include "wiz-admission-controller.secretServerCert" . | trim }}
77
{{- end }}
8-
{{- if and .Values.crdCache.enabled (eq .Values.crdCache.argoCDCompatibilityMode "helm-hook") }}
9-
{{- $enabledTypes := include "wiz-admission-controller.enabledRunnerTypes" . | fromJsonArray }}
10-
{{- range $runnerType := $enabledTypes }}
11-
4. Delete cache secret for {{ $runnerType }} - kubectl delete -n {{ $.Release.Namespace }} secret {{ include "wiz-admission-controller.cacheSecretName" $runnerType }}
12-
{{- end }}
13-
{{- end }}
148
{{- if eq .Values.opaWebhook.failurePolicy "Fail" }}
159

1610
WARNING!!!
1711
opaWebhook.failurePolicy is Fail, You need to delete validatingwebhookconfiguration before uninstall, if webhook exists without chart resources you can’t create resources in your cluster!
1812
{{- end }}
19-
20-
{{- if .Values.crdCache.enabled }}
21-
{{- if eq .Values.crdCache.argoCDCompatibilityMode "none" }}
22-
23-
NOTE: ArgoCD Compatibility
24-
You have enabled CRD-based caching. The cache secrets are modified at runtime by the
25-
admission controller, which will cause ArgoCD to mark your application as out-of-sync.
26-
27-
If you are not using ArgoCD, you can ignore the following section.
28-
29-
To prevent this, you have two options:
30-
31-
Option 1: Configure ArgoCD to ignore differences in the cache secret's data field.
32-
Add the following to your ArgoCD Application manifest under spec.ignoreDifferences:
33-
34-
{{- $enabledTypes := include "wiz-admission-controller.enabledRunnerTypes" . | fromJsonArray }}
35-
{{- range $runnerType := $enabledTypes }}
36-
- group: ""
37-
kind: Secret
38-
name: {{ include "wiz-admission-controller.cacheSecretName" $runnerType }}
39-
namespace: {{ $.Release.Namespace }}
40-
jsonPointers:
41-
- /data
42-
{{- end }}
43-
44-
Option 2: Set crdCache.argoCDCompatibilityMode to "helm-hook" in your values.yaml.
45-
This will add Helm hooks to the cache secrets, preventing ArgoCD from tracking them.
46-
Note: You will need to manually delete the cache secrets after uninstalling the chart.
47-
{{- end }}
48-
{{- end }}

wiz-admission-controller/templates/_helpers.tpl

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -637,14 +637,6 @@ Returns: list of runner types that are enabled
637637
{{- $types | toJson -}}
638638
{{- end -}}
639639

640-
{{/*
641-
Get the cache secret name for a specific runner type
642-
*/}}
643-
{{- define "wiz-admission-controller.cacheSecretName" -}}
644-
{{- $runnerType := . -}}
645-
{{- printf "wiz-ac-cache-secrets-%s" $runnerType -}}
646-
{{- end -}}
647-
648640
{{/*
649641
Get the leader lock ID for a specific runner type
650642
*/}}
@@ -669,18 +661,6 @@ Usage: include "wiz-admission-controller.crdCacheEnvVars" "enforcer"
669661
{{- $runnerType := . -}}
670662
- name: WIZ_CRD_CACHE_LEADER_LOCK_ID
671663
value: {{ include "wiz-admission-controller.leaderLockId" $runnerType }}
672-
- name: WIZ_CRD_CACHE_SECRET_NAME
673-
value: {{ include "wiz-admission-controller.cacheSecretName" $runnerType }}
674664
- name: WIZ_CRD_CACHE_NAME_PREFIX
675665
value: {{ include "wiz-admission-controller.cacheNamePrefix" $runnerType }}
676666
{{- end -}}
677-
678-
{{/*
679-
Validate argoCDCompatibilityMode value
680-
*/}}
681-
{{- define "wiz-admission-controller.validateArgoCDCompatibilityMode" -}}
682-
{{- $validModes := list "none" "helm-hook" -}}
683-
{{- if not (has .Values.crdCache.argoCDCompatibilityMode $validModes) -}}
684-
{{- fail (printf "Invalid value for crdCache.argoCDCompatibilityMode: '%s'. Valid values are: none, helm-hook" .Values.crdCache.argoCDCompatibilityMode) -}}
685-
{{- end -}}
686-
{{- end -}}

wiz-admission-controller/templates/caching-secrets.yaml

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
11
{{ include "wiz-common.requireHelm310" . }}
2-
{{- if .Values.crdCache.enabled }}
3-
{{ include "wiz-admission-controller.validateArgoCDCompatibilityMode" . }}
4-
{{- end }}

wiz-admission-controller/templates/serviceaccount.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,10 @@ rules:
3939
- apiGroups: ["wiz.io"]
4040
resources: ["wizadmissioncontrollercaches/status"]
4141
verbs: ["get", "update", "patch"]
42-
- apiGroups: [""]
43-
resources: ["secrets"]
44-
resourceNames:
45-
{{- $enabledTypes := include "wiz-admission-controller.enabledRunnerTypes" . | fromJsonArray }}
46-
{{- range $runnerType := $enabledTypes }}
47-
- {{ include "wiz-admission-controller.cacheSecretName" $runnerType }}
48-
{{- end }}
49-
verbs: ["get", "update", "patch"]
5042
- apiGroups: ["coordination.k8s.io"]
5143
resources: ["leases"]
5244
resourceNames:
45+
{{- $enabledTypes := include "wiz-admission-controller.enabledRunnerTypes" . | fromJsonArray }}
5346
{{- range $runnerType := $enabledTypes }}
5447
- {{ include "wiz-admission-controller.leaderLockId" $runnerType }}
5548
{{- end }}

wiz-admission-controller/values.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -627,19 +627,6 @@ hpa:
627627
crdCache:
628628
enabled: false # Should the CRD-based caching be enabled. When enabled, the WizAdmissionControllerCache CRD will be installed.
629629
maxAge: 12h # In case of no connectivity to the backend, the admission controller will use the cache for up to this time, before starting to crash.
630-
leaderLockId: "wiz-admission-controller-crd-cache"
631-
632-
# ArgoCD compatibility mode for the cache secret.
633-
# When crdCache is enabled, a Secret is created that the application modifies at runtime,
634-
# which can cause ArgoCD to mark the application as out-of-sync.
635-
#
636-
# Options:
637-
# - "none": Do nothing special. If using ArgoCD, see NOTES.txt for instructions on configuring
638-
# ArgoCD to ignore differences in the secret's data field.
639-
# - "helm-hook": Add Helm pre-install/pre-upgrade hooks to the secret. This prevents ArgoCD
640-
# from marking it as out-of-sync, but requires manual deletion of the secret
641-
# after uninstall (see NOTES.txt for instructions).
642-
argoCDCompatibilityMode: "none"
643630

644631
wizManager:
645632
enabled: true # Should the Wiz Manager be deployed.

wiz-kubernetes-integration/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: wiz-kubernetes-integration
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 0.2.129
5+
version: 0.2.130
66
appVersion: ""
77
# Dependencies for wiz-kubernetes connector and wiz-admission-controller and wiz-sensor
88
dependencies:

0 commit comments

Comments
 (0)