From 2b0f9c4f32726e48c8980d4653a677fe4174b3ae Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Wed, 30 Aug 2023 15:36:47 +0200 Subject: [PATCH 1/6] Update the Helm chart to include WireMock 3.0.0 and use the official image --- README.md | 15 ++++++++------- charts/wiremock/Chart.yaml | 4 ++-- charts/wiremock/values.yaml | 6 +++--- index.yaml | 16 ++++++++++++---- wiremock-0.2.0.tgz | Bin 0 -> 4211 bytes 5 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 wiremock-0.2.0.tgz diff --git a/README.md b/README.md index 42a5d82..56442f8 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,11 @@ # WireMock Helm Charts Helm Chart for WireMock deployment to Kubernetes. -It allows deploying the official [WireMock Docker images](https://github.com/wiremock/wiremock-docker) -and also other charts that extend it, -in particular [holomekc/wiremock](https://github.com/holomekc/wiremock) with embedded UI. +It allows deploying the official [WireMock Docker images](https://github.com/wiremock/wiremock-docker) for both WireMock 2 and WireMock 3, +and also other charts that extend it. + +Historically, [holomekc/wiremock](https://github.com/holomekc/wiremock) was suggested as a default image, +and the chart remains partially compatible with it. # Quick Start @@ -28,9 +30,9 @@ $ export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "ap $ kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort}} ``` -## Verify Wiremock deployment +## Verify WireMock deployment -To verify erifying a response using Wiremock, run +To verify a response using WireMock, run ```bash $ curl -X POST http://127.0.0.1:8080/v1/hello @@ -38,9 +40,8 @@ $ curl -X POST http://127.0.0.1:8080/v1/hello To check the web app when using `holomekc/wiremock`, visit http://127.0.0.1:8080/__admin/webapp on your browser. -# References: +## References - [WireMock Java Library](https://github.com/tomakehurst/wiremock) - [Official WireMock Docker Image](https://github.com/wiremock/wiremock-docker) - [WireMock extended with Web UI](https://github.com/holomekc/wiremock), a project by [(@holomekc]https://github.com/holomekc) - diff --git a/charts/wiremock/Chart.yaml b/charts/wiremock/Chart.yaml index 345ce52..eff7585 100644 --- a/charts/wiremock/Chart.yaml +++ b/charts/wiremock/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "2.32.0.2" +appVersion: "3.0.0.1" description: A Helm chart for WireMock deployment on Kubernetes name: wiremock -version: 0.1.4 +version: 0.2.0 maintainers: - name: "gitkent" url: "https://github.com/gitkent" diff --git a/charts/wiremock/values.yaml b/charts/wiremock/values.yaml index 507e57b..213307f 100644 --- a/charts/wiremock/values.yaml +++ b/charts/wiremock/values.yaml @@ -1,12 +1,12 @@ -# Default values for wiremock. +# Default values for WireMock. # This is a YAML-formatted file. # Declare variables to be passed into your templates. replicaCount: 1 image: - repository: holomekc/wiremock-gui - tag: 2.32.0.2 + repository: wiremock/wiremock + tag: 3.0.0-1 pullPolicy: IfNotPresent initContainer: diff --git a/index.yaml b/index.yaml index 4d016ea..2f371fc 100644 --- a/index.yaml +++ b/index.yaml @@ -1,6 +1,14 @@ apiVersion: v1 entries: wiremock: + - apiVersion: v1 + appVersion: 3.0.0.1 + created: "2023-08-30T15:32:11.9806537+02:00" + description: A Helm chart for WireMock deployment on Kubernetes + digest: 23e14af94bbef9fce4a4456f93001ece953cc841a5d2b10dad3075a7a9ba1066 + urls: + - https://wiremock.github.io/helm-charts/wiremock-0.2.0.tgz + version: 0.2.0 - apiVersion: v1 appVersion: 2.32.0.2 created: "2022-02-14T16:40:41.782464+11:00" @@ -8,7 +16,7 @@ entries: digest: 151a4b365c18023a8fae0cb1eecba1f967e358866fcc6947f432f34afc65768d name: wiremock urls: - - https://gitkent.github.io/helm-charts/wiremock-0.1.3.tgz + - https://wiremock.github.io/helm-charts/wiremock-0.1.3.tgz version: 0.1.3 - apiVersion: v1 appVersion: 2.26.3 @@ -17,7 +25,7 @@ entries: digest: b2af1fa27466f3911eca2b7223d89c147853f54acb84c5cdd236a85fd3a696a5 name: wiremock urls: - - https://gitkent.github.io/helm-charts/wiremock-0.1.2.tgz + - https://wiremock.github.io/helm-charts/wiremock-0.1.2.tgz version: 0.1.2 - apiVersion: v1 appVersion: 2.26.3 @@ -26,7 +34,7 @@ entries: digest: b168baf9814cd2f2589dbba78bf0e66d21a1c81cd497dca6bedf26aefadd81d4 name: wiremock urls: - - https://gitkent.github.io/helm-charts/wiremock-0.1.1.tgz + - https://wiremock.github.io/helm-charts/wiremock-0.1.1.tgz version: 0.1.1 - apiVersion: v1 appVersion: "1.0" @@ -35,6 +43,6 @@ entries: digest: 5a489e52a09536aac1d89a29ced5e34bee95b9992e200c0c47085f6b76ba74fe name: wiremock urls: - - https://gitkent.github.io/helm-charts/wiremock-0.1.0.tgz + - https://wiremock.github.io/helm-charts/wiremock-0.1.0.tgz version: 0.1.0 generated: "2022-02-14T16:40:41.778584+11:00" diff --git a/wiremock-0.2.0.tgz b/wiremock-0.2.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..bd63b5b0090746c37971ce05f4c4aee4f5f4fbfe GIT binary patch literal 4211 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 Date: Wed, 30 Aug 2023 19:28:38 +0200 Subject: [PATCH 2/6] Use standard health checks for WireMock --- charts/wiremock/templates/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/wiremock/templates/deployment.yaml b/charts/wiremock/templates/deployment.yaml index 2f74343..793d71c 100644 --- a/charts/wiremock/templates/deployment.yaml +++ b/charts/wiremock/templates/deployment.yaml @@ -38,12 +38,12 @@ spec: protocol: TCP livenessProbe: httpGet: - path: /__admin/webapp + path: /__admin/mappings port: {{ .Values.service.internalPort }} scheme: {{ .Values.scheme }} readinessProbe: httpGet: - path: /__admin/webapp + path: /__admin/mappings port: {{ .Values.service.internalPort }} scheme: {{ .Values.scheme }} resources: From 3cb74680307e67a1e2f2ae446c4391f287c47926 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Wed, 30 Aug 2023 19:29:44 +0200 Subject: [PATCH 3/6] Update NOTES.txt to reference mappings --- charts/wiremock/templates/NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/wiremock/templates/NOTES.txt b/charts/wiremock/templates/NOTES.txt index 86c9d75..0b79830 100644 --- a/charts/wiremock/templates/NOTES.txt +++ b/charts/wiremock/templates/NOTES.txt @@ -15,6 +15,6 @@ {{- else if contains "ClusterIP" .Values.service.type }} export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "wiremock.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort}} - echo "Visit http://127.0.0.1:8080/__admin/webapp to use your application" + echo "Visit http://127.0.0.1:8080/__admin/mappings to use your application" run "curl -X POST http://127.0.0.1:8080/v1/hello" {{- end }} From a6c90a2bc56e7ed293780f98a13748a07d2a3b2a Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Mon, 16 Oct 2023 07:18:09 +0200 Subject: [PATCH 4/6] Update charts/wiremock/values.yaml --- charts/wiremock/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/wiremock/values.yaml b/charts/wiremock/values.yaml index 213307f..f2fb6f6 100644 --- a/charts/wiremock/values.yaml +++ b/charts/wiremock/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: wiremock/wiremock - tag: 3.0.0-1 + tag: 3.2.0-2 pullPolicy: IfNotPresent initContainer: From 60e11e59e56d53aee460b9e5464fbd674a7d6ae3 Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Mon, 23 Oct 2023 10:59:02 +0200 Subject: [PATCH 5/6] Update charts/wiremock/values.yaml --- charts/wiremock/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/wiremock/values.yaml b/charts/wiremock/values.yaml index f2fb6f6..26e6eca 100644 --- a/charts/wiremock/values.yaml +++ b/charts/wiremock/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: wiremock/wiremock - tag: 3.2.0-2 + tag: 3.2.0-3 pullPolicy: IfNotPresent initContainer: From 5393388fb0285569e46dd8d2bea869ff94386d4e Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Thu, 26 Oct 2023 10:21:25 +0200 Subject: [PATCH 6/6] Fix option separators --- charts/wiremock/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/wiremock/values.yaml b/charts/wiremock/values.yaml index 26e6eca..ca5d085 100644 --- a/charts/wiremock/values.yaml +++ b/charts/wiremock/values.yaml @@ -37,7 +37,7 @@ ingress: # hosts: # - chart-example.local env: - WIREMOCK_OPTIONS: "--port=9021,--max-request-journal=1000,--local-response-templating,--root-dir=/home/wiremock/storage" + WIREMOCK_OPTIONS: "--port=9021 --max-request-journal=1000 --local-response-templating --root-dir=/home/wiremock/storage" resources: {} # We usually recommend not to specify default resources and to leave this as a conscious