Merge pull request #117 from marklogic/master

Merge Master into Develop

Author: pengzhouml

.github/workflows/release.yaml

@@ -0,0 +1,34 @@
+name: Release Charts
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+      - name: Install Helm
+        uses: azure/setup-helm@v3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run chart-releaser
+        uses: helm/[email protected]
+        with:
+          charts_dir: '.'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}

charts/Chart.yaml

@@ -8,7 +8,7 @@ dependencies:
     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: "11.0.0"
+appVersion: "11.0.2"
 type: application
 keywords:
   - marklogic
@@ -17,4 +17,4 @@ keywords:
 sources:
   - https://github.com/marklogic/marklogic-kubernetes
   - https://www.marklogic.com/
-version: 1.0.0
+version: 1.0.0-rc2

charts/templates/configmap-haproxy.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.haproxy.enabled }}
 {{- $replicas := int .Values.replicaCount }}
-{{- $releaseName := .Release.Name }}
+{{- $releaseName := include "marklogic.fullname" . }}
 {{- $namespace := .Release.Namespace }}
 {{- $clusterDomain := .Values.clusterDomain }}
 {{- $tlsEnabled := .Values.haproxy.tls.enabled }}

charts/values.yaml

@@ -28,7 +28,7 @@ bootstrapHostName: ""
 # Marklogic image parameters
 image:
   repository: marklogicdb/marklogic-db
-  tag: 10.0-9.5-centos-1.0.0
+  tag: 11.0.2-centos-1.0.2
   pullPolicy: IfNotPresent
 
 # Init container image parameters