Merge pull request #109 from marklogic/release/1.0.0-rc1

Release 1.0.0-rc1

Author: pengzhouml

.gitignore

@@ -1,3 +1,2 @@
 .vscode
-values.yaml
 test/test_results

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()
@@ -139,10 +135,23 @@ void pullImage() {
         sh """
             echo "\$docker_password" | docker login --username \$docker_user --password-stdin ${dockerRegistry}
             docker pull ${dockerRepository}:${dockerVersion}
+            docker pull ${dockerRepository}:${dockerVersion}
+            docker pull ${dockerRepository}:${prevDockerVersion}
         """
     }
 }
 
+String getVersionDiv(mlVersion) {
+    switch (mlVersion) {
+        case '10.0':
+            return '-'
+        case '9.0':
+            return '-'
+        default:
+            return '.'
+    }
+}
+
 pipeline {
     agent {
         label {
@@ -161,13 +170,19 @@ 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)
+        prevDockerVerDivider = getVersionDiv(params.PREV_ML_VERSION)
+        dockerVersion = "${ML_VERSION}${dockerVerDivider}${timeStamp}-centos-${dockerReleaseVer}"
+        prevDockerVersion = "${PREV_ML_VERSION}${prevDockerVerDivider}${timeStamp}-centos-${prevDockerReleaseVer}"
     }
 
     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.2', description: 'Current Docker version. (e.g. 1.0.1)', trim: true)
+        choice(name: 'PREV_ML_VERSION', choices: '10.0\n9.0', description: 'Previous MarkLogic version for MarkLogic upgrade tests')
+        string(name: 'prevDockerReleaseVer', defaultValue: '1.0.2', description: 'Previous Docker version for MarkLogic upgrade tests. (e.g. 1.0.1)', trim: true)
     }
 
     stages {
@@ -196,7 +211,7 @@ pipeline {
             steps {
                 sh """
                     export MINIKUBE_HOME=/space;
-                    make test dockerImage=${dockerRepository}:${dockerVersion} saveOutput=true
+                    make test dockerImage=${dockerRepository}:${dockerVersion} prevDockerImage=${dockerRepository}:${prevDockerVersion} saveOutput=true
                 """
             }
         }

README.md

@@ -1,9 +1,14 @@
 annotations:
   category: Database
 apiVersion: v2
+dependencies:
+  - condition: haproxy.enabled
+    name: haproxy
+    repository: "file://./charts/haproxy"
+    version: "1.18.0"
 name: marklogic
 description: MarkLogic Server is a multi-model database that has both NoSQL and trusted enterprise data management capabilities.
-appVersion: "10.0-9.5"
+appVersion: "11.0.2"
 type: application
 keywords:
   - marklogic
@@ -12,4 +17,4 @@ keywords:
 sources:
   - https://github.com/marklogic/marklogic-kubernetes
   - https://www.marklogic.com/
-version: 1.0.0-ea2
+version: 1.0.0-rc1

charts/Chart.yaml

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/charts/haproxy/.helmignore

@@ -0,0 +1,38 @@
+# Copyright 2020 HAProxy Technologies LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v2
+name: haproxy
+description: A Helm chart for HAProxy on Kubernetes
+type: application
+version: 1.18.0
+appVersion: 2.6.9
+kubeVersion: ">=1.17.0-0"
+keywords:
+  - haproxy
+home: https://github.com/haproxytech/helm-charts/tree/main/haproxy
+sources:
+  - http://www.haproxy.org/
+icon: https://raw.githubusercontent.com/haproxytech/helm-charts/main/haproxy/chart-icon.png
+maintainers:
+  - name: Dinko Korunic
+    email: [email protected]
+engine: gotpl
+annotations:
+  artifacthub.io/changes: |
+    - Update base image to HAProxy 2.6.9
+    - Update HPA API version (#172)
+    - Fix HPA spec (#173)
+    - Ensure api version capabilities of PodDisruptionBudget (#175)
+    - Add additionalPorts to service (#177)