chore(release): 0.7.3 [skip ci]

## [0.7.3](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.7.2...v0.7.3) (2023-07-14)

### Bug Fixes

* Missing period in chart template ([0999fdf](0999fdf705))

.drone.yml

@@ -1,55 +1,155 @@
 kind: pipeline
 type: kubernetes
-name: Container image
+name: Container & Helm chart
+
+trigger:
+  event:
+    exclude:
+    - tag
 
 steps:
-- name: Build & publish (Harbor)
+- name: Semantic Release (Dry-run)
-  depends_on:
+  image: bv11-cr01.bessems.eu/proxy/library/node:20-slim
-  - clone
+  pull: always
-  image: plugins/docker
-  context: .
-  settings:
-    repo: bv11-cr01.bessems.eu/library/json-server
-    registry: bv11-cr01.bessems.eu
-    tags: latest
-    mtu: 1450
-    username:
-      from_secret: harbor_username
-    password:
-      from_secret: harbor_password
-- name: Build & publish (Dockerhub)
-  depends_on:
-  - clone
-  image: plugins/docker
-  context: .
-  settings:
-    repo: djpbessems/json-server
-    tags: latest
-    mtu: 1450
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
----
-kind: pipeline
-type: kubernetes
-name: Helm chart (Gitea)
-
-steps:
-- name: Package & publish
-  image: bv11-cr01.bessems.eu/proxy/alpine/helm
   commands:
   - |
-    apk add yq
+    apt-get update
   - |
-    helm package ./charts/json-server
+    apt-get install -y --no-install-recommends \
+      git-core \
+      ca-certificates
   - |
