Skip to content

Commit

Permalink
feat(tiup-publisher): add charts and images
Browse files Browse the repository at this point in the history
Signed-off-by: wuhuizuo <wuhuizuo@126.com>
  • Loading branch information
wuhuizuo committed Sep 30, 2024
1 parent a930c7e commit e800976
Show file tree
Hide file tree
Showing 18 changed files with 502 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/charts-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: |
echo "${{ github.token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
for chart in cloudevents-server dl; do
for chart in cloudevents-server dl tiup-publisher; do
CHART_VERSION=$(grep 'version:' $chart/Chart.yaml | tail -n1 | awk '{ print $2 }')
helm package $chart
helm push $chart-${CHART_VERSION}.tgz oci://ghcr.io/pingcap-qe/ee-apps/charts
Expand Down
41 changes: 23 additions & 18 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ on:
pull_request:
branches:
- main
paths:
- .github/workflows/release.yml
- "**/Dockerfile"
- "**/*.go"
- "**/*.gomod"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -25,8 +30,8 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4
with: # we need it for skaffold build
fetch-depth: '0'
fetch-tags: 'true'
fetch-depth: "0"
fetch-tags: "true"

- uses: dorny/paths-filter@v3
id: changes
Expand All @@ -38,6 +43,8 @@ jobs:
- 'tibuild/**'
dl:
- 'dl/**'
tiup-publisher:
- 'tiup-publisher/**'
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
Expand All @@ -46,6 +53,9 @@ jobs:
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3
with:
driver-opts: |
image=moby/buildkit:v0.12.4
- name: Log in to the Container registry
uses: docker/login-action@v3
Expand All @@ -59,40 +69,35 @@ jobs:
curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
sudo install skaffold /usr/local/bin/
- name: Cache layers
uses: actions/cache@v4
with:
path: "${{ github.workspace }}/.skaffold/cache"
key: skaffold-${{ matrix.platform }}-${{ github.sha }}
restore-keys: |
skaffold-${{ matrix.platform }}-
skaffold-
- name: Build cloudevents-server image
- name: Build image - cloudevents-server
if: steps.changes.outputs.cloudevents-server == 'true'
working-directory: cloudevents-server
run: |
skaffold build \
--push=false \
--platform ${{ matrix.platform }} \
--profile local-docker \
--default-repo ghcr.io/pingcap-qe/ee-apps
- name: Build tibuild image
- name: Build image - tibuild
if: steps.changes.outputs.tibuild == 'true'
working-directory: tibuild
run: |
skaffold build \
--push=false \
--platform ${{ matrix.platform }} \
--profile local-docker \
--default-repo ghcr.io/pingcap-qe/ee-apps
- name: Build dl image
- name: Build image - dl
if: steps.changes.outputs.dl == 'true'
working-directory: dl
run: |
skaffold build \
--push=false \
--platform ${{ matrix.platform }} \
--profile local-docker \
--default-repo ghcr.io/pingcap-qe/ee-apps
- name: Build image - tiup-publisher
if: steps.changes.outputs.tiup-publisher == 'true'
working-directory: tiup-publisher
run: |
skaffold build \
--push=false \
--platform ${{ matrix.platform }} \
--default-repo ghcr.io/pingcap-qe/ee-apps
37 changes: 15 additions & 22 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4
with: # we need it for skaffold build
fetch-depth: '0'
fetch-tags: 'true'
fetch-depth: "0"
fetch-tags: "true"

