diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml new file mode 100644 index 0000000..c2e0183 --- /dev/null +++ b/.github/workflows/charts-release.yaml @@ -0,0 +1,36 @@ +name: Release Charts + +on: + push: + branches: + - main + paths: + - "charts/*/Chart.yaml" + +jobs: + release: + # depending on default permission settings for your org (contents being read-only or read-write for workloads), you will have to add permissions + # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Install Helm + uses: azure/setup-helm@v3 + with: + version: v3.8.1 + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.4.1 + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" diff --git a/charts/cloudevents-server/.helmignore b/charts/cloudevents-server/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/charts/cloudevents-server/.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/cloudevents-server/Chart.yaml b/charts/cloudevents-server/Chart.yaml new file mode 100644 index 0000000..521110b --- /dev/null +++ b/charts/cloudevents-server/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: cloudevents-server +description: A Helm chart for Kubernetes + +# 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: "0.1.0" diff --git a/charts/cloudevents-server/templates/NOTES.txt b/charts/cloudevents-server/templates/NOTES.txt new file mode 100644 index 0000000..3cf1252 --- /dev/null +++ b/charts/cloudevents-server/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 "cloudevents-server.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 "cloudevents-server.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "cloudevents-server.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 "cloudevents-server.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/cloudevents-server/templates/_helpers.tpl b/charts/cloudevents-server/templates/_helpers.tpl new file mode 100644 index 0000000..96b963d --- /dev/null +++ b/charts/cloudevents-server/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "cloudevents-server.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 "cloudevents-server.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 "cloudevents-server.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "cloudevents-server.labels" -}} +helm.sh/chart: {{ include "cloudevents-server.chart" . }} +{{ include "cloudevents-server.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "cloudevents-server.selectorLabels" -}} +app.kubernetes.io/name: {{ include "cloudevents-server.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "cloudevents-server.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "cloudevents-server.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/cloudevents-server/templates/deployment.yaml b/charts/cloudevents-server/templates/deployment.yaml new file mode 100644 index 0000000..a81fbd2 --- /dev/null +++ b/charts/cloudevents-server/templates/deployment.yaml @@ -0,0 +1,73 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "cloudevents-server.fullname" . }} + labels: + {{- include "cloudevents-server.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "cloudevents-server.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "cloudevents-server.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "cloudevents-server.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 }} + {{- with .Values.server.args }} + args: + {{- toYaml . | nindent 12 }} + {{- end }} + ports: + - name: http + containerPort: 80 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: /healthz + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.server.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 10 }} + {{- 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 }} + {{- with .Values.server.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/cloudevents-server/templates/hpa.yaml b/charts/cloudevents-server/templates/hpa.yaml new file mode 100644 index 0000000..baca450 --- /dev/null +++ b/charts/cloudevents-server/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "cloudevents-server.fullname" . }} + labels: + {{- include "cloudevents-server.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "cloudevents-server.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/charts/cloudevents-server/templates/ingress.yaml b/charts/cloudevents-server/templates/ingress.yaml new file mode 100644 index 0000000..c6be54a --- /dev/null +++ b/charts/cloudevents-server/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "cloudevents-server.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 "cloudevents-server.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/cloudevents-server/templates/service.yaml b/charts/cloudevents-server/templates/service.yaml new file mode 100644 index 0000000..3b1b1ed --- /dev/null +++ b/charts/cloudevents-server/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "cloudevents-server.fullname" . }} + labels: + {{- include "cloudevents-server.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "cloudevents-server.selectorLabels" . | nindent 4 }} diff --git a/charts/cloudevents-server/templates/serviceaccount.yaml b/charts/cloudevents-server/templates/serviceaccount.yaml new file mode 100644 index 0000000..1223da1 --- /dev/null +++ b/charts/cloudevents-server/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "cloudevents-server.serviceAccountName" . }} + labels: + {{- include "cloudevents-server.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/cloudevents-server/templates/tests/test-connection.yaml b/charts/cloudevents-server/templates/tests/test-connection.yaml new file mode 100644 index 0000000..674dff0 --- /dev/null +++ b/charts/cloudevents-server/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "cloudevents-server.fullname" . }}-test-connection" + labels: + {{- include "cloudevents-server.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "cloudevents-server.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/cloudevents-server/values.yaml b/charts/cloudevents-server/values.yaml new file mode 100644 index 0000000..8433e20 --- /dev/null +++ b/charts/cloudevents-server/values.yaml @@ -0,0 +1,91 @@ +# Default values for cloudevents-server. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: ghcr.io/pingcap-qe/ee-apps/cloudevents-server + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +server: + args: [] + volumeMounts: [] + # - name: config + # mountPath: /config + volumes: [] + # - name: config + # emptyDir: {} + +serviceAccount: + # Specifies whether a service account should be created + create: 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: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +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 + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/cloudevents-server/client/main.go b/cloudevents-server/client/main.go index 38c3325..eb3d1ff 100644 --- a/cloudevents-server/client/main.go +++ b/cloudevents-server/client/main.go @@ -12,7 +12,7 @@ import ( ) func main() { - ctx := cloudevents.ContextWithTarget(context.Background(), "http://localhost:8080/events") + ctx := cloudevents.ContextWithTarget(context.Background(), "http://localhost:80/events") p, err := cloudevents.NewHTTP() if err != nil { log.Fatalf("failed to create protocol: %s", err.Error()) diff --git a/cloudevents-server/deployments/k8s-dev.yaml b/cloudevents-server/deployments/k8s-dev.yaml index dc5c900..1959fa4 100644 --- a/cloudevents-server/deployments/k8s-dev.yaml +++ b/cloudevents-server/deployments/k8s-dev.yaml @@ -8,7 +8,7 @@ stringData: store: driver: sqlite3 dsn: file:ent?mode=memory&cache=shared&_fk=1 ---- +--- apiVersion: v1 kind: Service metadata: @@ -17,8 +17,8 @@ metadata: app: cloudevents-server spec: ports: - - port: 8080 - protocol: TCP + - port: 80 + protocol: TCP clusterIP: None selector: app: cloudevents-server @@ -40,19 +40,23 @@ spec: app: cloudevents-server spec: containers: - - name: cloudevents-server - image: ghcr.io/pingcap-qe/ee-apps/cloudevents-server - resources: - requests: - cpu: '100m' - memory: 128Mi - limits: - cpu: '100m' - memory: 128Mi - args: [-config, "/config/config.yaml"] - volumeMounts: - - name: config - mountPath: /config + - name: cloudevents-server + image: ghcr.io/pingcap-qe/ee-apps/cloudevents-server + resources: + requests: + cpu: "100m" + memory: 128Mi + limits: + cpu: "100m" + memory: 128Mi + args: [-config, "/config/config.yaml"] + ports: + - name: http + containerPort: 80 + protocol: TCP + volumeMounts: + - name: config + mountPath: /config volumes: - name: config secret: diff --git a/cloudevents-server/main.go b/cloudevents-server/main.go index ea9386a..9679c2c 100644 --- a/cloudevents-server/main.go +++ b/cloudevents-server/main.go @@ -22,7 +22,7 @@ func main() { ) flag.StringVar(&ginMode, "mode", gin.DebugMode, "server run mode") - flag.StringVar(&serveAddr, "addr", "0.0.0.0:8080", "server run addr") + flag.StringVar(&serveAddr, "addr", "0.0.0.0:80", "server run addr") flag.StringVar(&configFile, "config", "config.yaml", "Path to the config yaml file") flag.Parse() diff --git a/cloudevents-server/skaffold.yaml b/cloudevents-server/skaffold.yaml index e802533..50e3247 100644 --- a/cloudevents-server/skaffold.yaml +++ b/cloudevents-server/skaffold.yaml @@ -3,13 +3,14 @@ kind: Config metadata: name: cloudevents-server build: - platforms: ["linux/amd64", "linux/arm64"] + platforms: ["linux/amd64"] artifacts: - image: ghcr.io/pingcap-qe/ee-apps/cloudevents-server ko: fromImage: cgr.dev/chainguard/bash:latest env: - GOPROXY={{.GOPROXY}} + - CGO_ENABLED=1 # need build in linux labels: org.opencontainers.image.licenses: MIT org.opencontainers.image.source: https://github.com/PingCAP-QE/ee-apps @@ -19,7 +20,7 @@ manifests: portForward: - resourceType: service resourceName: cloudevents-server - port: 8080 + port: 80 deploy: kubectl: {} profiles: diff --git a/cloudevents-server/test/testcaserun-events.http b/cloudevents-server/test/testcaserun-events.http index a1b31c3..f602a07 100644 --- a/cloudevents-server/test/testcaserun-events.http +++ b/cloudevents-server/test/testcaserun-events.http @@ -1,6 +1,6 @@ ### Binary Content Mode POST /events HTTP/1.1 -Host: 127.0.0.1:8080 +Host: 127.0.0.1:80 Content-Type: application/json; charset=UTF-8 CE-id: {{$randomInt 1 1000}} CE-type: test-case-run-report @@ -24,7 +24,7 @@ Ce-buildurl: https://build.url/build/123 ### Structured Content Mode POST /events HTTP/1.1 -Host: 127.0.0.1:8080 +Host: 127.0.0.1:80 Content-Type: application/cloudevents+json; charset=UTF-8 {