Skip to content

Commit a0637d7

Browse files
committed
Rebase and deployment permission fix
1 parent 7b1682f commit a0637d7

11 files changed

Lines changed: 14 additions & 7 deletions

File tree

controllers/searchcontroller/enterprise_search_source_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import (
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
99

1010
mdbv1 "github.com/mongodb/mongodb-kubernetes/api/v1/mdb"
11+
searchv1 "github.com/mongodb/mongodb-kubernetes/api/v1/search"
12+
"github.com/mongodb/mongodb-kubernetes/api/v1/status"
13+
userv1 "github.com/mongodb/mongodb-kubernetes/api/v1/user"
1114
)
1215

1316
func newEnterpriseSearchSource(version string, topology string, resourceType mdbv1.ResourceType, authModes []string, internalClusterAuth string) EnterpriseResourceSearchSource {

docs/search/01-search-community-deploy/code_snippets/01_0308_issue_tls_certificates.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mongo_dns_names+=(
1212
)
1313

1414
search_dns_names=(
15-
"${MDB_RESOURCE_NAME}-search-svc.${MDB_NS}.svc.cluster.local"
15+
"${MDB_RESOURCE_NAME}-search-0-svc.${MDB_NS}.svc.cluster.local"
1616
)
1717

1818
render_dns_list() {

docs/search/02-search-enterprise-deploy/code_snippets/02_0304_generate_tls_certificates.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mongo_dns_names+=(
1212
)
1313

1414
search_dns_names=(
15-
"${MDB_RESOURCE_NAME}-search-svc.${MDB_NS}.svc.cluster.local"
15+
"${MDB_RESOURCE_NAME}-search-0-svc.${MDB_NS}.svc.cluster.local"
1616
)
1717

1818
render_dns_list() {

docs/search/04-search-external-mongod/code_snippets/04_0307_issue_tls_certificates.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ mongo_dns_names+=("${MDB_RESOURCE_NAME}-svc.${MDB_NS}.svc.cluster.local" "*.${MD
1414
search_dns_names=(
1515
"${MDB_SEARCH_SERVICE_NAME}"
1616
"${MDB_SEARCH_SERVICE_NAME}.${MDB_NS}.svc.cluster.local"
17-
"${MDB_SEARCH_SERVICE_NAME}-search-svc.${MDB_NS}.svc.cluster.local"
18-
"*.${MDB_SEARCH_SERVICE_NAME}-search-svc.${MDB_NS}.svc.cluster.local"
17+
"${MDB_SEARCH_SERVICE_NAME}-search-0-svc.${MDB_NS}.svc.cluster.local"
18+
"*.${MDB_SEARCH_SERVICE_NAME}-search-0-svc.${MDB_NS}.svc.cluster.local"
1919
)
2020
[[ -n "${MDB_SEARCH_HOSTNAME}" ]] && search_dns_names+=("${MDB_SEARCH_HOSTNAME}")
2121

docs/search/04-search-external-mongod/code_snippets/04_0322_create_search_loadbalancer_service.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
spec:
77
type: LoadBalancer
88
selector:
9-
app: ${MDB_SEARCH_RESOURCE_NAME:-mdbs}-search-svc
9+
app: ${MDB_SEARCH_RESOURCE_NAME:-mdbs}-search-0-svc
1010
ports:
1111
- name: mongot
1212
port: 27028
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
echo; echo "MongoDBSearch resource"
22
kubectl --context "${K8S_CTX}" -n "${MDB_NS}" get mdbs/mdbs
33
echo; echo "Search pods running in cluster ${K8S_CTX}"
4-
kubectl --context "${K8S_CTX}" -n "${MDB_NS}" get pods -l app=mdbs-search-svc
4+
kubectl --context "${K8S_CTX}" -n "${MDB_NS}" get pods -l app=mdbs-search-0-svc
55
echo; echo "All pods in namespace ${MDB_NS}"
66
kubectl --context "${K8S_CTX}" -n "${MDB_NS}" get pods

pkg/kubectl-mongodb/common/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ func getMemberRules() []rbacv1.PolicyRule {
437437
},
438438
{
439439
Verbs: []string{"get", "list", "create", "update", "delete", "watch", "deletecollection"},
440-
Resources: []string{"statefulsets"},
440+
Resources: []string{"statefulsets", "deployments"},
441441
APIGroups: []string{"apps"},
442442
},
443443
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ rules:
6969
- apps
7070
resources:
7171
- statefulsets
72+
- deployments
7273
verbs:
7374
- get
7475
- list

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ rules:
2525
- apps
2626
resources:
2727
- statefulsets
28+
- deployments
2829
verbs:
2930
- get
3031
- list

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ rules:
5454
- apps
5555
resources:
5656
- statefulsets
57+
- deployments
5758
verbs:
5859
- get
5960
- list

0 commit comments

Comments
 (0)