- uses: dorny/paths-filter@v3
id: changes
Expand All @@ -41,6 +41,8 @@ jobs:
- 'tibuild/**'
dl:
- 'dl/**'
tiup-publisher:
- 'tiup-publisher/**'
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
Expand All @@ -65,32 +67,23 @@ jobs:
curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/v2.8.0/skaffold-linux-amd64 && \
sudo install skaffold /usr/local/bin/
- name: Cache layers
uses: actions/cache@v4
with:
path: "${{ github.workspace }}/.skaffold/cache"
key: skaffold-${{ github.sha }}
restore-keys: |
skaffold-
- name: Publish cloudevents-server image
- name: Publish image - cloudevents-server
if: steps.changes.outputs.cloudevents-server == 'true'
working-directory: cloudevents-server
run: |
skaffold build \
--profile local-docker \
--default-repo ghcr.io/pingcap-qe/ee-apps
- name: Publish tibuild image
skaffold build --default-repo ghcr.io/pingcap-qe/ee-apps
- name: Publish image - tibuild
if: steps.changes.outputs.tibuild == 'true'
working-directory: tibuild
run: |
skaffold build \
--profile local-docker \
--default-repo ghcr.io/pingcap-qe/ee-apps
- name: Publish dl image
skaffold build --default-repo ghcr.io/pingcap-qe/ee-apps
- name: Publish image - dl
if: steps.changes.outputs.dl == 'true'
working-directory: dl
run: |
skaffold build \
--profile local-docker \
--default-repo ghcr.io/pingcap-qe/ee-apps
skaffold build --default-repo ghcr.io/pingcap-qe/ee-apps
- name: Publish image - tiup-publisher
if: steps.changes.outputs.tiup-publisher == 'true'
working-directory: tiup-publisher
run: |
skaffold build --default-repo ghcr.io/pingcap-qe/ee-apps
23 changes: 23 additions & 0 deletions charts/tiup-publisher/.helmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Patterns to ignore when building packages.
# This supports shell glob matching, relative path matching, and
# negation (prefixed with !). Only one pattern per line.
.DS_Store
# Common VCS dirs
.git/
.gitignore
.bzr/
.bzrignore
.hg/
.hgignore
.svn/
# Common backup files
*.swp
*.bak
*.tmp
*.orig
*~
# Various IDEs
.project
.idea/
*.tmproj
.vscode/
24 changes: 24 additions & 0 deletions charts/tiup-publisher/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: v2
name: tiup-publisher
description: TiUP publisher service for TiUP mirrors to workaround the lock issue in TiUP.

# A chart can be either an 'application' or a 'library' chart.
#
# Application charts are a collection of templates that can be packaged into versioned archives
# to be deployed.
#
# Library charts provide useful utilities or functions for the chart developer. They're included as
# a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v0.1.0"
22 changes: 22 additions & 0 deletions charts/tiup-publisher/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range $host := .Values.ingress.hosts }}
{{- range .paths }}
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
{{- end }}
{{- end }}
{{- else if contains "NodePort" .Values.service.type }}
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "tiup-publisher.fullname" . }})
export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
echo http://$NODE_IP:$NODE_PORT
{{- else if contains "LoadBalancer" .Values.service.type }}
NOTE: It may take a few minutes for the LoadBalancer IP to be available.
You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "tiup-publisher.fullname" . }}'
export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "tiup-publisher.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
echo http://$SERVICE_IP:{{ .Values.service.port }}
{{- else if contains "ClusterIP" .Values.service.type }}
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "tiup-publisher.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
echo "Visit http://127.0.0.1:8080 to use your application"
kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
{{- end }}
62 changes: 62 additions & 0 deletions charts/tiup-publisher/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "tiup-publisher.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
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 "tiup-publisher.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
{{- $name := default .Chart.Name .Values.nameOverride }}
{{- if contains $name .Release.Name }}
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
{{- else }}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- end }}
{{- end }}

{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "tiup-publisher.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}

{{/*
Common labels
*/}}
{{- define "tiup-publisher.labels" -}}
helm.sh/chart: {{ include "tiup-publisher.chart" . }}
{{ include "tiup-publisher.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end }}

{{/*
Selector labels
*/}}
{{- define "tiup-publisher.selectorLabels" -}}
app.kubernetes.io/name: {{ include "tiup-publisher.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Create the name of the service account to use
*/}}
{{- define "tiup-publisher.serviceAccountName" -}}
{{- if .Values.serviceAccount.create }}
{{- default (include "tiup-publisher.fullname" .) .Values.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}
72 changes: 72 additions & 0 deletions charts/tiup-publisher/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "tiup-publisher.fullname" . }}
labels:
{{- include "tiup-publisher.labels" . | nindent 4 }}
spec:
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
{{- end }}
selector:
matchLabels:
{{- include "tiup-publisher.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "tiup-publisher.labels" . | nindent 8 }}
{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "tiup-publisher.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: http
containerPort: {{ .Values.service.port }}
protocol: TCP
livenessProbe:
httpGet:
path: /
port: http
readinessProbe:
httpGet:
path: /
port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.volumeMounts }}
volumeMounts:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.volumes }}
volumes:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
Loading

0 comments on commit e800976

Please sign in to comment.