Skip to content

Commit 2719103

Browse files
pengzhoumlpengzhouml
authored
Merge pull request #273 from marklogic/release/2.0.0
Merge release 2.0.0 to develop
2 parents 1a1ebae + 5e371ec commit 2719103

36 files changed

+1874
-624
lines changed

‎Jenkinsfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ pipeline {
158158
skipStagesAfterUnstable()
159159
}
160160
triggers {
161-
parameterizedCron( env.BRANCH_NAME == 'develop' ? '''00 04 * * * % IMAGE_SCAN=true;HC_TESTS=true''' : '')
161+
parameterizedCron( env.BRANCH_NAME == 'develop' ? '''00 04 * * * % IMAGE_SCAN=true;HELM_UPGRADE_TESTS=true;HC_TESTS=true''' : '')
162162
}
163163
environment {
164164
dockerRegistry = 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com'
@@ -174,6 +174,8 @@ pipeline {
174174
string(name: 'KUBERNETES_TEST_SELECTION', defaultValue: '...', description: 'Pick one test to run. (e.g. tls_test.go) ... will run all tests.', trim: true)
175175
booleanParam(name: 'HC_TESTS', defaultValue: false, description: 'Run Hub Central E2E UI tests (takes about 3 hours)')
176176
booleanParam(name: 'IMAGE_SCAN', defaultValue: false, description: 'Find and scan dependent Docker images for security vulnerabilities')
177+
booleanParam(name: 'HELM_UPGRADE_TESTS', defaultValue: false, description: 'Run Helm upgrade in E2E tests (runs nightly on develop)')
178+
string(name: 'InitialChartVersion', defaultValue: '1.1.2', description: 'Helm Chart Version to use for upgrade tests. (e.g. 1.1.2)', trim: true)
177179
string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
178180
}
179181

@@ -209,6 +211,16 @@ pipeline {
209211
"""
210212
}
211213
}
214+
stage('Kubernetes-Run-Upgrade-Tests') {
215+
when {
216+
expression { return params.HELM_UPGRADE_TESTS }
217+
}
218+
steps {
219+
sh """
220+
export MINIKUBE_HOME=/space; export KUBECONFIG=/space/.kube-config; export GOPATH=/space/go; export upgradeTest=true; export initialChartVersion=${params.InitialChartVersion}; make upgrade-test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} kubernetesVersion=${params.K8_VERSION} saveOutput=true minikubeMemory=20gb
221+
"""
222+
}
223+
}
212224
stage('Kubernetes-Run-HC-Tests') {
213225
when {
214226
expression { return params.HC_TESTS }

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ Refer to the official Kubernetes documentation for detailed steps on how to [cre
4646

4747
4. Create a `values.yaml` file to customize the settings. Specify the number of pods (one MarkLogic host in this case), add the secret name for the admin credentials (if not using the automatically generated one), and specify the resources that should be allocated to each MarkLiogic pod.
4848

49-
Note: Please ensure to use the latest MarkLogic Docker image for the new implementation as specified in the values.yaml file below. Refer to [https://hub.docker.com/r/marklogicdb/marklogic-db/tags](https://hub.docker.com/r/marklogicdb/marklogic-db/tags) for the latest image available.
49+
Note: Please ensure to use the latest MarkLogic Docker image for the new implementation as specified in the values.yaml file below. Refer to [https://hub.docker.com/r/progressofficial/marklogic-db/tags](https://hub.docker.com/r/progressofficial/marklogic-db/tags) for the latest image available.
5050
```
5151
# Create a single MarkLogic pod
5252
replicaCount: 1
5353
5454
# Marklogic image parameters
5555
# using the latest image 11.0.3-centos-1.0.2
5656
image:
57-
repository: marklogicdb/marklogic-db;
57+
repository: progressofficial/marklogic-db;
5858
tag: 11.0.3-centos-1.0.2
5959
pullPolicy: IfNotPresent
6060
@@ -119,10 +119,10 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
119119
| `group.name` | Group name for joining MarkLogic cluster | `Default` |
120120
| `group.enableXdqpSsl` | SSL encryption for XDQP | `true` |
121121
| `bootstrapHostName` | Host name of MarkLogic bootstrap host (to join a cluster) | `""` |
122-
| `image.repository` | Repository for MarkLogic image | `marklogicdb/marklogic-db` |
123-
| `image.tag` | Image tag for MarkLogic image | `11.2.0-centos-1.1.2` |
122+
| `image.repository` | Repository for MarkLogic image | `progressofficial/marklogic-db` |
123+
| `image.tag` | Image tag for MarkLogic image | `11.3.0-ubi-rootless` |
124124
| `image.pullPolicy` | Image pull policy for MarkLogic image | `IfNotPresent` |
125-
| `initContainers.configureGroup.image` | Image for configureGroup InitContainer | `curlimages/curl:8.6.0` |
125+
| `initContainers.configureGroup.image` | Image for configureGroup InitContainer | `curlimages/curl:8.8.0` |
126126
| `initContainers.configureGroup.pullPolicy` | Pull policy for configureGroup InitContainer | `IfNotPresent` |
127127
| `initContainers.utilContainer.image` | Image for copyCerts and volume permission change for root to rootless upgrade InitContainer | `redhat/ubi9:9.3` |
128128
| `initContainers.utilContainer.pullPolicy` | Pull policy for copyCerts and volume permission change for root to rootless upgrade InitContainer | `IfNotPresent` |
@@ -184,7 +184,7 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
184184
| `readinessProbe.failureThreshold` | Failure threshold for readiness probe | `3` |
185185
| `readinessProbe.successThreshold` | Success threshold for readiness probe | `1` |
186186
| `logCollection.enabled` | Parameter to enable cluster wide log collection of Marklogic server logs | `false` |
187-
| `logCollection.image` | Image repository and tag for fluent-bit container | `fluent/fluent-bit:2.2.2` |
187+
| `logCollection.image` | Image repository and tag for fluent-bit container | `fluent/fluent-bit:3.1.1` |
188188
| `logCollection.resources.requests.cpu` | The requested cpu resource for the fluent-bit container | `100m` |
189189
| `logCollection.resources.requests.memory` | The requested memory resource for the fluent-bit container | `128Mi` |
190190
| `logCollection.resources.limits.cpu` | The cpu resource limit for the fluent-bit container | `100m` |

‎charts/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ keywords:
1717
sources:
1818
- https://github.com/marklogic/marklogic-kubernetes
1919
- https://www.marklogic.com/
20-
version: 1.1.2
20+
version: 2.0.0

0 commit comments

Comments
 (0)