Merge remote-tracking branch 'origin/develop' into feature/CLD-596

Author: Barkha Choithani

Jenkinsfile

@@ -115,11 +115,7 @@ void resultNotification(message) {
 
 void lint() {
     sh '''
-        # Added to fix 'Context loading failed error'
-        go get ./...
-        echo Installing golangci-lint
-        curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.0
-        make lint saveOutput=true path=./bin/
+        make lint saveOutput=true
     '''
 
     LINT_OUTPUT = sh(returnStdout: true, script: 'echo helm template lint output: ;cat helm-lint-output.txt ;echo all tests lint output: ;cat test-lint-output.txt').trim()
@@ -143,6 +139,17 @@ void pullImage() {
     }
 }
 
+String getVersionDiv(mlVersion) {
+    switch (mlVersion) {
+        case '10.0':
+            return '-'
+        case '9.0':
+            return '-'
+        default:
+            return '.'
+    }
+}
+
 pipeline {
     agent {
         label {
@@ -161,13 +168,15 @@ pipeline {
         timeStamp = sh(returnStdout: true, script: "date +%Y%m%d -d '-5 hours'").trim()
         dockerRegistry = 'ml-docker-dev.marklogic.com'
         dockerRepository = "${dockerRegistry}/marklogic/marklogic-server-centos"
-        dockerVersion = "${ML_VERSION}-${timeStamp}-centos-1.0.0"
+        dockerVerDivider = getVersionDiv(params.ML_VERSION)
+        dockerVersion = "${ML_VERSION}${dockerVerDivider}${timeStamp}-centos-${dockerReleaseVer}"
     }
 
     parameters {
         string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
-        choice(name: 'ML_VERSION', choices: '10.0\n11.0\n9.0', description: 'MarkLogic version. used to pick appropriate docker image')
+        choice(name: 'ML_VERSION', choices: '11.0\n12.0\n10.0\n9.0', description: 'MarkLogic version. used to pick appropriate docker image')
         booleanParam(name: 'KUBERNETES_TESTS', defaultValue: true, description: 'Run kubernetes tests')
+        string(name: 'dockerReleaseVer', defaultValue: '1.0.1', description: 'Current Docker version. (e.g. 1.0.1)', trim: true)
     }
 
     stages {

charts/templates/NOTES.txt

@@ -0,0 +1,41 @@
+{{- define "marklogic.fqdn" -}}
+{{- printf "%s-0.%s.%s.svc.cluster.local" (include "marklogic.fullname" .) (include "marklogic.headlessServiceName" .) .Release.Namespace }}
+{{- end}}
+
+Thank you for installing {{ .Chart.Name }}.
+
+Your release is named {{ .Release.Name }}.
+
+FQDN is {{ include "marklogic.fqdn" . }}
+
+Group {{ .Values.group.name }} is created on the MarkLogic cluster.
+
+{{- if .Values.group.enableXdqpSsl }}
+xdqp-ssl-enabled is turned on for {{ .Values.group.name }} group.
+{{- else }}
+xdqp-ssl-enabled is turned off for {{ .Values.group.name }} group.
+{{- end }}
+
+To get pods in the {{ .Release.Namespace }} namespace, try:
+
+    $ kubectl get pods --namespace={{ .Release.Namespace }}
+
+To get all services in the {{ .Release.Namespace }} namespace, try:
+
+    $ kubectl get services --namespace={{ .Release.Namespace }}
+
+To get admin credentials of the MarkLogic cluster, run:
+
+    $ kubectl get secret {{ include "marklogic.fullname" . }}-admin -o jsonpath='{.data.password}' | base64 --decode
+
+To connect to the {{ .Chart.Name }} cluster, use port forwarding:
+
+    To access the whole cluster, forward the port to the service:
+
+        $ kubectl port-forward svc/{{ include "marklogic.fullname" . }} 8001:8001
+
+    To access first pod, forward the port to the pod using:
+
+        $ kubectl port-forward {{ include "marklogic.fullname" . }}-0 8001:8001
+
+    MarkLogic admin UI can be accessed at http://localhost:8001

charts/values.yaml

@@ -25,7 +25,7 @@ image:
 # Init container image parameters
 initContainerImage:
   repository: curlimages/curl
-  tag: 7.85.0
+  tag: 7.87.0
   pullPolicy: IfNotPresent
 
 # Configure the imagePullSecret to pull the image from private repository that requires credential
@@ -144,7 +144,7 @@ startupProbe:
 # And export them to a logging backend specified in the outputs section below
 logCollection:
   enabled: false
-  image: fluent/fluent-bit:1.9.7
+  image: fluent/fluent-bit:2.0.6
   resources:
     requests:
       cpu: "100m"

makefile

@@ -70,7 +70,7 @@ lint:
 	helm lint --with-subcharts charts/ $(if $(saveOutput),> helm-lint-output.txt,)
 
 	@echo "> Linting all tests....."
-	$(if $(path),$(path),)golangci-lint run $(if $(saveOutput),> test-lint-output.txt,)
+	golangci-lint run --timeout=2m $(if $(saveOutput),> test-lint-output.txt,)
 
 ## ---------- Testing Tasks ----------
 

test/template/template_test.go

@@ -90,7 +90,7 @@ func TestChartTemplateLogCollection(t *testing.T) {
 
 	// Verify the image matches
 	expectedImage1 := "marklogicdb/marklogic-db:latest"
-	expectedImage2 := "fluent/fluent-bit:1.9.7"
+	expectedImage2 := "fluent/fluent-bit:2.0.6"
 
 	statefulSetContainers := statefulset.Spec.Template.Spec.Containers
 	require.Equal(t, len(statefulSetContainers), 2)