Skip to content

Commit

Permalink
Merge pull request #167 from ZhenYiao/main
Browse files Browse the repository at this point in the history
chore workflow
  • Loading branch information
lazhenyi authored Sep 27, 2024
2 parents 883354f + b2708c2 commit c789d44
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ jobs:
- name: Deploy
uses: WyriHaximus/github-action-helm3@v3
with:
exec: helm upgrade jiaozifs-ui --install ./chart/ --namespace jiaozifs --set-string api_url=${{ secrets.JIAOZI_API_URL }} --set-string tag=${{ steps.version.outputs.version }}
exec: helm upgrade jiaozihub --install ./chart/ --namespace jiaozifs --set-string api_url=${{ secrets.JIAOZI_API_URL }} --set-string tag=${{ steps.version.outputs.version }}
kubeconfig: ${{ secrets.KUBECONTENT }}
overrule_existing_kubeconfig: "true"
9 changes: 4 additions & 5 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
apiVersion: v2
name: jiaozifs-ui
name: jiaozifshub
description: Install jiaozifs ui to provider backend function of ui.
version: 1.0.0
kubeVersion: < 1.28.0-0
home: https://jiaozifs.com/
home: https://jzhub.gitdata.com/
keywords:
- jiaozifs
- jiaozifs-ui
- jiaozihub
sources:
- https://github.com/jiaozifs/jiaozifs
- https://github.com/jiaozifs/jiaozifs-ui
- https://github.com/jiaozifs/jiaozifshub
maintainers:
- name: jiaozifs team
14 changes: 7 additions & 7 deletions chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: jiaozifs-ui-deployment
name: jiaozihub-deployment
labels:
apptype: jiaozifs-ui
apptype: jiaozihub
spec:
replicas: {{ .Values.replicas}}
selector:
matchLabels:
app: jiaozifs-ui
app: jiaozihub
template:
metadata:
labels:
app: jiaozifs-ui
apptype: jiaozifs-ui
app: jiaozihub
apptype: jiaozihub
spec:
containers:
- name: jiaozifs-ui
image: gitdatateam/jiaozifs-ui:{{ .Values.tag }}
- name: jiaozihub
image: gitdatateam/jiaozihub:{{ .Values.tag }}
imagePullPolicy: Always
env:
- name: JIAOZIFS_API_URL
Expand Down
12 changes: 6 additions & 6 deletions chart/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: jiaozifs-ui
name: jiaozihub
annotations:
meta.helm.sh/release-name: jiaozifs-ui
meta.helm.sh/release-name: jiaozihub
nginx.ingress.kubernetes.io/rewrite-target: /
nginx.ingress.kubernetes.io/proxy-connect-timeout: "30"
nginx.ingress.kubernetes.io/proxy-read-timeout: "1800"
nginx.ingress.kubernetes.io/proxy-send-timeout: "1800"
labels:
apptype: jiaozifs-ui
apptype: jiaozihub
app.kubernetes.io/managed-by: Helm
heritage: Helm
release: jiaozifs-ui
release: jiaozihub
spec:
ingressClassName: {{.Values.ingress_name}}
rules:
- host: cloud.jiaozifs.com
- host: jzhub.gitdata.ai
http:
paths:
- path: /
pathType: Prefix
backend:
service:
name: jiaozifs-ui-service
name: jiaozihub-service
port:
number: 80
6 changes: 3 additions & 3 deletions chart/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: jiaozifs-ui-service
name: jiaozihub-service
labels:
apptype: jiaozifs-ui
apptype: jiaozihub
spec:
type: ClusterIP
selector:
app: jiaozifs-ui
app: jiaozihub
ports:
- protocol: TCP
port: 80
Expand Down
2 changes: 1 addition & 1 deletion chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# See README.md for details.
replicas: 1
ingress_name: nginx
api_url: http://api.jiaozifs.com/api/v1
api_url: http://api.jzhub.gitdata.ai/api/v1
tag: latest

0 comments on commit c789d44

Please sign in to comment.