chore(release): 0.7.1 [skip ci]

## [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](614fda9b7d))
Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer into main
2023-07-14 08:39:28 +00:00 · 2023-07-14 10:37:21 +02:00 · 2023-07-14 10:37:10 +02:00 · 2023-07-14 08:24:10 +00:00 · 2023-07-14 10:22:06 +02:00 · 2023-07-14 10:15:55 +02:00
9 changed files with 97 additions and 24 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -47,19 +47,19 @@ steps:
  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
-  - |
-    export IMAGE_TAG=$(cat .version)
  - |
    /kaniko/executor \
      --dockerfile=Dockerfile \
      --context=dir://. \
      --destination=bv11-cr01.bessems.eu/library/json-server:latest \
-      --destination=bv11-cr01.bessems.eu/library/json-server:$IMAGE_TAG
+      --destination=bv11-cr01.bessems.eu/library/json-server:$VALID_TAG
  environment:
    HARBOR_USERNAME:
      from_secret: harbor_username
@ -72,11 +72,11 @@ steps:
  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
-  - |
-    export IMAGE_TAG=$(cat .version)
  - |
    /bin/jq '.auths["https://index.docker.io/v1/"].auth="'"$(echo -n $DOCKER_USERNAME':'$DOCKER_PASSWORD | base64)"'"' --null-input > /kaniko/.docker/config.json
  - |
@ -84,7 +84,7 @@ steps:
      --dockerfile=Dockerfile \
      --context=dir://. \
      --destination=docker.io/djpbessems/json-server:latest \
-      --destination=docker.io/djpbessems/json-server:$IMAGE_TAG
+      --destination=docker.io/djpbessems/json-server:$VALID_TAG
  environment:
    DOCKER_USERNAME:
      from_secret: docker_username
@ -98,9 +98,9 @@ steps:
  pull: always
  commands:
  - |
-    export CHART_VERSION=$(cat .version)
-    sed -i 's/{{ chart_version }}/'$CHART_VERSION'/g' charts/json-server/Chart.yaml
-    sed -i 's/tag: latest/tag: '$CHART_VERSION'/g' charts/json-server/values.yaml
+    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
  - |
@ -128,6 +128,8 @@ steps:
  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
  - |
@ -137,6 +139,7 @@ steps:
  - |
    npm install \
      semantic-release \
+      @semantic-release/changelog \
      @semantic-release/commit-analyzer \
      @semantic-release/git \
      @semantic-release/release-notes-generator
@ -146,7 +149,7 @@ steps:
    npx semantic-release \
      --branches ${DRONE_BRANCH} \
      --tag-format "v\$${version}" \
-      --plugins @semantic-release/commit-analyzer,@semantic-release/release-notes-generator,@semantic-release/git
+      --plugins @semantic-release/commit-analyzer,@semantic-release/release-notes-generator,@semantic-release/changelog,@semantic-release/git
  environment:
    GIT_APIKEY:
      from_secret: git_apikey
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,13 @@
+## [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))
--- a/charts/json-server/templates/clusterrole.yaml
+++ b/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"]
--- a/charts/json-server/templates/clusterrolebinding.yaml
+++ b/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
--- a/charts/json-server/templates/configmap.yaml
+++ b/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.json-server.seedData.configInline "context" $) | indent 4 }}
 {{- end -}}
--- a/charts/json-server/templates/deployment.yaml
+++ b/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 }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.jsonServer.image.repository }}:{{ .Values.jsonServer.image.tag | default .Chart.AppVersion }}"
+          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:
--- a/charts/json-server/values.yaml
+++ b/charts/json-server/values.yaml
@ -1,18 +1,25 @@
 # Default values for json-server.

-seedData:
-  # Not implemented yet
-  # existingConfigMap: ""
-  configInline: {}
+jsonServer:
+  seedData:
+    # Not implemented yet
+    # 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: ""
--- a/package-lock.json
+++ b/package-lock.json
@ -5,6 +5,7 @@
  "packages": {
    "": {
      "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",
@ -287,6 +288,23 @@
        "node": ">=12"
      }
    },
+    "node_modules/@semantic-release/changelog": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@semantic-release/changelog/-/changelog-6.0.3.tgz",
+      "integrity": "sha512-dZuR5qByyfe3Y03TpmCvAxCyTnp7r5XwtHRf/8vD9EAn4ZWbavUX8adMtXYzE86EVh0gyLA7lm5yW4IV30XUag==",
+      "dependencies": {
+        "@semantic-release/error": "^3.0.0",
+        "aggregate-error": "^3.0.0",
+        "fs-extra": "^11.0.0",
+        "lodash": "^4.17.4"
+      },
+      "engines": {
+        "node": ">=14.17"
+      },
+      "peerDependencies": {
+        "semantic-release": ">=18.0.0"
+      }
+    },
    "node_modules/@semantic-release/commit-analyzer": {
      "version": "10.0.1",
      "resolved": "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-10.0.1.tgz",
--- a/package.json
+++ b/package.json
@ -1,5 +1,6 @@
 {
  "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",
Author	SHA1	Message	Date
Danny Bessems	ec36309d8d	chore(release): 0.7.1 [skip ci] ## [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`](`614fda9b7d`))	2023-07-14 08:39:28 +00:00
Danny Bessems	93ff24ac73	Merge branch 'main' of https://code.spamasaurus.com/djpbessems/ContainerImage.JSONServer into main All checks were successful continuous-integration/drone/push Build is passing Details	2023-07-14 10:37:21 +02:00
Danny Bessems	614fda9b7d	fix: Adhere to naming convention in values.yaml	2023-07-14 10:37:10 +02:00
Danny Bessems	78b8d6872a	chore(release): 0.7.0 [skip ci] # [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`](`806757a913`))	2023-07-14 08:24:10 +00:00
Danny Bessems	d09d09e526	build: Group shell commands to avoid unintended exit All checks were successful continuous-integration/drone/push Build is passing Details	2023-07-14 10:22:06 +02:00
Danny Bessems	806757a913	feat: Add sidecar for continuous polling All checks were successful continuous-integration/drone/push Build is passing Details	2023-07-14 10:15:55 +02:00
Danny Bessems	d40f35a2d6	build: Debug exit behaviour #2 All checks were successful continuous-integration/drone/push Build is passing Details	2023-07-13 10:45:25 +02:00
Danny Bessems	c61bc4fc8d	build: Debug exit behaviour Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2023-07-13 10:42:53 +02:00
Danny Bessems	cbd981cf19	build: Revert using `export` and refactor to gracefully exit on an empty value Some checks reported errors continuous-integration/drone/push Build encountered an error Details	2023-07-13 10:33:33 +02:00
Danny Bessems	f4457a1275	build: Add graceful exit if semantic release does not create a new version Some checks failed continuous-integration/drone/push Build is failing Details	2023-07-13 09:17:42 +02:00
Danny Bessems	377885f802	build: Create and upload changelog file Some checks failed continuous-integration/drone/push Build is failing Details	2023-07-12 12:22:42 +02:00