Skip to content
This repository was archived by the owner on Sep 18, 2024. It is now read-only.

Commit 32f7eaf

Browse files
ddecrulleddecrulle
authored
Merge branch 'master' into patch-2
2 parents 528a7ae + 9d16388 commit 32f7eaf

File tree

124 files changed

+701
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+701
-135
lines changed

‎charts/argo-cd/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type: application
2424
# This is the chart version. This version number should be incremented each time you make changes
2525
# to the chart and its templates, including the app version.
2626
# Versions are expected to follow Semantic Versioning (https://semver.org/)
27-
version: 2.0.7
27+
version: 2.0.8
2828

2929
# This is the version number of the application being deployed. This version number should be
3030
# incremented each time you make changes to the application. Versions are not expected to
@@ -35,5 +35,5 @@ dependencies:
3535
version: 4.5.7
3636
repository: https://argoproj.github.io/argo-helm
3737
- name: library-chart
38-
version: 2.0.20
38+
version: 2.0.21
3939
repository: https://inseefrlab.github.io/helm-charts-datascience

‎charts/argo-cd/templates/network-policy.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{{- if .Values.security.networkPolicy.enabled -}}
2+
apiVersion: networking.k8s.io/v1
3+
kind: NetworkPolicy
4+
metadata:
5+
name: {{ .Release.Name }}
6+
labels:
7+
{{- include "library-chart.labels" . | nindent 4 }}
8+
spec:
9+
podSelector:
10+
matchLabels:
11+
app.kubernetes.io/instance: {{ .Release.Name }}
12+
ingress:
13+
- from:
14+
- podSelector: {}
15+
policyTypes:
16+
- Ingress
17+
{{- end }}

‎charts/argo-cd/templates/networkpolicy-ingress.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{{- if .Values.security.networkPolicy.enabled -}}
2+
{{- if .Values.ingress.enabled -}}
3+
kind: NetworkPolicy
4+
apiVersion: networking.k8s.io/v1
5+
metadata:
6+
name: {{ include "library-chart.fullname" . }}-2
7+
spec:
8+
podSelector:
9+
matchLabels:
10+
app.kubernetes.io/instance: {{ .Release.Name }}
11+
ingress:
12+
- from:
13+
{{- toYaml .Values.security.networkPolicy.from | nindent 4 }}
14+
policyTypes:
15+
- Ingress
16+
{{- end }}
17+
{{- end }}

‎charts/argo-cd/values.schema.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,21 @@
4444
}
4545
}
4646
}
47+
},
48+
"networkPolicy": {
49+
"type": "object",
50+
"description": "Define access policy to the service",
51+
"properties": {
52+
"enabled": {
53+
"type": "boolean",
54+
"title": "Enable network policy",
55+
"description": "Only pod from the same namespace will be allowed",
56+
"default": true,
57+
"x-form": {
58+
"value": "{{region.defaultNetworkPolicy}}"
59+
}
60+
}
61+
}
4762
}
4863
}
4964
},

‎charts/argo-cd/values.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ security:
2020
allowlist:
2121
enabled: true
2222
ip: "0.0.0.0/0"
23+
networkPolicy:
24+
enabled: true
25+
from:
26+
- ipBlock:
27+
cidr: 10.233.103.0/32
28+
- ipBlock:
29+
cidr: 10.233.111.0/32
2330

2431
global:
2532
networkPolicy:

‎charts/argo-workflows/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type: application
2424
# This is the chart version. This version number should be incremented each time you make changes
2525
# to the chart and its templates, including the app version.
2626
# Versions are expected to follow Semantic Versioning (https://semver.org/)
27-
version: 2.0.5
27+
version: 2.0.6
2828

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

‎charts/argo-workflows/templates/network-policy.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{{- if .Values.security.networkPolicy.enabled -}}
2+
apiVersion: networking.k8s.io/v1
3+
kind: NetworkPolicy
4+
metadata:
5+
name: {{ .Release.Name }}
6+
labels:
7+
{{- include "library-chart.labels" . | nindent 4 }}
8+
spec:
9+
podSelector:
10+
matchLabels:
11+
app.kubernetes.io/instance: {{ .Release.Name }}
12+
ingress:
13+
- from:
14+
- podSelector: {}
15+
policyTypes:
16+
- Ingress
17+
{{- end }}

‎charts/argo-workflows/templates/networkpolicy-ingress.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{{- if .Values.security.networkPolicy.enabled -}}
2+
{{- if .Values.ingress.enabled -}}
3+
kind: NetworkPolicy
4+
apiVersion: networking.k8s.io/v1
5+
metadata:
6+
name: {{ include "library-chart.fullname" . }}-2
7+
spec:
8+
podSelector:
9+
matchLabels:
10+
app.kubernetes.io/instance: {{ .Release.Name }}
11+
ingress:
12+
- from:
13+
{{- toYaml .Values.security.networkPolicy.from | nindent 4 }}
14+
policyTypes:
15+
- Ingress
16+
{{- end }}
17+
{{- end }}

‎charts/argo-workflows/values.schema.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,21 @@
4545
}
4646
}
4747
}
48+
},
49+
"networkPolicy": {
50+
"type": "object",
51+
"description": "Define access policy to the service",
52+
"properties": {
53+
"enabled": {
54+
"type": "boolean",
55+
"title": "Enable network policy",
56+
"description": "Only pod from the same namespace will be allowed",
57+
"default": true,
58+
"x-form": {
59+
"value": "{{region.defaultNetworkPolicy}}"
60+
}
61+
}
62+
}
4863
}
4964
}
5065
},

‎charts/argo-workflows/values.yaml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,16 @@ ingress:
1010
# - chart-example.local
1111

1212
security:
13-
allowlist:
14-
enabled: true
15-
ip: "0.0.0.0/0"
13+
allowlist:
14+
enabled: true
15+
ip: "0.0.0.0/0"
16+
networkPolicy:
17+
enabled: true
18+
from:
19+
- ipBlock:
20+
cidr: 10.233.103.0/32
21+
- ipBlock:
22+
cidr: 10.233.111.0/32
1623

1724
serviceAccount:
1825
create: true

0 commit comments

Comments
 (0)