Compare commits
	
		
			7 Commits
		
	
	
		
			v0.7.0
			...
			3c141a2d40
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3c141a2d40 | |||
| 0999fdf705 | |||
| 6c71c5f364 | |||
| c551a242c7 | |||
| ec36309d8d | |||
| 93ff24ac73 | |||
| 614fda9b7d | 
							
								
								
									
										14
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								.drone.yml
									
									
									
									
									
								
							@@ -48,7 +48,7 @@ steps:
 | 
			
		||||
  pull: always
 | 
			
		||||
  commands:
 | 
			
		||||
  - |
 | 
			
		||||
    export IMAGE_TAG=$(cat .version 2> /dev/null) && [ -n "$IMAGE_TAG" ] || (echo 'No release tag - exiting'; exit 0)
 | 
			
		||||
    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
 | 
			
		||||
@@ -59,7 +59,7 @@ steps:
 | 
			
		||||
      --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
 | 
			
		||||
@@ -73,7 +73,7 @@ steps:
 | 
			
		||||
  pull: always
 | 
			
		||||
  commands:
 | 
			
		||||
  - |
 | 
			
		||||
    export IMAGE_TAG=$(cat .version 2> /dev/null) && [ -n "$IMAGE_TAG" ] || (echo 'No release tag - exiting'; exit 0)
 | 
			
		||||
    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
 | 
			
		||||
@@ -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 2> /dev/null) && [ -n "$CHART_VERSION" ] || (echo 'No release tag - exiting'; exit 0)
 | 
			
		||||
    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
 | 
			
		||||
  - |
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										21
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,3 +1,24 @@
 | 
			
		||||
## [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)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -5,7 +5,7 @@ metadata:
 | 
			
		||||
subjects:
 | 
			
		||||
- kind: ServiceAccount
 | 
			
		||||
  name: {{ include "json-server.serviceAccountName" . }}
 | 
			
		||||
  namespace: {{ Release.Namespace }}
 | 
			
		||||
  namespace: {{ .Release.Namespace }}
 | 
			
		||||
roleRef:
 | 
			
		||||
  kind: ClusterRole
 | 
			
		||||
  name: {{ .Release.Name }}-clusterrole
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
{{- if not .Values.json-server.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.json-server.seedData.configInline "context" $) | indent 4 }}
 | 
			
		||||
{{ include "common.tplvalues.render" ( dict "value" .Values.jsonServer.seedData.configInline "context" $) | indent 4 }}
 | 
			
		||||
{{- end -}}
 | 
			
		||||
 
 | 
			
		||||
@@ -29,8 +29,8 @@ spec:
 | 
			
		||||
        - name: {{ .Chart.Name }}
 | 
			
		||||
          securityContext:
 | 
			
		||||
            {{- toYaml .Values.securityContext | nindent 12 }}
 | 
			
		||||
          image: "{{ .Values.json-server.image.repository }}:{{ .Values.json-server.image.tag | default .Chart.AppVersion }}"
 | 
			
		||||
          imagePullPolicy: {{ .Values.json-server.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 }}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
# Default values for json-server.
 | 
			
		||||
 | 
			
		||||
json-server:
 | 
			
		||||
jsonServer:
 | 
			
		||||
  seedData:
 | 
			
		||||
    # Not implemented yet
 | 
			
		||||
    # existingConfigMap: ""
 | 
			
		||||
@@ -10,7 +10,7 @@ json-server:
 | 
			
		||||
    repository: bv11-cr01.bessems.eu/library/json-server
 | 
			
		||||
    pullPolicy: IfNotPresent
 | 
			
		||||
    # Overrides the image tag whose default is the chart appVersion.
 | 
			
		||||
    tag: latest
 | 
			
		||||
    tag: {{ image_tag }}
 | 
			
		||||
 | 
			
		||||
sidecar:
 | 
			
		||||
  image:
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user