diff --git a/charts/wg-easy/1.0.0/Chart.lock b/charts/wg-easy/1.0.0/Chart.lock deleted file mode 100644 index 332bddc6b2..0000000000 --- a/charts/wg-easy/1.0.0/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506 -generated: "2022-11-07T14:53:51.774827549+02:00" diff --git a/charts/wg-easy/1.0.0/Chart.yaml b/charts/wg-easy/1.0.0/Chart.yaml deleted file mode 100644 index be5e891ca8..0000000000 --- a/charts/wg-easy/1.0.0/Chart.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v2 -appVersion: "7" -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -description: WG-Easy is the easiest way to install & manage WireGuard! -home: https://github.com/WeeJeWel/wg-easy -icon: https://raw.githubusercontent.com/WeeJeWel/wg-easy/master/src/www/img/logo.png -keywords: -- wireguard -- network -- vpn -name: wg-easy -version: 1.0.0 diff --git a/charts/wg-easy/1.0.0/charts/common-2207.0.0.tgz b/charts/wg-easy/1.0.0/charts/common-2207.0.0.tgz deleted file mode 100644 index 0bc0da8452..0000000000 Binary files a/charts/wg-easy/1.0.0/charts/common-2207.0.0.tgz and /dev/null differ diff --git a/charts/wg-easy/1.0.0/tests/deployment-check.yaml b/charts/wg-easy/1.0.0/tests/deployment-check.yaml deleted file mode 100644 index 3a9557f96d..0000000000 --- a/charts/wg-easy/1.0.0/tests/deployment-check.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- $serviceName := (include "common.names.fullname" .) -}} -apiVersion: v1 -kind: Pod -metadata: - name: {{ .Release.Name }}-wgeasy - labels: - app: {{ .Release.Name }} - release: {{ .Release.Name }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: test-curl - image: alpine/curl - imagePullPolicy: "IfNotPresent" - command: - - /bin/sh - - -ec - - | - curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}:{{ .Values.webUIPort }}/ - restartPolicy: Never diff --git a/charts/wg-easy/.helmignore b/library/ix-dev/charts/wg-easy/.helmignore similarity index 100% rename from charts/wg-easy/.helmignore rename to library/ix-dev/charts/wg-easy/.helmignore diff --git a/library/ix-dev/charts/wg-easy/Chart.lock b/library/ix-dev/charts/wg-easy/Chart.lock new file mode 100644 index 0000000000..074a92e3f7 --- /dev/null +++ b/library/ix-dev/charts/wg-easy/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +digest: sha256:a301ba0f99ec1e08a60a7f0a0320aa02d225993572f2f056f09520f06df88b37 +generated: "2023-03-21T16:28:24.259499442Z" diff --git a/library/ix-dev/charts/wg-easy/Chart.yaml b/library/ix-dev/charts/wg-easy/Chart.yaml new file mode 100644 index 0000000000..79e784aa3a --- /dev/null +++ b/library/ix-dev/charts/wg-easy/Chart.yaml @@ -0,0 +1,25 @@ +name: wg-easy +description: WG-Easy is the easiest way to install & manage WireGuard! +annotations: + title: WG Easy +type: application +version: 1.0.1 +apiVersion: v2 +appVersion: "7" +kubeVersion: ">=1.16.0-0" +maintainers: + - name: truenas + url: https://www.truenas.com/ +dependencies: + - name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +home: https://github.com/WeeJeWel/wg-easy +icon: https://raw.githubusercontent.com/WeeJeWel/wg-easy/master/src/www/img/logo.png +sources: + - https://github.com/WeeJeWel/wg-easy + - https://github.com/truenas/charts/tree/master/library/ix-dev/charts/wg-easy +keywords: + - wireguard + - network + - vpn diff --git a/charts/wg-easy/1.0.0/README.md b/library/ix-dev/charts/wg-easy/README.md similarity index 100% rename from charts/wg-easy/1.0.0/README.md rename to library/ix-dev/charts/wg-easy/README.md diff --git a/charts/wg-easy/1.0.0/app-readme.md b/library/ix-dev/charts/wg-easy/app-readme.md similarity index 100% rename from charts/wg-easy/1.0.0/app-readme.md rename to library/ix-dev/charts/wg-easy/app-readme.md diff --git a/library/ix-dev/charts/wg-easy/charts/common-2207.0.0.tgz b/library/ix-dev/charts/wg-easy/charts/common-2207.0.0.tgz new file mode 100644 index 0000000000..b44cb1bc1e Binary files /dev/null and b/library/ix-dev/charts/wg-easy/charts/common-2207.0.0.tgz differ diff --git a/charts/wg-easy/1.0.0/test_values.yaml b/library/ix-dev/charts/wg-easy/ci/test-values.yaml similarity index 84% rename from charts/wg-easy/1.0.0/test_values.yaml rename to library/ix-dev/charts/wg-easy/ci/test-values.yaml index 9868d3d3b5..3683884014 100644 --- a/charts/wg-easy/1.0.0/test_values.yaml +++ b/library/ix-dev/charts/wg-easy/ci/test-values.yaml @@ -1,7 +1,3 @@ -image: - pullPolicy: IfNotPresent - repository: weejewel/wg-easy - tag: "7" appVolumeMounts: config: emptyDir: true diff --git a/charts/wg-easy/item.yaml b/library/ix-dev/charts/wg-easy/item.yaml similarity index 100% rename from charts/wg-easy/item.yaml rename to library/ix-dev/charts/wg-easy/item.yaml diff --git a/charts/wg-easy/1.0.0/questions.yaml b/library/ix-dev/charts/wg-easy/questions.yaml similarity index 100% rename from charts/wg-easy/1.0.0/questions.yaml rename to library/ix-dev/charts/wg-easy/questions.yaml diff --git a/charts/wg-easy/1.0.0/templates/deployment.yaml b/library/ix-dev/charts/wg-easy/templates/deployment.yaml similarity index 92% rename from charts/wg-easy/1.0.0/templates/deployment.yaml rename to library/ix-dev/charts/wg-easy/templates/deployment.yaml index c264d270e3..0e113f75d8 100644 --- a/charts/wg-easy/1.0.0/templates/deployment.yaml +++ b/library/ix-dev/charts/wg-easy/templates/deployment.yaml @@ -73,21 +73,29 @@ spec: httpGet: path: / port: {{ .Values.webUIPort }} + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 failureThreshold: 5 - periodSeconds: 15 + successThreshold: 2 livenessProbe: httpGet: path: / port: {{ .Values.webUIPort }} + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 failureThreshold: 5 - periodSeconds: 15 + successThreshold: 1 startupProbe: httpGet: path: / port: {{ .Values.webUIPort }} - initialDelaySeconds: 5 - failureThreshold: 40 - periodSeconds: 15 + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 2 + failureThreshold: 60 + successThreshold: 1 {{ $ip := .Values.wgeasy.client_address_range | replace "x" "0" }} lifecycle: preStop: diff --git a/charts/wg-easy/1.0.0/templates/service.yaml b/library/ix-dev/charts/wg-easy/templates/service.yaml similarity index 100% rename from charts/wg-easy/1.0.0/templates/service.yaml rename to library/ix-dev/charts/wg-easy/templates/service.yaml diff --git a/charts/wg-easy/upgrade_info.json b/library/ix-dev/charts/wg-easy/upgrade_info.json similarity index 100% rename from charts/wg-easy/upgrade_info.json rename to library/ix-dev/charts/wg-easy/upgrade_info.json diff --git a/charts/wg-easy/1.0.0/ix_values.yaml b/library/ix-dev/charts/wg-easy/values.yaml similarity index 100% rename from charts/wg-easy/1.0.0/ix_values.yaml rename to library/ix-dev/charts/wg-easy/values.yaml