Skip to content

Commit 0285328

Browse files
authored
[mck] release 1.1 (#413)
1 parent bde2d49 commit 0285328

File tree

5 files changed

+41
-9
lines changed

5 files changed

+41
-9
lines changed

charts/mongodb-kubernetes/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: mongodb-kubernetes
33
description: MongoDB Controllers for Kubernetes translate the human knowledge of creating
44
a MongoDB instance into a scalable, repeatable, and standardized method.
5-
version: 1.0.1
5+
version: 1.1.0
66
kubeVersion: '>=1.16-0'
77
type: application
88
keywords:

charts/mongodb-kubernetes/templates/operator-roles.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,14 @@ rules:
8484
- opsmanagers/finalizers
8585
- mongodbmulticluster
8686
- mongodbmulticluster/finalizers
87+
- mongodbsearch
88+
- mongodbsearch/finalizers
8789
{{- if .Values.subresourceEnabled }}
8890
- mongodb/status
8991
- mongodbusers/status
9092
- opsmanagers/status
9193
- mongodbmulticluster/status
94+
- mongodbsearch/status
9295
{{- end }}
9396
{{- if eq $roleScope "ClusterRole" }}
9497
- apiGroups:

charts/mongodb-kubernetes/templates/operator.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,18 @@ spec:
249249
- name: RELATED_IMAGE_{{ $mongodbImageEnv }}_{{ $version | replace "." "_" | replace "-" "_" }}
250250
value: "{{ $.Values.mongodb.repo }}/{{ $.Values.mongodb.name }}:{{ $version }}"
251251
{{- end }}
252+
{{- if .Values.search }}
253+
- name: RELATED_IMAGE_MDB_SEARCH_IMAGE_{{ .Values.search.community.version | replace "." "_" | replace "-" "_" }}
254+
value: "{{ .Values.search.community.repo }}/{{ .Values.search.community.name }}:{{ $.Values.search.community.version }}"
255+
{{- end }}
256+
{{- end }}
257+
{{- if .Values.search }}
258+
- name: MDB_SEARCH_COMMUNITY_REPO_URL
259+
value: "{{ .Values.search.community.repo }}"
260+
- name: MDB_SEARCH_COMMUNITY_NAME
261+
value: "{{ .Values.search.community.name }}"
262+
- name: MDB_SEARCH_COMMUNITY_VERSION
263+
value: "{{ .Values.search.community.version }}"
252264
{{- end }}
253265
{{- if .Values.customEnvVars }}
254266
{{- range split "&" .Values.customEnvVars }}
@@ -278,5 +290,3 @@ spec:
278290
{{- toYaml . | nindent 8 }}
279291
{{- end }}
280292
{{- end }}
281-
282-

charts/mongodb-kubernetes/values-openshift.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ operator:
2727
# Environment variables prefixed with RELATED_IMAGE_ are used by operator-sdk to generate relatedImages section
2828
# with sha256 digests pinning for the certified operator bundle with disconnected environment feature enabled.
2929
# https://docs.openshift.com/container-platform/4.14/operators/operator_sdk/osdk-generating-csvs.html#olm-enabling-operator-for-restricted-network_osdk-generating-csvs
30-
version: 1.0.1
30+
version: 1.1.0
3131
relatedImages:
3232
opsManager:
3333
- 6.0.25
@@ -94,31 +94,40 @@ relatedImages:
9494
- 107.0.13.8702-1
9595
- 107.0.13.8702-1_1.0.0
9696
- 107.0.13.8702-1_1.0.1
97+
- 107.0.13.8702-1_1.1.0
9798
- 107.0.15.8741-1
9899
- 107.0.15.8741-1_1.0.0
99100
- 107.0.15.8741-1_1.0.1
101+
- 107.0.15.8741-1_1.1.0
100102
- 108.0.2.8729-1
101103
- 108.0.4.8770-1
102104
- 108.0.4.8770-1_1.0.0
103105
- 108.0.4.8770-1_1.0.1
106+
- 108.0.4.8770-1_1.1.0
104107
- 108.0.6.8796-1
105108
- 108.0.6.8796-1_1.0.0
106109
- 108.0.6.8796-1_1.0.1
110+
- 108.0.6.8796-1_1.1.0
107111
- 108.0.7.8810-1
108112
- 108.0.7.8810-1_1.0.0
109113
- 108.0.7.8810-1_1.0.1
114+
- 108.0.7.8810-1_1.1.0
110115
- 12.0.33.7866-1
111116
- 12.0.33.7866-1_1.0.0
112117
- 12.0.33.7866-1_1.0.1
118+
- 12.0.33.7866-1_1.1.0
113119
- 12.0.34.7888-1
114120
- 12.0.34.7888-1_1.0.0
115121
- 12.0.34.7888-1_1.0.1
122+
- 12.0.34.7888-1_1.1.0
116123
- 12.0.35.7911-1
117124
- 12.0.35.7911-1_1.0.0
118125
- 12.0.35.7911-1_1.0.1
126+
- 12.0.35.7911-1_1.1.0
119127
- 13.34.0.9465-1
120128
- 13.34.0.9465-1_1.0.0
121129
- 13.34.0.9465-1_1.0.1
130+
- 13.34.0.9465-1_1.1.0
122131
mongodbLegacyAppDb:
123132
- 4.2.11-ent
124133
- 4.2.2-ent

charts/mongodb-kubernetes/values.yaml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ operator:
2222
deployment_name: mongodb-kubernetes-operator
2323

2424
# Version of mongodb-kubernetes-operator
25-
version: 1.0.1
25+
version: 1.1.0
2626

2727
# The Custom Resources that will be watched by the Operator. Needs to be changed if only some of the CRDs are installed
2828
watchedResources:
2929
- mongodb
3030
- opsmanagers
3131
- mongodbusers
3232
- mongodbcommunity
33+
- mongodbsearch
3334

3435
nodeSelector: {}
3536

@@ -117,24 +118,24 @@ operator:
117118
## Database
118119
database:
119120
name: mongodb-kubernetes-database
120-
version: 1.0.1
121+
version: 1.1.0
121122

122123
initDatabase:
123124
name: mongodb-kubernetes-init-database
124-
version: 1.0.1
125+
version: 1.1.0
125126

126127
## Ops Manager
127128
opsManager:
128129
name: mongodb-enterprise-ops-manager-ubi
129130

130131
initOpsManager:
131132
name: mongodb-kubernetes-init-ops-manager
132-
version: 1.0.1
133+
version: 1.1.0
133134

134135
## Application Database
135136
initAppDb:
136137
name: mongodb-kubernetes-init-appdb
137-
version: 1.0.1
138+
version: 1.1.0
138139

139140
agent:
140141
name: mongodb-agent-ubi
@@ -214,3 +215,12 @@ community:
214215
certManager:
215216
certDuration: 8760h # 365 days
216217
renewCertBefore: 720h # 30 days
218+
219+
# MongoDBSearch settings
220+
search:
221+
community:
222+
# Full Search container image url used for the MongoDB Community Search container will be constructed as {search.community.repo}/{search.community.name}:{search.community.version}
223+
repo: quay.io/mongodb
224+
name: mongodb-search-community
225+
# default MongoDB Search version used; can be overridden by setting MongoDBSearch.spec.version field.
226+
version: 1.47.0

0 commit comments

Comments
 (0)