Skip to content

Commit 5ea71e8

Browse files
committed
apply labels and required network policies
1 parent 65f9069 commit 5ea71e8

File tree

6 files changed

+41
-6
lines changed

6 files changed

+41
-6
lines changed

config/buildless-serverless/templates/deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spec:
2121
labels:
2222
control-plane: controller-manager
2323
networking.kyma-project.io/to-apiserver: allowed
24+
networking.kyma-project.io/from-serverless: allowed
2425
spec:
2526
containers:
2627
- args:

config/serverless/templates/egress-network-policy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ kind: NetworkPolicy
22
apiVersion: networking.k8s.io/v1
33
metadata:
44
namespace: {{ .Release.Namespace }}
5-
name: {{ template "fullname" . }}.kyma-project.io--allow-all-egress
5+
name: {{ template "fullname" . }}.kyma-project.io--allow-all-egress-from-controllers
66
spec:
77
podSelector:
88
matchLabels:
99
kyma-project.io/module: serverless
10-
app.kubernetes.io/name: serverless
10+
networking.kyma-project.io/from-serverless: allowed
1111
policyTypes:
1212
- Egress
1313
egress:

config/serverless/templates/ingress-network-policy.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ spec:
1212
- Ingress
1313
ingress:
1414
- from:
15-
- podSelector:
16-
matchLabels:
17-
serverless.kyma-project.io/managed-by: function-controller
18-
- ports:
15+
# - podSelector:
16+
# matchLabels:
17+
# serverless.kyma-project.io/managed-by: function-controller
18+
ports:
1919
- protocol: TCP
2020
port: {{ .Values.global.registryServicePort }}

config/serverless/values.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ deployment:
131131
pod:
132132
labels:
133133
networking.kyma-project.io/to-apiserver: allowed
134+
networking.kyma-project.io/from-serverless: allowed
134135
annotations:
135136
sidecar.istio.io/inject: "false"
136137
prometheus.io/scrape: "false"

tests/serverless/internal/resources/runtimes/python.go

+3
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ def main(event, context):
153153
},
154154
},
155155
Env: []v1.EnvVar{},
156+
Labels: map[string]string{
157+
"app.kubernetes.io/name": "eventing-publisher-proxy",
158+
},
156159
ResourceConfiguration: &serverlessv1alpha2.ResourceConfiguration{
157160
Function: &serverlessv1alpha2.ResourceRequirements{
158161
Profile: "L",

tests/serverless/internal/testsuite/cloud_events.go

+30
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,33 @@ func FunctionCloudEventsTest(restConfig *rest.Config, cfg internal.Config, logf
7979
),
8080
), nil
8181
}
82+
83+
// Define those as part of this test:
84+
85+
// kind: NetworkPolicy
86+
// apiVersion: networking.k8s.io/v1
87+
// metadata:
88+
// namespace: kyma-system
89+
// name: temp1
90+
// spec:
91+
// podSelector:
92+
// matchLabels:
93+
// serverless.kyma-project.io/managed-by: function-controller
94+
// policyTypes:
95+
// - Egress
96+
// egress:
97+
// - {}
98+
// ---
99+
// apiVersion: networking.k8s.io/v1
100+
// kind: NetworkPolicy
101+
// metadata:
102+
// namespace: kyma-system
103+
// name: temp2
104+
// spec:
105+
// podSelector:
106+
// matchLabels:
107+
// app.kubernetes.io/name: eventing-publisher-proxy
108+
// policyTypes:
109+
// - Ingress
110+
// ingress:
111+
// - {}

0 commit comments

Comments
 (0)