Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 7 additions & 30 deletions components/kyverno/staging/stone-stage-p01/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,13 @@ kind: Kustomization
namespace: konflux-kyverno

generators:
- kyverno-helm-generator.yaml

replacements:
# enforce serviceAccountName is used instead of serviceAccount in Jobs
# TODO: these replacements can be removed when bumping to kyverno:1.14
# https://github.com/kyverno/kyverno/pull/12158
- source:
group: batch
version: v1
kind: Job
name: konflux-kyverno-migrate-resources
namespace: konflux-kyverno
fieldPath: spec.template.spec.serviceAccount
targets:
- select:
group: batch
version: v1
kind: Job
namespace: konflux-kyverno
name: konflux-kyverno-migrate-resources
fieldPaths:
- spec.template.spec.serviceAccountName
options:
create: true
- kyverno-helm-generator.yaml

# set resources to jobs
patches:
- path: job_resources.yaml
target:
group: batch
version: v1
kind: Job
name: konflux-kyverno-migrate-resources
- path: job_resources.yaml
target:
group: batch
kind: Job
name: konflux-kyverno-migrate-resources
version: v1
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ metadata:
name: kyverno
name: kyverno
repo: https://kyverno.github.io/kyverno/
# TODO: when bumping to kyverno:1.14 we can remove ServiceAccountName
# replacements from the kustomization.yaml file
# https://github.com/kyverno/kyverno/pull/12158
version: 3.3.7
version: 3.5.2
namespace: konflux-kyverno
valuesFile: kyverno-helm-values.yaml
releaseName: kyverno
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ admissionController:
- "ALL"
metering:
disabled: false
podDisruptionBudget:
enabled: true
maxUnavailable: 2
minAvailable: null
unhealthyPodEvictionPolicy: AlwaysAllow
serviceMonitor:
enabled: true
# kyverno doesn't seem to support HTTPS on metrics
Expand All @@ -62,6 +67,11 @@ backgroundController:
- "ALL"
metering:
disabled: false
podDisruptionBudget:
enabled: true
maxUnavailable: 2
minAvailable: null
unhealthyPodEvictionPolicy: AlwaysAllow
serviceMonitor:
enabled: true
# kyverno doesn't seem to support HTTPS on metrics
Expand All @@ -86,6 +96,11 @@ cleanupController:
- "ALL"
metering:
disabled: false
podDisruptionBudget:
enabled: true
maxUnavailable: 2
minAvailable: null
unhealthyPodEvictionPolicy: AlwaysAllow
serviceMonitor:
enabled: true
# kyverno doesn't seem to support HTTPS on metrics
Expand Down
32 changes: 9 additions & 23 deletions components/kyverno/staging/stone-stg-rh01/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,6 @@ namespace: konflux-kyverno
generators:
- kyverno-helm-generator.yaml

replacements:
# enforce serviceAccountName is used instead of serviceAccount in Jobs
# TODO: these replacements can be removed when bumping to kyverno:1.14
# https://github.com/kyverno/kyverno/pull/12158
- source:
group: batch
version: v1
kind: Job
name: konflux-kyverno-migrate-resources
namespace: konflux-kyverno
fieldPath: spec.template.spec.serviceAccount
targets:
- select:
group: batch
version: v1
kind: Job
namespace: konflux-kyverno
name: konflux-kyverno-migrate-resources
fieldPaths:
- spec.template.spec.serviceAccountName
options:
create: true

# set resources to jobs
patches:
- path: job_resources.yaml
Expand All @@ -37,3 +14,12 @@ patches:
version: v1
kind: Job
name: konflux-kyverno-migrate-resources
- patch: |
- op: add
path: /spec/unhealthyPodEvictionPolicy
value: AlwaysAllow
target:
group: policy
version: v1
kind: PodDisruptionBudget
labelSelector: app.kubernetes.io/part-of=konflux-kyverno
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@ metadata:
name: kyverno
name: kyverno
repo: https://kyverno.github.io/kyverno/
# TODO: when bumping to kyverno:1.14 we can remove ServiceAccountName
# replacements from the kustomization.yaml file
# https://github.com/kyverno/kyverno/pull/12158
version: 3.3.7
version: 3.5.2
namespace: konflux-kyverno
valuesFile: kyverno-helm-values.yaml
releaseName: kyverno
Expand Down
15 changes: 15 additions & 0 deletions components/kyverno/staging/stone-stg-rh01/kyverno-helm-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ admissionController:
- "ALL"
metering:
disabled: false
podDisruptionBudget:
enabled: true
maxUnavailable: 2
minAvailable: null
unhealthyPodEvictionPolicy: AlwaysAllow
serviceMonitor:
enabled: true
# kyverno doesn't seem to support HTTPS on metrics
Expand All @@ -65,6 +70,11 @@ backgroundController:
- "ALL"
metering:
disabled: false
podDisruptionBudget:
enabled: true
maxUnavailable: 2
minAvailable: null
unhealthyPodEvictionPolicy: AlwaysAllow
serviceMonitor:
enabled: true
# kyverno doesn't seem to support HTTPS on metrics
Expand All @@ -89,6 +99,11 @@ cleanupController:
- "ALL"
metering:
disabled: false
podDisruptionBudget:
enabled: true
maxUnavailable: 2
minAvailable: null
unhealthyPodEvictionPolicy: AlwaysAllow
serviceMonitor:
enabled: true
# kyverno doesn't seem to support HTTPS on metrics
Expand Down