-    CHART_VERSION=$(cat ./charts/json-server/Chart.yaml | yq '.version')
+    npm install \
-    curl \
+      semantic-release \
-      --header "Authorization: token $GIT_APIKEY" \
+      @semantic-release/commit-analyzer \
-      --upload-file json-server-$CHART_VERSION.tgz \
+      @semantic-release/exec \
-      https://code.spamasaurus.com/api/packages/$GIT_USERNAME/helm/api/charts
+  - |
+    export GIT_CREDENTIALS=$${GIT_USERNAME}:$${GIT_APIKEY}
+  - |
+    npx semantic-release \
+      --package @semantic-release/exec \
+      --package semantic-release \
+      --branches ${DRONE_BRANCH} \
+      --tag-format "v\$${version}" \
+      --dry-run \
+      --plugins @semantic-release/commit-analyzer,@semantic-release/exec \
+      --analyzeCommits @semantic-release/commit-analyzer \
+      --verifyRelease @semantic-release/exec \
+      --verifyReleaseCmd 'echo "$${nextRelease.version}" > .version'
+  environment:
+    GIT_APIKEY:
+      from_secret: git_apikey
+    GIT_USERNAME: djpbessems
+
+- name: Container image (Harbor)
+  depends_on:
+  - Semantic Release (Dry-run)
+  image: gcr.io/kaniko-project/executor:debug
+  pull: always
+  commands:
+  - |
+    export VALID_TAG=$(cat .version 2> /dev/null) && [ -n "$VALID_TAG" ] || (echo 'No release tag - exiting'; exit 0)
+  - |
+    wget https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 -qO /bin/jq
+    chmod +x /bin/jq
+  - |
+    /bin/jq '.auths["https://bv11-cr01.bessems.eu/v2/"].auth="'"$(echo -n $HARBOR_USERNAME':'$HARBOR_PASSWORD | base64)"'"' --null-input > /kaniko/.docker/config.json
+  - |
+    /kaniko/executor \
+      --dockerfile=Dockerfile \
+      --context=dir://. \
+      --destination=bv11-cr01.bessems.eu/library/json-server:latest \
+      --destination=bv11-cr01.bessems.eu/library/json-server:$VALID_TAG
+  environment:
+    HARBOR_USERNAME:
+      from_secret: harbor_username
+    HARBOR_PASSWORD:
+      from_secret: harbor_password
+
+- name: Container image (docker.io)
+  depends_on:
+  - Semantic Release (Dry-run)
+  image: gcr.io/kaniko-project/executor:debug
+  pull: always
+  commands:
+  - |
+    export VALID_TAG=$(cat .version 2> /dev/null) && [ -n "$VALID_TAG" ] || (echo 'No release tag - exiting'; exit 0)
+  - |
+    wget https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 -qO /bin/jq
+    chmod +x /bin/jq
+  - |
+    /bin/jq '.auths["https://index.docker.io/v1/"].auth="'"$(echo -n $DOCKER_USERNAME':'$DOCKER_PASSWORD | base64)"'"' --null-input > /kaniko/.docker/config.json
+  - |
+    /kaniko/executor \
+      --dockerfile=Dockerfile \
+      --context=dir://. \
+      --destination=docker.io/djpbessems/json-server:latest \
+      --destination=docker.io/djpbessems/json-server:$VALID_TAG
+  environment:
+    DOCKER_USERNAME:
+      from_secret: docker_username
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+
+- name: Helm chart (Gitea)
+  depends_on:
+  - Semantic Release (Dry-run)
+  image: bv11-cr01.bessems.eu/proxy/alpine/helm
+  pull: always
+  commands:
+  - |
+    export VALID_TAG=$(cat .version 2> /dev/null) && [ -n "$VALID_TAG" ] || (echo 'No release tag - exiting'; exit 0)
+    sed -i 's/{{ chart_version }}/'$VALID_TAG'/g' charts/json-server/Chart.yaml
+    sed -i 's/{{ image_tag }}/'$VALID_TAG'/g' charts/json-server/values.yaml
+  - |
+    helm package ./charts/json-server
+  - |
+    helm plugin install https://github.com/chartmuseum/helm-push
+  - |
+    helm repo add \
+      --username $GIT_USERNAME \
+      --password $GIT_APIKEY \
+      spamasaurus \
+      https://code.spamasaurus.com/api/packages/$GIT_USERNAME/helm
+  - |
+    helm cm-push \
+      json-server-*.tgz \
+      spamasaurus
+  environment:
+    GIT_APIKEY:
+      from_secret: git_apikey
+    GIT_USERNAME: djpbessems
+
+- name: Semantic Release
+  depends_on:
+  - Container image (Harbor)
+  - Container image (docker.io)
+  - Helm chart (Gitea)
+  image: bv11-cr01.bessems.eu/proxy/library/node:20-slim
+  pull: always
+  commands:
+  - |
+    export VALID_TAG=$(cat .version 2> /dev/null) && [ -n "$VALID_TAG" ] || (echo 'No release tag - exiting'; exit 0)
+  - |
+    apt-get update
+  - |
+    apt-get install -y --no-install-recommends \
+      git-core \
+      ca-certificates
+  - |
+    npm install \
+      semantic-release \
+      @semantic-release/changelog \
+      @semantic-release/commit-analyzer \
+      @semantic-release/git \
+      @semantic-release/release-notes-generator
+  - |
+    export GIT_CREDENTIALS=$${GIT_USERNAME}:$${GIT_APIKEY}
+  - |
+    npx semantic-release \
+      --branches ${DRONE_BRANCH} \
+      --tag-format "v\$${version}" \
+      --plugins @semantic-release/commit-analyzer,@semantic-release/release-notes-generator,@semantic-release/changelog,@semantic-release/git
   environment:
     GIT_APIKEY:
       from_secret: git_apikey

CHANGELOG.md

