Skip to content

Commit 3b5ef2d

Browse files
Merge pull request #2868 from ehearne-redhat/add-service-account-network-check-target-networking-console-plugin
OCPBUGS-65633: add network-check-target + networking-console-plugin service accounts
2 parents a57b306 + 2ebfbc8 commit 3b5ef2d

8 files changed

Lines changed: 15 additions & 2 deletions

File tree

bindata/network-diagnostics/001-rbac.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,10 @@ subjects:
129129
- kind: ServiceAccount
130130
name: network-diagnostics
131131
namespace: openshift-network-diagnostics
132+
133+
---
134+
apiVersion: v1
135+
kind: ServiceAccount
136+
metadata:
137+
name: network-check-target
138+
namespace: openshift-network-diagnostics

bindata/network-diagnostics/network-check-target.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
valueFrom:
6464
fieldRef:
6565
fieldPath: spec.nodeName
66-
serviceAccount: default
66+
serviceAccount: network-check-target
6767
terminationGracePeriodSeconds: 10
6868
{{ if .NetworkCheckTargetNodeSelector }}
6969
nodeSelector:
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata:
4+
name: networking-console-plugin
5+
namespace: openshift-network-console
File renamed without changes.

bindata/networking-console-plugin/002-deployment.yaml renamed to bindata/networking-console-plugin/003-deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
topologyKey: kubernetes.io/hostname
5656
weight: 90
5757
{{- end }}
58+
serviceAccount: networking-console-plugin
5859
automountServiceAccountToken: false
5960
containers:
6061
- command:
File renamed without changes.

bindata/networking-console-plugin/004-console-plugin.yaml renamed to bindata/networking-console-plugin/005-console-plugin.yaml

File renamed without changes.

pkg/network/render_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ func Test_renderNetworkDiagnostics(t *testing.T) {
524524
operConf: &operv1.NetworkSpec{DisableNetworkDiagnostics: true},
525525
clusterConf: &configv1.NetworkSpec{NetworkDiagnostics: configv1.NetworkDiagnostics{Mode: configv1.NetworkDiagnosticsAll}},
526526
},
527-
want: 14,
527+
want: 15,
528528
expectedErr: nil,
529529
},
530530
}

0 commit comments

Comments
 (0)