Compare commits
24 Commits
cde425809f
...
v0.7.1
| Author | SHA1 | Date | |
|---|---|---|---|
| ec36309d8d | |||
| 93ff24ac73 | |||
| 614fda9b7d | |||
| 78b8d6872a | |||
| d09d09e526 | |||
| 806757a913 | |||
| d40f35a2d6 | |||
| c61bc4fc8d | |||
| cbd981cf19 | |||
| f4457a1275 | |||
| 377885f802 | |||
| 2538247718 | |||
| 361a85592e | |||
| e83b98e116 | |||
| a4ced9e4b4 | |||
| cde06aae36 | |||
| f4ee0617cc | |||
| dce6d7fb1c | |||
| f09dfc99d2 | |||
| 396e2fe9b3 | |||
| 3501cd51f3 | |||
| 78cb46795f | |||
| 48e8b21c30 | |||
| b19a3f7391 |
67
.drone.yml
67
.drone.yml
@@ -44,16 +44,26 @@ steps:
|
||||
- name: Container image (Harbor)
|
||||
depends_on:
|
||||
- Semantic Release (Dry-run)
|
||||
image: plugins/kaniko
|
||||
image: gcr.io/kaniko-project/executor:debug
|
||||
pull: always
|
||||
context: .
|
||||
settings:
|
||||
repo: bv11-cr01.bessems.eu/library/json-server
|
||||
registry: https://bv11-cr01.bessems.eu/v2/
|
||||
tags: latest
|
||||
username:
|
||||
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
|
||||
password:
|
||||
HARBOR_PASSWORD:
|
||||
from_secret: harbor_password
|
||||
|
||||
- name: Container image (docker.io)
|
||||
@@ -63,15 +73,18 @@ steps:
|
||||
pull: always
|
||||
commands:
|
||||
- |
|
||||
wget https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 -O /bin/jq
|
||||
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["bv11-cr01.bessems.eu"].auth="'"$(echo $DOCKER_USERNAME':'$DOCKER_PASSWORD | base64)"'"' --null-input > /kaniko/.docker/config.json
|
||||
/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=bv11-cr01.bessems.eu/library/json-server:latest
|
||||
--destination=docker.io/djpbessems/json-server:latest \
|
||||
--destination=docker.io/djpbessems/json-server:$VALID_TAG
|
||||
environment:
|
||||
DOCKER_USERNAME:
|
||||
from_secret: docker_username
|
||||
@@ -85,9 +98,9 @@ steps:
|
||||
pull: always
|
||||
commands:
|
||||
- |
|
||||
echo '$MIRROR/alpine/edge/community' >> /etc/apk/repositories
|
||||
apk update && apk add \
|
||||
yq
|
||||
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
|
||||
- |
|
||||
@@ -116,4 +129,28 @@ steps:
|
||||
pull: always
|
||||
commands:
|
||||
- |
|
||||
echo 'foo'
|
||||
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
|
||||
GIT_USERNAME: djpbessems
|
||||
|
||||
13
CHANGELOG.md
Normal file
13
CHANGELOG.md
Normal file
@@ -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))
|
||||
@@ -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 }}"
|
||||
|
||||
8
charts/json-server/templates/clusterrole.yaml
Normal file
8
charts/json-server/templates/clusterrole.yaml
Normal file
@@ -0,0 +1,8 @@
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRole
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-clusterrole
|
||||
rules:
|
||||
- apiGroups: [""]
|
||||
resources: ["secrets"]
|
||||
verbs: ["get", "list"]
|
||||
12
charts/json-server/templates/clusterrolebinding.yaml
Normal file
12
charts/json-server/templates/clusterrolebinding.yaml
Normal file
@@ -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
|
||||
@@ -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 -}}
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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: ""
|
||||
|
||||
6923
package-lock.json
generated
Normal file
6923
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
10
package.json
Normal file
10
package.json
Normal file
@@ -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"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user