@@ -0,0 +1,27 @@
+## [0.7.3](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.7.2...v0.7.3) (2023-07-14)
+
+
+### Bug Fixes
+
+* Missing period in chart template ([0999fdf](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/0999fdf7051d6e8a2161333980bd1aedd9f180ef))
+
+## [0.7.2](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.7.1...v0.7.2) (2023-07-14)
+
+
+### Bug Fixes
+
+* Adhere to naming convention in templates ([c551a24](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/c551a242c7a49a445da68ba6e1e5966eeb5ce7d7))
+
+## [0.7.1](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.7.0...v0.7.1) (2023-07-14)
+
+
+### Bug Fixes
+
+* Adhere to naming convention in values.yaml ([614fda9](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/614fda9b7d284862bd84a1eab62ba8144f798199))
+
+# [0.7.0](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/compare/v0.6.0...v0.7.0) (2023-07-14)
+
+
+### Features
+
+* Add sidecar for continuous polling ([806757a](https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer/commit/806757a9135341d919b31d4183a84e3870c24f3f))

Dockerfile

@@ -1,6 +1,6 @@
-FROM node:latest
+FROM node:lts-slim AS build
 
-RUN npm install -g --no-optional --omit=dev \
+RUN npm install -g --omit=optional --omit=dev \
       json-server && \
     npm cache clean --force
 

charts/json-server/Chart.yaml

@@ -6,10 +6,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v0.5.3
+version: v{{ chart_version }}
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v0.5.3"
+appVersion: "v{{ chart_version }}"

charts/json-server/templates/clusterrole.yaml

@@ -0,0 +1,8 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: {{ .Release.Name }}-clusterrole
+rules:
+- apiGroups: [""]
+  resources: ["secrets"]
+  verbs: ["get", "list"]

charts/json-server/templates/clusterrolebinding.yaml

@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ .Release.Name }}-clusterrolebinding
+subjects:
+- kind: ServiceAccount
+  name: {{ include "json-server.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: {{ .Release.Name }}-clusterrole
+  apiGroup: rbac.authorization.k8s.io

charts/json-server/templates/configmap.yaml

@@ -1,4 +1,4 @@
-{{- if not .Values.seedData.existingConfigMap }}
+{{- if not .Values.jsonServer.seedData.existingConfigMap }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -55,5 +55,5 @@ data:
       </body>
     </html>
   db.json: |
-{{ include "common.tplvalues.render" ( dict "value" .Values.seedData.configInline "context" $) | indent 4 }}
+{{ include "common.tplvalues.render" ( dict "value" .Values.jsonServer.seedData.configInline "context" $) | indent 4 }}
 {{- end -}}

charts/json-server/templates/deployment.yaml

@@ -29,8 +29,8 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.jsonServer.image.repository }}:{{ .Values.jsonServer.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.jsonServer.image.pullPolicy }}
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}
@@ -52,6 +52,17 @@ spec:
           - name: {{ .Release.Name }}-configmap
             mountPath: /usr/local/lib/node_modules/json-server/public/index.html
             subPath: index.html
+        - name: {{ .Chart.Name }}-sidecar
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
+          imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          command:
+          - /bin/sh
+          - -c
+          - sleep infinity
       volumes:
       - name: {{ .Release.Name }}-configmap
         configMap:

charts/json-server/values.yaml

@@ -1,18 +1,25 @@
 # Default values for json-server.
 
-seedData:
+jsonServer:
-  # Not implemented yet
+  seedData:
-  # existingConfigMap: ""
+    # Not implemented yet
-  configInline: {}
+    # existingConfigMap: ""
+    configInline: {}
+
+  image:
+    repository: bv11-cr01.bessems.eu/library/json-server
+    pullPolicy: IfNotPresent
+    # Overrides the image tag whose default is the chart appVersion.
+    tag: {{ image_tag }}
+
+sidecar:
+  image:
+    repository: alpine/helm
+    pullPolicy: IfNotPresent
+    tag: 3.12.1
 
 replicaCount: 1
 
-image:
-  repository: bv11-cr01.bessems.eu/library/json-server
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: latest
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""

package.json

@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/commit-analyzer": "^10.0.1",
+    "@semantic-release/exec": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/release-notes-generator": "^11.0.4",
+    "semantic-release": "^21.0.7"
+  }
+}