diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8cccd74a..b71990e3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -73,9 +73,6 @@ jobs: name: "Release ${{ steps.get_ref.outputs.ref }}" chart-release: - strategy: - matrix: - plugin: [veth] name: Create Chart Release runs-on: ubuntu-latest needs: [call-bin-workflow,call-image-workflow] diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e69de29b..00000000 diff --git a/charts/veth/.helmignore b/charts/plugins/.helmignore similarity index 100% rename from charts/veth/.helmignore rename to charts/plugins/.helmignore diff --git a/charts/veth/Chart.yaml b/charts/plugins/Chart.yaml similarity index 98% rename from charts/veth/Chart.yaml rename to charts/plugins/Chart.yaml index b6d0a5c7..63bc924a 100644 --- a/charts/veth/Chart.yaml +++ b/charts/plugins/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: veth +name: plugins description: Veth works with macvlan cni to solve some communication problems when macvlan is used as CNI. # Library charts provide useful utilities or functions for the chart developer. They're included as diff --git a/charts/veth/README.md b/charts/plugins/README.md similarity index 83% rename from charts/veth/README.md rename to charts/plugins/README.md index d26cceb1..b5a55108 100644 --- a/charts/veth/README.md +++ b/charts/plugins/README.md @@ -1,8 +1,8 @@ -# veth +# plugins ![Version: v0.1.1](https://img.shields.io/badge/Version-v0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.1.1](https://img.shields.io/badge/AppVersion-v0.1.1-informational?style=flat-square) -Veth works with macvlan cni to solve some communication problems when macvlan is used as CNI. +Plugins works with macvlan cni to solve some communication problems when macvlan is used as CNI. ## Maintainers @@ -33,14 +33,14 @@ Veth works with macvlan cni to solve some communication problems when macvlan is ## Quick Install ```shell -helm repo add veth https://spidernet-io.github.io/cni-plugins -helm install veth -n kube-system . +helm repo add cni-plugins https://spidernet-io.github.io/cni-plugins +helm install cni-plugins/veth -n kube-system . ``` By default, the image's tag is consistent with the Chart version, if you want to specify the image's tag, you can follow the command below: ```shell -helm install veth -n kube-system . \ +helm install cni-plugins/veth -n kube-system . \ --set image.tag=v0.1.1 ``` diff --git a/charts/veth/templates/NOTES.txt b/charts/plugins/templates/NOTES.txt similarity index 100% rename from charts/veth/templates/NOTES.txt rename to charts/plugins/templates/NOTES.txt diff --git a/charts/veth/templates/_helpers.tpl b/charts/plugins/templates/_helpers.tpl similarity index 75% rename from charts/veth/templates/_helpers.tpl rename to charts/plugins/templates/_helpers.tpl index 48a2c897..e6418fea 100644 --- a/charts/veth/templates/_helpers.tpl +++ b/charts/plugins/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Expand the name of the chart. */}} -{{- define "veth.name" -}} +{{- define "plugins.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} @@ -10,7 +10,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "veth.fullname" -}} +{{- define "plugins.fullname" -}} {{- if .Values.fullnameOverride }} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} @@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name. {{/* Create chart name and version as used by the chart label. */}} -{{- define "veth.chart" -}} +{{- define "plugins.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "veth.labels" -}} -helm.sh/chart: {{ include "veth.chart" . }} -{{ include "veth.selectorLabels" . }} +{{- define "plugins.labels" -}} +helm.sh/chart: {{ include "plugins.chart" . }} +{{ include "plugins.selectorLabels" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Selector labels */}} -{{- define "veth.selectorLabels" -}} -app.kubernetes.io/name: {{ include "veth.name" . }} +{{- define "plugins.selectorLabels" -}} +app.kubernetes.io/name: {{ include "plugins.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* Create the name of the service account to use */}} -{{- define "veth.serviceAccountName" -}} +{{- define "plugins.serviceAccountName" -}} {{- if .Values.serviceAccount.create }} -{{- default (include "veth.fullname" .) .Values.serviceAccount.name }} +{{- default (include "plugins.fullname" .) .Values.serviceAccount.name }} {{- else }} {{- default "default" .Values.serviceAccount.name }} {{- end }} diff --git a/charts/veth/templates/daemonSet.yaml b/charts/plugins/templates/daemonSet.yaml similarity index 90% rename from charts/veth/templates/daemonSet.yaml rename to charts/plugins/templates/daemonSet.yaml index bef64602..a6e3d8ca 100644 --- a/charts/veth/templates/daemonSet.yaml +++ b/charts/plugins/templates/daemonSet.yaml @@ -5,7 +5,7 @@ metadata: name: kube-{{ .Chart.Name }}-ds namespace: kube-system labels: - {{- include "veth.labels" . | nindent 4 }} + {{- include "plugins.labels" . | nindent 4 }} {{- if .Values.annotations }} anotations: {{ toYaml .Values.instances.arp.ipAddressPools | indent 2 }} @@ -13,7 +13,7 @@ metadata: spec: selector: matchLabels: - app: veth + app: plugins updateStrategy: type: RollingUpdate rollingUpdate: @@ -21,8 +21,8 @@ spec: template: metadata: labels: - {{- include "veth.labels" . | nindent 8 }} - app: veth + {{- include "plugins.labels" . | nindent 8 }} + app: plugins spec: hostNetwork: true {{- with .Values.imagePullSecrets }} @@ -54,4 +54,3 @@ spec: - name: cnibin hostPath: path: /opt/cni/bin - diff --git a/charts/veth/values.schema.json b/charts/plugins/values.schema.json similarity index 100% rename from charts/veth/values.schema.json rename to charts/plugins/values.schema.json diff --git a/charts/veth/values.yaml b/charts/plugins/values.yaml similarity index 100% rename from charts/veth/values.yaml rename to charts/plugins/values.yaml diff --git a/values.schema.json b/values.schema.json deleted file mode 100644 index 300ea2a1..00000000 --- a/values.schema.json +++ /dev/null @@ -1 +0,0 @@ -error when reading file 'values.yaml': open values.yaml: no such file or directory