Skip to content

Commit ca24d93

Browse files
authored
Fix precommit, CLI tests, and image suffixes (#195)
# Summary The precommit was not running the CLI test that generated the RBAC yaml. The CLI test generating the RBAC yaml used broken relative paths. Removed the -ubi suffix from local testing. ## Proof of Work The RBAC yaml has been modified with the precommit. ## Checklist - [ ] Have you linked a jira ticket and/or is the ticket in the title? - [ ] Have you checked whether your jira ticket required DOCSP changes? - [ ] Have you checked for release_note changes?
1 parent 5e913db commit ca24d93

File tree

14 files changed

+218
-83
lines changed

14 files changed

+218
-83
lines changed

.githooks/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function regenerate_public_rbac_multi_cluster() {
113113
if echo "$git_last_changed" | grep -q 'public/tools/multicluster'; then
114114
echo 'regenerating multicluster RBAC public example'
115115
pushd public/tools/multicluster
116-
EXPORT_RBAC_SAMPLES="true" go test -run TestPrintingOutRolesServiceAccountsAndRoleBindings
116+
EXPORT_RBAC_SAMPLES="true" go test ./... -run TestPrintingOutRolesServiceAccountsAndRoleBindings
117117
popd
118118
git add public/samples/multi-cluster-cli-gitops
119119
fi

docker/mongodb-kubernetes-tests/tests/conftest.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,7 @@ def intermediate_issuer(cert_manager: str, issuer: str, namespace: str) -> str:
261261
This fixture creates an intermediate "Issuer" in the testing namespace
262262
"""
263263
# Create the Certificate for the intermediate CA based on the issuer fixture
264-
from kubetester.certs import (
265-
Certificate,
266-
Issuer,
267-
)
264+
from kubetester.certs import Certificate, Issuer
268265

269266
intermediate_ca_cert = Certificate(namespace=namespace, name="intermediate-ca-issuer")
270267
intermediate_ca_cert["spec"] = {
@@ -1418,10 +1415,7 @@ def create_issuer(
14181415
else:
14191416
raise e
14201417

1421-
from kubetester.certs import (
1422-
ClusterIssuer,
1423-
Issuer,
1424-
)
1418+
from kubetester.certs import ClusterIssuer, Issuer
14251419

14261420
# And then creates the Issuer
14271421
if clusterwide:

docker/mongodb-kubernetes-tests/tests/multicluster/multi_cluster_tls_with_x509.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33

44
import kubernetes
55
from kubetester.automation_config_tester import AutomationConfigTester
6-
from kubetester.certs import (
7-
Certificate,
8-
create_multi_cluster_x509_user_cert,
9-
)
6+
from kubetester.certs import Certificate, create_multi_cluster_x509_user_cert
107
from kubetester.certs_mongodb_multi import (
118
create_multi_cluster_mongodb_x509_tls_certs,
129
create_multi_cluster_x509_agent_certs,

docker/mongodb-kubernetes-tests/tests/multicluster_om/multicluster_om_appdb_no_mesh.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
from kubernetes import client
1111
from kubetester import create_or_update_configmap, create_or_update_service, try_load
1212
from kubetester.awss3client import AwsS3Client
13-
from kubetester.certs import (
14-
create_ops_manager_tls_certs,
15-
)
13+
from kubetester.certs import create_ops_manager_tls_certs
1614
from kubetester.certs_mongodb_multi import create_multi_cluster_mongodb_tls_certs
1715
from kubetester.kubetester import KubernetesTester, ensure_ent_version
1816
from kubetester.kubetester import fixture as _fixture

docker/mongodb-kubernetes-tests/tests/olm/olm_meko_operator_upgrade_with_resources.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import kubernetes
22
import pytest
33
from kubeobject import CustomObject
4-
from kubetester import (
5-
create_or_update_secret,
6-
get_default_storage_class,
7-
try_load,
8-
)
4+
from kubetester import create_or_update_secret, get_default_storage_class, try_load
95
from kubetester.awss3client import AwsS3Client
106
from kubetester.certs import create_sharded_cluster_certs
117
from kubetester.kubetester import ensure_ent_version

docker/mongodb-kubernetes-tests/tests/olm/olm_operator_upgrade_with_resources.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import kubernetes
22
import pytest
33
from kubeobject import CustomObject
4-
from kubetester import (
5-
create_or_update_secret,
6-
get_default_storage_class,
7-
try_load,
8-
)
4+
from kubetester import create_or_update_secret, get_default_storage_class, try_load
95
from kubetester.awss3client import AwsS3Client
106
from kubetester.certs import create_sharded_cluster_certs
117
from kubetester.kubetester import ensure_ent_version

docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_restore_minio.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
from pymongo import ReadPreference
2121
from pytest import fixture, mark
2222
from tests.common.cert.cert_issuer import create_appdb_certs
23-
from tests.conftest import (
24-
assert_data_got_restored,
25-
is_multi_cluster,
26-
)
23+
from tests.conftest import assert_data_got_restored, is_multi_cluster
2724
from tests.opsmanager.conftest import mino_operator_install, mino_tenant_install
2825
from tests.opsmanager.om_ops_manager_backup import S3_SECRET_NAME
2926
from tests.opsmanager.om_ops_manager_backup_tls_custom_ca import (

docker/mongodb-kubernetes-tests/tests/opsmanager/om_ops_manager_backup_tls.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
from kubetester.phase import Phase
1010
from pytest import fixture, mark
1111
from tests.common.cert.cert_issuer import create_appdb_certs
12-
from tests.conftest import (
13-
get_member_cluster_api_client,
14-
is_multi_cluster,
15-
)
12+
from tests.conftest import get_member_cluster_api_client, is_multi_cluster
1613
from tests.opsmanager.om_ops_manager_backup import (
1714
BLOCKSTORE_RS_NAME,
1815
OPLOG_RS_NAME,

public/samples/multi-cluster-cli-gitops/resources/rbac/cluster_scoped_central_cluster.yaml

Lines changed: 72 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,18 @@ rules:
2121
- mongodb
2222
- mongodb/finalizers
2323
- mongodb/status
24+
- mongodbsearch
25+
- mongodbsearch/finalizers
26+
- mongodbsearch/status
27+
verbs:
28+
- '*'
29+
- apiGroups:
30+
- mongodbcommunity.mongodb.com
31+
resources:
32+
- mongodbcommunity
33+
- mongodbcommunity/status
34+
- mongodbcommunity/spec
35+
- mongodbcommunity/finalizers
2436
verbs:
2537
- '*'
2638
- apiGroups:
@@ -49,6 +61,17 @@ rules:
4961
- delete
5062
- watch
5163
- deletecollection
64+
- apiGroups:
65+
- ""
66+
resources:
67+
- persistentvolumeclaims
68+
verbs:
69+
- get
70+
- list
71+
- create
72+
- update
73+
- watch
74+
- patch
5275
- apiGroups:
5376
- ""
5477
resources:
@@ -57,6 +80,8 @@ rules:
5780
- get
5881
- list
5982
- watch
83+
- delete
84+
- deletecollection
6085
- apiGroups:
6186
- ""
6287
resources:
@@ -65,6 +90,34 @@ rules:
6590
- list
6691
- watch
6792

93+
---
94+
apiVersion: rbac.authorization.k8s.io/v1
95+
kind: ClusterRole
96+
metadata:
97+
creationTimestamp: null
98+
labels:
99+
multi-cluster: "true"
100+
name: mongodb-kubernetes-operator-multi-cluster-role-telemetry
101+
rules:
102+
- apiGroups:
103+
- ""
104+
resources:
105+
- nodes
106+
verbs:
107+
- list
108+
- apiGroups:
109+
- ""
110+
resourceNames:
111+
- kube-system
112+
resources:
113+
- namespaces
114+
verbs:
115+
- get
116+
- nonResourceURLs:
117+
- /version
118+
verbs:
119+
- get
120+
68121
---
69122
# Central Cluster, cluster-scoped resources
70123
apiVersion: rbac.authorization.k8s.io/v1
@@ -80,20 +133,35 @@ roleRef:
80133
name: mongodb-kubernetes-operator-multi-cluster-role
81134
subjects:
82135
- kind: ServiceAccount
83-
name: test-service-account
136+
name: mongodb-kubernetes-operator-multicluster
137+
namespace: central-namespace
138+
139+
---
140+
apiVersion: rbac.authorization.k8s.io/v1
141+
kind: ClusterRoleBinding
142+
metadata:
143+
creationTimestamp: null
144+
labels:
145+
multi-cluster: "true"
146+
name: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding
147+
roleRef:
148+
apiGroup: rbac.authorization.k8s.io
149+
kind: ClusterRole
150+
name: mongodb-kubernetes-operator-multi-cluster-role-telemetry
151+
subjects:
152+
- kind: ServiceAccount
153+
name: mongodb-kubernetes-operator-multicluster
84154
namespace: central-namespace
85155

86156
---
87157
# Central Cluster, cluster-scoped resources
88158
apiVersion: v1
89159
kind: ServiceAccount
90-
imagePullSecrets:
91-
- name: image-registries-secret
92160
metadata:
93161
creationTimestamp: null
94162
labels:
95163
multi-cluster: "true"
96-
name: test-service-account
164+
name: mongodb-kubernetes-operator-multicluster
97165
namespace: central-namespace
98166

99167
---

public/samples/multi-cluster-cli-gitops/resources/rbac/cluster_scoped_member_cluster.yaml

Lines changed: 76 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,17 @@ rules:
3333
- delete
3434
- watch
3535
- deletecollection
36+
- apiGroups:
37+
- ""
38+
resources:
39+
- persistentvolumeclaims
40+
verbs:
41+
- get
42+
- list
43+
- create
44+
- update
45+
- watch
46+
- patch
3647
- apiGroups:
3748
- ""
3849
resources:
@@ -41,13 +52,61 @@ rules:
4152
- get
4253
- list
4354
- watch
55+
- delete
56+
- deletecollection
4457
- apiGroups:
4558
- ""
4659
resources:
4760
- namespaces
4861
verbs:
4962
- list
5063
- watch
64+
- apiGroups:
65+
- ""
66+
resources:
67+
- nodes
68+
verbs:
69+
- get
70+
- apiGroups:
71+
- ""
72+
resourceNames:
73+
- kube-system
74+
resources:
75+
- namespaces
76+
verbs:
77+
- get
78+
- nonResourceURLs:
79+
- /version
80+
verbs:
81+
- get
82+
83+
---
84+
apiVersion: rbac.authorization.k8s.io/v1
85+
kind: ClusterRole
86+
metadata:
87+
creationTimestamp: null
88+
labels:
89+
multi-cluster: "true"
90+
name: mongodb-kubernetes-operator-multi-cluster-role-telemetry
91+
rules:
92+
- apiGroups:
93+
- ""
94+
resources:
95+
- nodes
96+
verbs:
97+
- list
98+
- apiGroups:
99+
- ""
100+
resourceNames:
101+
- kube-system
102+
resources:
103+
- namespaces
104+
verbs:
105+
- get
106+
- nonResourceURLs:
107+
- /version
108+
verbs:
109+
- get
51110

52111
---
53112
# Member Cluster, cluster-scoped resources
@@ -64,28 +123,35 @@ roleRef:
64123
name: mongodb-kubernetes-operator-multi-cluster-role
65124
subjects:
66125
- kind: ServiceAccount
67-
name: test-service-account
68-
namespace: member-namespace
126+
name: mongodb-kubernetes-operator-multicluster
127+
namespace: central-namespace
69128

70129
---
71-
# Member Cluster, cluster-scoped resources
72-
apiVersion: v1
73-
kind: ServiceAccount
130+
apiVersion: rbac.authorization.k8s.io/v1
131+
kind: ClusterRoleBinding
74132
metadata:
75133
creationTimestamp: null
76134
labels:
77135
multi-cluster: "true"
78-
name: mongodb-enterprise-appdb
79-
namespace: member-namespace
136+
name: mongodb-kubernetes-operator-multi-telemetry-cluster-role-binding
137+
roleRef:
138+
apiGroup: rbac.authorization.k8s.io
139+
kind: ClusterRole
140+
name: mongodb-kubernetes-operator-multi-cluster-role-telemetry
141+
subjects:
142+
- kind: ServiceAccount
143+
name: mongodb-kubernetes-operator-multicluster
144+
namespace: central-namespace
80145

81146
---
147+
# Member Cluster, cluster-scoped resources
82148
apiVersion: v1
83149
kind: ServiceAccount
84150
metadata:
85151
creationTimestamp: null
86152
labels:
87153
multi-cluster: "true"
88-
name: mongodb-enterprise-database-pods
154+
name: mongodb-kubernetes-appdb
89155
namespace: member-namespace
90156

91157
---
@@ -95,19 +161,17 @@ metadata:
95161
creationTimestamp: null
96162
labels:
97163
multi-cluster: "true"
98-
name: mongodb-enterprise-ops-manager
164+
name: mongodb-kubernetes-database-pods
99165
namespace: member-namespace
100166

101167
---
102168
apiVersion: v1
103169
kind: ServiceAccount
104-
imagePullSecrets:
105-
- name: image-registries-secret
106170
metadata:
107171
creationTimestamp: null
108172
labels:
109173
multi-cluster: "true"
110-
name: test-service-account
174+
name: mongodb-kubernetes-ops-manager
111175
namespace: member-namespace
112176

113177
---

0 commit comments

Comments
 (0)