From 4c68a04a4bf181b26dbbf62d58625f317d352fe1 Mon Sep 17 00:00:00 2001 From: Nikolai Rodionov Date: Sun, 19 May 2024 22:49:36 +0200 Subject: [PATCH] Update shadowsocks --- charts/shadowsocks-libev/Chart.lock | 8 +-- charts/shadowsocks-libev/Chart.yaml | 21 ++++--- charts/shadowsocks-libev/README.md | 54 ++++++++++++++++++ .../charts/softplayer-lib-testing-0.1.0.tgz | Bin 2839 -> 0 bytes .../charts/softplayer-lib-workload-0.1.2.tgz | Bin 0 -> 4818 bytes .../shadowsocks-libev/templates/install.yaml | 2 +- charts/shadowsocks-libev/values.yaml | 16 +++++- 7 files changed, 86 insertions(+), 15 deletions(-) create mode 100644 charts/shadowsocks-libev/README.md delete mode 100644 charts/shadowsocks-libev/charts/softplayer-lib-testing-0.1.0.tgz create mode 100644 charts/shadowsocks-libev/charts/softplayer-lib-workload-0.1.2.tgz diff --git a/charts/shadowsocks-libev/Chart.lock b/charts/shadowsocks-libev/Chart.lock index 1422bb9..f7b4a44 100644 --- a/charts/shadowsocks-libev/Chart.lock +++ b/charts/shadowsocks-libev/Chart.lock @@ -1,6 +1,6 @@ dependencies: -- name: softplayer-lib-testing +- name: softplayer-lib-workload repository: oci://git.badhouseplants.net/softplayer - version: 0.1.0 -digest: sha256:7fe5a4899522fed731dd3b04d8397d23bb0cf920d7d56adf98911a268d0cbc7a -generated: "2024-05-05T18:56:25.892403+02:00" + version: 0.1.2 +digest: sha256:309dcf8ff3e54beea96a5f3397b4b0c121089c579202681a02dc372d75b2bb74 +generated: "2024-05-19T22:30:05.772517+02:00" diff --git a/charts/shadowsocks-libev/Chart.yaml b/charts/shadowsocks-libev/Chart.yaml index 675accb..a58794a 100644 --- a/charts/shadowsocks-libev/Chart.yaml +++ b/charts/shadowsocks-libev/Chart.yaml @@ -1,17 +1,24 @@ +--- apiVersion: v2 name: shadowsocks-libev -description: A Helm chart for shadowsocks-libev +description: Bug-fix-only libev port of shadowsocks type: application -version: 0.1.1 -appVersion: "v3.3.5" +version: 0.2.1 maintainers: - name: allanger email: allanger@badhouseplants.net url: https://badhouseplants.net dependencies: - - name: softplayer-lib-testing - version: 0.1.0 + - name: softplayer-lib-workload + version: 0.1.2 repository: oci://git.badhouseplants.net/softplayer +sources: + - https://github.com/shadowsocks/shadowsocks-libev +home: https://github.com/shadowsocks/shadowsocks-libev +keywords: + - shadowsocks + - vpn + - proxy annotations: - helm.badhouseplants.net/registry: "docker.io/shadowsocks/shadowsocks-libev" - helm.badhouseplants.net/allowed_workload_kinds: "Deployment,StatefulSet" + allowed_workload_kinds: "Deployment,StatefulSet,DaemonSet" + \ No newline at end of file diff --git a/charts/shadowsocks-libev/README.md b/charts/shadowsocks-libev/README.md new file mode 100644 index 0000000..d0da72d --- /dev/null +++ b/charts/shadowsocks-libev/README.md @@ -0,0 +1,54 @@ +# shadowsocks-libev + +![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.3.5](https://img.shields.io/badge/AppVersion-v3.3.5-informational?style=flat-square) + +Bug-fix-only libev port of shadowsocks + +## Source Code + +* + +## Maintainers + +| Name | Email | Url | +| ---- | ------ | --- | +| allanger | | | + +## Requirements + +| Repository | Name | Version | +|------------|------|---------| +| oci://git.badhouseplants.net/softplayer | softplayer-lib-workload | 0.1.0 | + +## Installing the Chart + +To install the chart with the release name `sql-exporter`: + +```console +helm repo add sql_exporter https://burningalchemist.github.io/sql_exporter/ +helm install sql_exporter/sql-exporter +``` + +## Chart Values + +### General parameters + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| workload.kind | string | `"Deployment"` | A kind of workload to run | +| workload.containers | object | `{"shadowsocks":{"envFrom":["environemnt","secrets"],"image":{"pullPolicy":"Always","registry":"docker.io","repository":"shadowsocks/shadowsocks-libev","tag":null},"ports":["shadowsocks"],"securityContext":{"capabilities":{"add":["NET_ADMIN"]}}}}` | A list of containers to run within the workload | +| workload.containers.shadowsocks | object | `{"envFrom":["environemnt","secrets"],"image":{"pullPolicy":"Always","registry":"docker.io","repository":"shadowsocks/shadowsocks-libev","tag":null},"ports":["shadowsocks"],"securityContext":{"capabilities":{"add":["NET_ADMIN"]}}}` | Shadowsocks container description | +| workload.containers.shadowsocks.securityContext | object | `{"capabilities":{"add":["NET_ADMIN"]}}` | Required to allow ipv4 forwarding | +| env.environment.sensitive | bool | `false` | | +| env.environment.data.METHOD | string | `"chacha20-ietf-poly1305"` | | +| env.secrets.sensitive | bool | `true` | | +| env.secrets.data.PASSWORD | string | `"test12345"` | Provide a password that will be used to connect to shadowsocks | +| service.type | string | `"ClusterIP"` | | +| service.ports.shadowsocks.port | int | `8388` | | +| service.ports.shadowsocks.targetPort | int | `8388` | | +| service.ports.shadowsocks.protocol | string | `"TCP"` | | + +## Dev Notes + +After changing default `Values`, please execute `make gen_docs` to update the `README.md` file. Readme file is generated by the `helm-docs` tool, so make sure not to edit it manually. + diff --git a/charts/shadowsocks-libev/charts/softplayer-lib-testing-0.1.0.tgz b/charts/shadowsocks-libev/charts/softplayer-lib-testing-0.1.0.tgz deleted file mode 100644 index bc1286f2f91c249b718e1f21ea2a16044c46a5af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2839 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 diff --git a/charts/shadowsocks-libev/charts/softplayer-lib-workload-0.1.2.tgz b/charts/shadowsocks-libev/charts/softplayer-lib-workload-0.1.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..48fcedad02e7565a2dc4456c16cec80dc8a905a2 GIT binary patch literal 4818 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 literal 0 HcmV?d00001 diff --git a/charts/shadowsocks-libev/templates/install.yaml b/charts/shadowsocks-libev/templates/install.yaml index 56cd33b..d772530 100644 --- a/charts/shadowsocks-libev/templates/install.yaml +++ b/charts/shadowsocks-libev/templates/install.yaml @@ -1,3 +1,3 @@ {{ include "lib.workload" . }} {{ include "lib.service" . }} -{{ include "lib.env" . }} +{{ include "lib.config.env" . }} diff --git a/charts/shadowsocks-libev/values.yaml b/charts/shadowsocks-libev/values.yaml index fb546f9..97339dd 100644 --- a/charts/shadowsocks-libev/values.yaml +++ b/charts/shadowsocks-libev/values.yaml @@ -1,8 +1,17 @@ --- workload: + # -- A kind of workload to run kind: Deployment + # -- A list of containers to run within the workload containers: + # -- Shadowsocks container description shadowsocks: + image: + registry: docker.io + repository: shadowsocks/shadowsocks-libev + tag: v3.3.5 + pullPolicy: Always + # -- Required to allow ipv4 forwarding securityContext: capabilities: add: @@ -21,9 +30,7 @@ env: secrets: sensitive: true data: - # --------------------------------------------------------------- - # Please, do not forget to replace this PASSWORD - # --------------------------------------------------------------- + # -- Provide a password that will be used to connect to shadowsocks PASSWORD: test12345 service: @@ -33,3 +40,6 @@ service: port: 8388 targetPort: 8388 protocol: TCP + +global: {} +softplayer-lib-workload: {}