Skip to content

Commit

Permalink
update chart from veth to plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
cyclinder committed Aug 25, 2022
1 parent a84cc26 commit 8e54ee5
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 25 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Empty file removed Dockerfile
Empty file.
File renamed without changes.
2 changes: 1 addition & 1 deletion charts/veth/Chart.yaml → charts/plugins/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions charts/veth/README.md → charts/plugins/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
```

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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 }}

Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ 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 }}
{{- end }}
spec:
selector:
matchLabels:
app: veth
app: plugins
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 1
template:
metadata:
labels:
{{- include "veth.labels" . | nindent 8 }}
app: veth
{{- include "plugins.labels" . | nindent 8 }}
app: plugins
spec:
hostNetwork: true
{{- with .Values.imagePullSecrets }}
Expand Down Expand Up @@ -54,4 +54,3 @@ spec:
- name: cnibin
hostPath:
path: /opt/cni/bin

File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion values.schema.json

This file was deleted.

0 comments on commit 8e54ee5

Please sign in to comment.