Skip to content

Commit 435e9c5

Browse files
Fix serviceAccountName placement in test bundles (#2611)
1 parent 0a11019 commit 435e9c5

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

testdata/images/bundles/large-crd-operator/v1.0.0/manifests/largecrdoperator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
labels:
5656
app: largecrdtest
5757
spec:
58+
serviceAccountName: simple-bundle-manager
5859
terminationGracePeriodSeconds: 0
5960
volumes:
6061
- name: scripts
@@ -89,7 +90,6 @@ spec:
8990
port: 80
9091
initialDelaySeconds: 1
9192
periodSeconds: 1
92-
serviceAccountName: simple-bundle-manager
9393
clusterPermissions:
9494
- rules:
9595
- apiGroups:

testdata/images/bundles/own-namespace-operator/v1.0.0/manifests/ownnamespaceoperator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
labels:
5656
app: ownnamespacetest
5757
spec:
58+
serviceAccountName: simple-bundle-manager
5859
terminationGracePeriodSeconds: 0
5960
containers:
6061
- name: busybox
@@ -65,7 +66,6 @@ spec:
6566
securityContext:
6667
runAsUser: 1000
6768
runAsNonRoot: true
68-
serviceAccountName: simple-bundle-manager
6969
clusterPermissions:
7070
- rules:
7171
- apiGroups:

testdata/images/bundles/single-namespace-operator/v1.0.0/manifests/singlenamespaceoperator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
labels:
5656
app: singlenamespacetest
5757
spec:
58+
serviceAccountName: simple-bundle-manager
5859
terminationGracePeriodSeconds: 0
5960
containers:
6061
- name: busybox
@@ -65,7 +66,6 @@ spec:
6566
securityContext:
6667
runAsUser: 1000
6768
runAsNonRoot: true
68-
serviceAccountName: simple-bundle-manager
6969
clusterPermissions:
7070
- rules:
7171
- apiGroups:

testdata/images/bundles/test-operator/v1.0.0/manifests/testoperator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
labels:
5656
app: olme2etest
5757
spec:
58+
serviceAccountName: simple-bundle-manager
5859
terminationGracePeriodSeconds: 0
5960
volumes:
6061
- name: scripts
@@ -89,7 +90,6 @@ spec:
8990
port: 80
9091
initialDelaySeconds: 1
9192
periodSeconds: 1
92-
serviceAccountName: simple-bundle-manager
9393
clusterPermissions:
9494
- rules:
9595
- apiGroups:

testdata/images/bundles/test-operator/v1.0.2/manifests/testoperator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
labels:
5656
app: olme2etest
5757
spec:
58+
serviceAccountName: simple-bundle-manager
5859
terminationGracePeriodSeconds: 0
5960
volumes:
6061
- name: scripts
@@ -65,7 +66,6 @@ spec:
6566
- name: busybox-httpd-container
6667
# This image ref is wrong and should trigger ImagePullBackOff condition
6768
image: wrong/image
68-
serviceAccountName: simple-bundle-manager
6969
clusterPermissions:
7070
- rules:
7171
- apiGroups:

testdata/images/bundles/test-operator/v1.0.3/manifests/testoperator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
labels:
5656
app: olme2etest
5757
spec:
58+
serviceAccountName: simple-bundle-manager
5859
terminationGracePeriodSeconds: 0
5960
volumes:
6061
- name: scripts
@@ -65,7 +66,6 @@ spec:
6566
- name: busybox-httpd-container
6667
# This image ref is wrong and should trigger ImagePullBackOff condition
6768
image: busybox:1.36
68-
serviceAccountName: simple-bundle-manager
6969
clusterPermissions:
7070
- rules:
7171
- apiGroups:

testdata/images/bundles/test-operator/v1.2.0/manifests/testoperator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ spec:
5555
labels:
5656
app: olme2etest
5757
spec:
58+
serviceAccountName: simple-bundle-manager
5859
terminationGracePeriodSeconds: 0
5960
volumes:
6061
- name: scripts
@@ -89,7 +90,6 @@ spec:
8990
port: 80
9091
initialDelaySeconds: 1
9192
periodSeconds: 1
92-
serviceAccountName: simple-bundle-manager
9393
clusterPermissions:
9494
- rules:
9595
- apiGroups:

0 commit comments

Comments
 (0)