diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml index ff45fc7..c018cd1 100644 --- a/.github/workflows/charts-release.yaml +++ b/.github/workflows/charts-release.yaml @@ -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 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 61f4952..178464c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,6 +3,11 @@ on: pull_request: branches: - main + paths: + - .github/workflows/release.yml + - "**/Dockerfile" + - "**/*.go" + - "**/*.gomod" concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -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 @@ -38,6 +43,8 @@ jobs: - 'tibuild/**' dl: - 'dl/**' + tiup-publisher: + - 'tiup-publisher/**' # https://github.com/docker/setup-qemu-action - name: Set up QEMU @@ -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 @@ -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 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 53ebb06..f301da3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -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 @@ -41,6 +41,8 @@ jobs: - 'tibuild/**' dl: - 'dl/**' + tiup-publisher: + - 'tiup-publisher/**' # https://github.com/docker/setup-qemu-action - name: Set up QEMU @@ -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 diff --git a/charts/tiup-publisher/.helmignore b/charts/tiup-publisher/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/tiup-publisher/.helmignore @@ -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/ diff --git a/charts/tiup-publisher/Chart.yaml b/charts/tiup-publisher/Chart.yaml new file mode 100644 index 0000000..2dcd096 --- /dev/null +++ b/charts/tiup-publisher/Chart.yaml @@ -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" diff --git a/charts/tiup-publisher/templates/NOTES.txt b/charts/tiup-publisher/templates/NOTES.txt new file mode 100644 index 0000000..07630f5 --- /dev/null +++ b/charts/tiup-publisher/templates/NOTES.txt @@ -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 }} diff --git a/charts/tiup-publisher/templates/_helpers.tpl b/charts/tiup-publisher/templates/_helpers.tpl new file mode 100644 index 0000000..69f9d46 --- /dev/null +++ b/charts/tiup-publisher/templates/_helpers.tpl @@ -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 }} diff --git a/charts/tiup-publisher/templates/deployment.yaml b/charts/tiup-publisher/templates/deployment.yaml new file mode 100644 index 0000000..e29d4d2 --- /dev/null +++ b/charts/tiup-publisher/templates/deployment.yaml @@ -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 }} diff --git a/charts/tiup-publisher/templates/hpa.yaml b/charts/tiup-publisher/templates/hpa.yaml new file mode 100644 index 0000000..d2c60ad --- /dev/null +++ b/charts/tiup-publisher/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "tiup-publisher.fullname" . }} + labels: + {{- include "tiup-publisher.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "tiup-publisher.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/charts/tiup-publisher/templates/ingress.yaml b/charts/tiup-publisher/templates/ingress.yaml new file mode 100644 index 0000000..3103751 --- /dev/null +++ b/charts/tiup-publisher/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "tiup-publisher.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "tiup-publisher.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/charts/tiup-publisher/templates/serviceaccount.yaml b/charts/tiup-publisher/templates/serviceaccount.yaml new file mode 100644 index 0000000..62fb775 --- /dev/null +++ b/charts/tiup-publisher/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "tiup-publisher.serviceAccountName" . }} + labels: + {{- include "tiup-publisher.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/charts/tiup-publisher/templates/tests/test-connection.yaml b/charts/tiup-publisher/templates/tests/test-connection.yaml new file mode 100644 index 0000000..b682e42 --- /dev/null +++ b/charts/tiup-publisher/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "tiup-publisher.fullname" . }}-test-connection" + labels: + {{- include "tiup-publisher.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "tiup-publisher.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/tiup-publisher/values.yaml b/charts/tiup-publisher/values.yaml new file mode 100644 index 0000000..213f847 --- /dev/null +++ b/charts/tiup-publisher/values.yaml @@ -0,0 +1,99 @@ +# Default values for tiup-publisher. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: ghcr.io/pingcap-qe/ee-apps/tiup-publisher + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +# current not supported +# service: +# type: ClusterIP +# port: 80 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: [] +# - name: foo +# secret: +# secretName: mysecret +# optional: false + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: [] +# - name: foo +# mountPath: "/etc/foo" +# readOnly: true + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/cloudevents-server/README.md b/cloudevents-server/README.md index a4613e4..6e7f31c 100644 --- a/cloudevents-server/README.md +++ b/cloudevents-server/README.md @@ -19,7 +19,7 @@ go run . -config=configs/example-config.yaml - manualy build the container images with docker ```bash -skaffold build --profile local-docker --default-repo +skaffold build --default-repo ``` - manualy build the container images with cluster(that has amd64 and arm64 nodes) diff --git a/cloudevents-server/skaffold.yaml b/cloudevents-server/skaffold.yaml index 85aeb2f..aa1731a 100644 --- a/cloudevents-server/skaffold.yaml +++ b/cloudevents-server/skaffold.yaml @@ -6,22 +6,12 @@ build: platforms: ["linux/amd64", "linux/arm64"] artifacts: - image: cloudevents-server - kaniko: + docker: dockerfile: Dockerfile - cache: {} - cluster: + local: + useDockerCLI: true + useBuildkit: true concurrency: 0 - randomDockerConfigSecret: false - randomPullSecret: false - dockerConfig: - secretName: hub-pingcap-net-ee - resources: - requests: - cpu: "1" - memory: 2Gi - limits: - cpu: "2" - memory: 4Gi manifests: rawYaml: - deployments/k8s-dev.yaml @@ -31,14 +21,3 @@ portForward: port: 80 deploy: kubectl: {} -profiles: - - name: local-docker - build: - local: - useDockerCLI: true - useBuildkit: true - concurrency: 0 - patches: - - op: move - from: /build/artifacts/0/kaniko - path: /build/artifacts/0/docker diff --git a/dl/skaffold.yaml b/dl/skaffold.yaml index a139b5b..1eec57a 100644 --- a/dl/skaffold.yaml +++ b/dl/skaffold.yaml @@ -6,30 +6,9 @@ build: platforms: ["linux/amd64", "linux/arm64"] artifacts: - image: dl - kaniko: + docker: dockerfile: Dockerfile - cache: {} - cluster: + local: + useDockerCLI: true + useBuildkit: true concurrency: 0 - randomDockerConfigSecret: false - randomPullSecret: false - dockerConfig: - secretName: hub-pingcap-net-ee - resources: - requests: - cpu: "1" - memory: 2Gi - limits: - cpu: "2" - memory: 4Gi -profiles: - - name: local-docker - build: - local: - useDockerCLI: true - useBuildkit: true - concurrency: 0 - patches: - - op: move - from: /build/artifacts/0/kaniko - path: /build/artifacts/0/docker diff --git a/tibuild/skaffold.yaml b/tibuild/skaffold.yaml index 4cf55d7..0110066 100644 --- a/tibuild/skaffold.yaml +++ b/tibuild/skaffold.yaml @@ -6,30 +6,9 @@ build: platforms: ["linux/amd64", "linux/arm64"] artifacts: - image: tibuild - kaniko: + docker: dockerfile: Dockerfile - cache: {} - cluster: + local: + useDockerCLI: true + useBuildkit: true concurrency: 0 - randomDockerConfigSecret: false - randomPullSecret: false - dockerConfig: - secretName: hub-pingcap-net-ee - resources: - requests: - cpu: "1" - memory: 2Gi - limits: - cpu: "2" - memory: 4Gi -profiles: - - name: local-docker - build: - local: - useDockerCLI: true - useBuildkit: true - concurrency: 0 - patches: - - op: move - from: /build/artifacts/0/kaniko - path: /build/artifacts/0/docker diff --git a/tiup-publisher/Dockerfile b/tiup-publisher/Dockerfile new file mode 100644 index 0000000..e9b8e0b --- /dev/null +++ b/tiup-publisher/Dockerfile @@ -0,0 +1,13 @@ +FROM golang:1.23.1-alpine AS builder + +COPY . /app +RUN --mount=type=cache,target=/go/pkg/mod cd /app && go build -o server ./cmd/server + +# final image +# there are oras and tiup tools in the image. +FROM ghcr.io/pingcap-qe/cd/utils/release:v20240901-17-g6749b2e +LABEL org.opencontainers.image.licenses="MIT" +LABEL org.opencontainers.image.source="https://github.com/PingCAP-QE/ee-apps" + +COPY --from=builder --chown=root:root /app/server /app/server +ENTRYPOINT [ "/app/server" ] diff --git a/tiup-publisher/go.mod b/tiup-publisher/go.mod index 61307ab..5eff1bc 100644 --- a/tiup-publisher/go.mod +++ b/tiup-publisher/go.mod @@ -9,9 +9,13 @@ require ( github.com/stretchr/testify v1.9.0 gopkg.in/yaml.v3 v3.0.1 oras.land/oras-go/v2 v2.5.0 + github.com/rs/zerolog v1.33.0 ) require ( + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect + golang.org/x/sys v0.23.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/uuid v1.6.0 // indirect diff --git a/tiup-publisher/go.sum b/tiup-publisher/go.sum index 2e8cf2b..dc186df 100644 --- a/tiup-publisher/go.sum +++ b/tiup-publisher/go.sum @@ -2,10 +2,12 @@ github.com/PingCAP-QE/ee-apps/dl v0.0.0-20240926143418-da3f56b05e46 h1:VsOcy58bT github.com/PingCAP-QE/ee-apps/dl v0.0.0-20240926143418-da3f56b05e46/go.mod h1:SgEiJheCBFDHDeMSK5hB/xZtGAJBM/L6f6YU40Gg7wo= github.com/cloudevents/sdk-go/v2 v2.15.2 h1:54+I5xQEnI73RBhWHxbI1XJcqOFOVJN85vb41+8mHUc= github.com/cloudevents/sdk-go/v2 v2.15.2/go.mod h1:lL7kSWAE/V8VI4Wh0jbL2v/jvqsm6tjmaQBSvxcv4uE= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -20,6 +22,11 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -32,11 +39,15 @@ github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2sz github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= +github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/segmentio/kafka-go v0.4.47 h1:IqziR4pA3vrZq7YdRxaT3w1/5fvIH5qpCwstUanQQB0= github.com/segmentio/kafka-go v0.4.47/go.mod h1:HjF6XbOKh0Pjlkr5GVZxt6CsjjwnmhVOfURM5KMd8qg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -84,9 +95,14 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= diff --git a/tiup-publisher/handler.go b/tiup-publisher/handler.go index 59ce438..972f968 100644 --- a/tiup-publisher/handler.go +++ b/tiup-publisher/handler.go @@ -48,7 +48,7 @@ func (h *Handler) Handle(event cloudevents.Event) cloudevents.Result { func (h *Handler) handleImpl(data *PublishRequestEvent) cloudevents.Result { // 1. get the the tarball from data.From. - saveTo, err := h.downloadFile(data) + saveTo, err := downloadFile(data) if err != nil { return cloudevents.NewReceipt(true, "download file failed: %v", err) } @@ -67,7 +67,7 @@ func (h *Handler) handleImpl(data *PublishRequestEvent) cloudevents.Result { return cloudevents.ResultACK } -func (h *Handler) downloadFile(data *PublishRequestEvent) (string, error) { +func downloadFile(data *PublishRequestEvent) (string, error) { switch data.From.Type { case FromTypeOci: // save to file with `saveTo` param: diff --git a/tiup-publisher/skaffold.yaml b/tiup-publisher/skaffold.yaml new file mode 100644 index 0000000..e501014 --- /dev/null +++ b/tiup-publisher/skaffold.yaml @@ -0,0 +1,14 @@ +apiVersion: skaffold/v4beta6 +kind: Config +metadata: + name: tiup-publisher +build: + platforms: ["linux/amd64", "linux/arm64"] + artifacts: + - image: dl + docker: + dockerfile: Dockerfile + local: + useDockerCLI: true + useBuildkit: true + concurrency: 0 diff --git a/tiup-publisher/types.go b/tiup-publisher/types.go index baf7629..1f71b35 100644 --- a/tiup-publisher/types.go +++ b/tiup-publisher/types.go @@ -2,8 +2,9 @@ package main const ( EventTypeTiupPublishRequest = "tiup-publish-request" - FromTypeOci = "oci" - FromTypeHTTP = "http" + + FromTypeOci = "oci" + FromTypeHTTP = "http" ) type Config struct { @@ -19,9 +20,8 @@ type Config struct { } type PublishRequestEvent struct { - MirrorName string `json:"mirror_name,omitempty"` // staging or production. - From From `json:"from,omitempty"` - Publish PublishInfo `json:"publish,omitempty"` + From From `json:"from,omitempty"` + Publish PublishInfo `json:"publish,omitempty"` } type From struct { Type string `json:"type,omitempty"`