Skip to content

Commit a81bb27

Browse files
authored
netpol name must not end with '-' (#120)
* netpol name cannot end with - * one more redundant - Signed-off-by: Ziv Nevo <[email protected]>
1 parent 600dc4f commit a81bb27

7 files changed

+11
-7
lines changed

pkg/controller/example_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func ExamplePoliciesSynthesizer() {
123123
// "kind": "NetworkPolicy",
124124
// "apiVersion": "networking.k8s.io/v1",
125125
// "metadata": {
126-
// "name": "default-deny-in-namespace-",
126+
// "name": "default-deny-in-namespace",
127127
// "creationTimestamp": null
128128
// },
129129
// "spec": {

pkg/controller/synth_netpols.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,17 @@ func (deployConn *deploymentConnectivity) addEgressRule(
4848

4949
// Generate a default-deny NetworkPolicy for the given namespace
5050
func getNsDefaultDenyPolicy(namespace string) *network.NetworkPolicy {
51+
policyName := "default-deny-in-namespace"
52+
if namespace != "" {
53+
policyName += "-" + namespace
54+
}
5155
return &network.NetworkPolicy{
5256
TypeMeta: metaV1.TypeMeta{
5357
Kind: networkPolicyKind,
5458
APIVersion: networkAPIVersion,
5559
},
5660
ObjectMeta: metaV1.ObjectMeta{
57-
Name: "default-deny-in-namespace-" + namespace,
61+
Name: policyName,
5862
Namespace: namespace,
5963
},
6064
Spec: network.NetworkPolicySpec{

tests/bookinfo/expected_netpol_output.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
"kind": "NetworkPolicy",
306306
"apiVersion": "networking.k8s.io/v1",
307307
"metadata": {
308-
"name": "default-deny-in-namespace-",
308+
"name": "default-deny-in-namespace",
309309
"creationTimestamp": null
310310
},
311311
"spec": {

tests/k8s_wordpress_example/expected_netpol_output.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"kind": "NetworkPolicy",
106106
"apiVersion": "networking.k8s.io/v1",
107107
"metadata": {
108-
"name": "default-deny-in-namespace-",
108+
"name": "default-deny-in-namespace",
109109
"creationTimestamp": null
110110
},
111111
"spec": {

tests/onlineboutique/expected_netpol_interface_output.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@
855855
"kind": "NetworkPolicy",
856856
"apiVersion": "networking.k8s.io/v1",
857857
"metadata": {
858-
"name": "default-deny-in-namespace-",
858+
"name": "default-deny-in-namespace",
859859
"creationTimestamp": null
860860
},
861861
"spec": {

tests/onlineboutique/expected_netpol_output.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@
859859
"kind": "NetworkPolicy",
860860
"apiVersion": "networking.k8s.io/v1",
861861
"metadata": {
862-
"name": "default-deny-in-namespace-",
862+
"name": "default-deny-in-namespace",
863863
"creationTimestamp": null
864864
},
865865
"spec": {

tests/onlineboutique/expected_netpol_output.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ items:
406406
kind: NetworkPolicy
407407
metadata:
408408
creationTimestamp: null
409-
name: default-deny-in-namespace-
409+
name: default-deny-in-namespace
410410
spec:
411411
podSelector: {}
412412
policyTypes:

0 commit comments

Comments
 (0)