Skip to content

Commit ed3f1b2

Browse files
committed
fix(charts): disable vcluster s3 secret syncing and revert GeneratingPolicy
1 parent faf7fa2 commit ed3f1b2

3 files changed

Lines changed: 26 additions & 26 deletions

File tree

charts/workflows-cluster/values.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ vcluster:
122122
"/argo-server-sso": "workflows/argo-server-sso"
123123
"/sessionspaces-ispyb": "kube-system/sessionspaces-ispyb"
124124
"/artifact-s3-secret": "graph-proxy/artifact-s3-secret"
125-
"/s3-artifact": "workflows/artifact-s3"
126125
rbac:
127126
clusterRole:
128127
enabled: false

charts/workflows/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: workflows
33
description: Data Analysis workflow orchestration
44
type: application
55

6-
version: 0.13.25
6+
version: 0.13.26
77

88
dependencies:
99
- name: argo-workflows

charts/workflows/templates/sessionspace-clusterpolicy.yaml

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -111,29 +111,30 @@ spec:
111111
name: argo-workflow
112112
apiGroup: rbac.authorization.k8s.io
113113
---
114-
apiVersion: policies.kyverno.io/v1alpha1
115-
kind: GeneratingPolicy
114+
apiVersion: kyverno.io/v1
115+
kind: ClusterPolicy
116116
metadata:
117-
name: copy-host-secret-artifact-s3
117+
name: {{ .Release.Name }}-copy-artifact-s3-secret
118118
spec:
119-
evaluation:
120-
generateExisting:
121-
enabled: true
122-
synchronize:
123-
enabled: true
124-
matchConstraints:
125-
resourceRules:
126-
- apiGroups: [""]
127-
apiVersions: ["v1"]
128-
operations: ["CREATE"]
129-
resources: ["namespaces"]
130-
namespaceSelector:
131-
matchLabels:
132-
app.kubernetes.io/managed-by: sessionspaces
133-
variables:
134-
- name: targetNs
135-
expression: "object.metadata.name"
136-
- name: sourceSecret
137-
expression: resource.Get("v1", "secrets", "workflows", "artifact-s3")
138-
generate:
139-
- expression: generator.Apply(variables.targetNs, [variables.sourceSecret])
119+
validationFailureAction: Enforce
120+
background: true
121+
generateExisting: true
122+
mutateExistingOnPolicyUpdate: true
123+
rules:
124+
- name: copy-artifact-s3-secret
125+
match:
126+
resources:
127+
kinds:
128+
- Namespace
129+
selector:
130+
matchLabels:
131+
app.kubernetes.io/managed-by: sessionspaces
132+
generate:
133+
synchronize: true
134+
apiVersion: v1
135+
kind: Secret
136+
name: artifact-s3
137+
namespace: "{{ `{{request.object.metadata.name}}` }}"
138+
clone:
139+
namespace: workflows
140+
name: artifact-s3

0 commit comments

Comments
 (0)