Skip to content

Commit 8ae8013

Browse files
pengzhoumlpengzhouml
authored
Merge pull request #173 from marklogic/release/1.0.2
Merge Release 1.0.2 Branch Cack to Develop
2 parents 3c34089 + 933b53f commit 8ae8013

14 files changed

+236
-54
lines changed

‎Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,4 +250,4 @@ pipeline {
250250
resultNotification('BUILD UNSTABLE ❌')
251251
}
252252
}
253-
}
253+
}

‎NOTICE.txt

Lines changed: 153 additions & 19 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
114114
| `image.tag` | Image tag for MarkLogic image | `11.0.3-centos-1.0.2` |
115115
| `image.pullPolicy` | Image pull policy for MarkLogic image | `IfNotPresent` |
116116
| `initContainerImage.repository` | Repository for initContainer image | `curlimages/curl` |
117-
| `initContainerImage.tag` | Image tag for initContainer image | `7.87.0` |
117+
| `initContainerImage.tag` | Image tag for initContainer image | `8.4.0` |
118118
| `initContainerImage.pullPolicy` | Pull policy for initContainer image | `IfNotPresent` |
119119
| `imagePullSecrets` | Registry secret names as an array | `[]` |
120120
| `resources` | The resource requests and limits for MarkLogic container | `{}` |
@@ -172,7 +172,7 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
172172
| `startupProbe.failureThreshold` | Failure threshold for startup probe | `30` |
173173
| `startupProbe.successThreshold` | Success threshold for startup probe | `1` |
174174
| `logCollection.enabled` | Parameter to enable cluster wide log collection of Marklogic server logs | `false` |
175-
| `logCollection.image` | Image repository and tag for fluent-bit container | `fluent/fluent-bit:2.0.6` |
175+
| `logCollection.image` | Image repository and tag for fluent-bit container | `fluent/fluent-bit:2.1.10` |
176176
| `logCollection.resources.requests.cpu` | The requested cpu resource for the fluent-bit container | `100m` |
177177
| `logCollection.resources.requests.memory` | The requested memory resource for the fluent-bit container | `128Mi` |
178178
| `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.0.1
20+
version: 1.0.2

‎charts/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bootstrapHostName: ""
2828
## Marklogic image parameters
2929
image:
3030
repository: marklogicdb/marklogic-db
31-
tag: 11.0.2-centos-1.0.2
31+
tag: 11.1.0-centos-1.1.1
3232
pullPolicy: IfNotPresent
3333

3434
## Init container image parameters
@@ -303,7 +303,7 @@ startupProbe:
303303
## And export them to a logging backend specified in the outputs section below
304304
logCollection:
305305
enabled: false
306-
image: fluent/fluent-bit:2.0.6
306+
image: fluent/fluent-bit:2.1.10
307307
resources:
308308
requests:
309309
cpu: "100m"

‎makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ e2e-test: prepare
101101
minikube image load $(prevDockerImage)
102102

103103
@echo "=====Running e2e tests"
104-
$(if $(saveOutput),gotestsum --junitfile test/test_results/e2e-tests.xml ./test/e2e/... -count=1 -timeout 45m, go test -v -count=1 -timeout 45m ./test/e2e/...)
104+
$(if $(saveOutput),gotestsum --junitfile test/test_results/e2e-tests.xml ./test/e2e/... -count=1 -timeout 70m, go test -v -count=1 -timeout 70m ./test/e2e/...)
105105

106106
@echo "=====Delete minikube cluster"
107107
minikube delete

‎test/e2e/admin_secrets_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestMlAdminSecrets(t *testing.T) {
5858

5959
podName := releaseName + "-0"
6060
// wait until the pod is in Ready status
61-
k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 15*time.Second)
61+
k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 15, 15*time.Second)
6262

6363
// get corev1.Pod to get logs of a pod
6464
pod := k8s.GetPod(t, kubectlOptions, podName)

‎test/e2e/clustering_test.go

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,34 +65,48 @@ func TestClusterJoin(t *testing.T) {
6565
podName := releaseName + "-1"
6666

6767
// wait until the pod is in Ready status
68-
k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 20*time.Second)
68+
k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 15, 20*time.Second)
6969
tunnel := k8s.NewTunnel(
7070
kubectlOptions, k8s.ResourceTypePod, podName, 8002, 8002)
7171
defer tunnel.Close()
7272
tunnel.ForwardPort(t)
7373

7474
numOfHosts := 0
7575
client := req.C()
76-
resp, err := client.R().
76+
_, err := client.R().
7777
SetDigestAuth(username, password).
7878
SetRetryCount(5).
7979
SetRetryFixedInterval(10 * time.Second).
8080
AddRetryCondition(func(resp *req.Response, err error) bool {
81+
if resp == nil || err != nil {
82+
t.Logf("error in AddRetryCondition: %s", err.Error())
83+
return true
84+
}
85+
if resp.Response == nil {
86+
t.Log("Could not get the Response Object, Retrying...")
87+
return true
88+
}
89+
if resp.Body == nil {
90+
t.Log("Could not get the body for the response, Retrying...")
91+
return true
92+
}
8193
body, err := io.ReadAll(resp.Body)
82-
if err != nil {
83-
t.Logf("error: %s", err.Error())
94+
if body == nil || err != nil {
95+
t.Logf("error in read response body: %s", err.Error())
96+
return true
8497
}
8598
totalHosts := gjson.Get(string(body), `host-default-list.list-items.list-count.value`)
8699
numOfHosts = int(totalHosts.Num)
87100
if numOfHosts != 2 {
88-
t.Log("Waiting for MarkLogic hosts")
101+
t.Log("Number of hosts: " + string(totalHosts.Raw))
102+
t.Log("Waiting for MarkLogic count of MarkLogic hosts to be 2")
89103
}
90104
return numOfHosts != 2
91105
}).
92106
Get("http://localhost:8002/manage/v2/hosts?format=json")
93-
defer resp.Body.Close()
94107

95108
if err != nil {
109+
t.Error("Error getting hosts")
96110
t.Fatalf(err.Error())
97111
}
98112

‎test/e2e/install_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func TestHelmInstall(t *testing.T) {
6060

6161
tlsConfig := tls.Config{}
6262
// wait until the pod is in Ready status
63-
k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 15*time.Second)
63+
k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 15, 15*time.Second)
6464
tunnel7997 := k8s.NewTunnel(kubectlOptions, k8s.ResourceTypePod, podName, 7997, 7997)
6565
defer tunnel7997.Close()
6666
tunnel7997.ForwardPort(t)

‎test/e2e/ready_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func TestMarklogicReady(t *testing.T) {
6767

6868
podName := releaseName + "-0"
6969
// wait until the pod is in Ready status
70-
k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 15*time.Second)
70+
k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 15, 15*time.Second)
7171
tunnel := k8s.NewTunnel(
7272
kubectlOptions, k8s.ResourceTypePod, podName, 8001, 8001)
7373
defer tunnel.Close()

0 commit comments

Comments
 (0)