Skip to content

Commit

Permalink
Merge pull request #197 from xtreme1-io/dev
Browse files Browse the repository at this point in the history
Merge v0.9 features
  • Loading branch information
jaggerwang authored Feb 5, 2024
2 parents d12ccc4 + c2f698b commit 991ff7b
Show file tree
Hide file tree
Showing 286 changed files with 27,317 additions and 4,524 deletions.
2 changes: 1 addition & 1 deletion .ops/.gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ include:

variables:
APP_NAME: "xtreme1"
APP_VERSION: "0.8.1"
APP_VERSION: "0.9"
20 changes: 10 additions & 10 deletions .ops/dev/backend-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: xtreme1
app.kubernetes.io/instance: xtreme1
app.kubernetes.io/name: $APP_NAME
app.kubernetes.io/instance: $APP_NAME
app.kubernetes.io/component: backend
template:
metadata:
labels:
app.kubernetes.io/name: xtreme1
app.kubernetes.io/instance: xtreme1
app.kubernetes.io/name: $APP_NAME
app.kubernetes.io/instance: $APP_NAME
app.kubernetes.io/component: backend
spec:
nodeSelector:
Expand Down Expand Up @@ -68,8 +68,8 @@ metadata:
name: backend
spec:
selector:
app.kubernetes.io/name: xtreme1
app.kubernetes.io/instance: xtreme1
app.kubernetes.io/name: $APP_NAME
app.kubernetes.io/instance: $APP_NAME
app.kubernetes.io/component: backend
ports:
- name: http
Expand All @@ -85,7 +85,7 @@ metadata:
spec:
ingressClassName: nginx
rules:
- host: xtreme1.alidev.beisai.com
- host: app-dev-ce.alidev.beisai.com
http:
paths:
- backend:
Expand All @@ -97,7 +97,7 @@ spec:
pathType: Prefix
tls:
- hosts:
- xtreme1.alidev.beisai.com
- app-dev-ce.alidev.beisai.com
secretName: alidev.beisai.com
---
apiVersion: v1
Expand All @@ -120,7 +120,7 @@ metadata:
spec:
ingressClassName: nginx
rules:
- host: xtreme1.alidev.beisai.com
- host: app-dev-ce.alidev.beisai.com
http:
paths:
- backend:
Expand All @@ -132,5 +132,5 @@ spec:
pathType: Prefix
tls:
- hosts:
- xtreme1.alidev.beisai.com
- app-dev-ce.alidev.beisai.com
secretName: alidev.beisai.com
28 changes: 14 additions & 14 deletions .ops/dev/frontend-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: xtreme1
app.kubernetes.io/instance: xtreme1
app.kubernetes.io/name: $APP_NAME
app.kubernetes.io/instance: $APP_NAME
app.kubernetes.io/component: frontend
template:
metadata:
labels:
app.kubernetes.io/name: xtreme1
app.kubernetes.io/instance: xtreme1
app.kubernetes.io/name: $APP_NAME
app.kubernetes.io/instance: $APP_NAME
app.kubernetes.io/component: frontend
spec:
nodeSelector:
Expand All @@ -40,8 +40,8 @@ metadata:
name: frontend
spec:
selector:
app.kubernetes.io/name: xtreme1
app.kubernetes.io/instance: xtreme1
app.kubernetes.io/name: $APP_NAME
app.kubernetes.io/instance: $APP_NAME
app.kubernetes.io/component: frontend
ports:
- name: http
Expand All @@ -57,7 +57,7 @@ metadata:
spec:
ingressClassName: nginx
rules:
- host: xtreme1.alidev.beisai.com
- host: app-dev-ce.alidev.beisai.com
http:
paths:
- backend:
Expand All @@ -69,7 +69,7 @@ spec:
pathType: Prefix
tls:
- hosts:
- xtreme1.alidev.beisai.com
- app-dev-ce.alidev.beisai.com
secretName: alidev.beisai.com
---
apiVersion: networking.k8s.io/v1
Expand All @@ -81,7 +81,7 @@ metadata:
spec:
ingressClassName: nginx
rules:
- host: xtreme1.alidev.beisai.com
- host: app-dev-ce.alidev.beisai.com
http:
paths:
- backend:
Expand All @@ -93,7 +93,7 @@ spec:
pathType: Prefix
tls:
- hosts:
- xtreme1.alidev.beisai.com
- app-dev-ce.alidev.beisai.com
secretName: alidev.beisai.com
---
apiVersion: networking.k8s.io/v1
Expand All @@ -105,7 +105,7 @@ metadata:
spec:
ingressClassName: nginx
rules:
- host: xtreme1.alidev.beisai.com
- host: app-dev-ce.alidev.beisai.com
http:
paths:
- backend:
Expand All @@ -117,7 +117,7 @@ spec:
pathType: Prefix
tls:
- hosts:
- xtreme1.alidev.beisai.com
- app-dev-ce.alidev.beisai.com
secretName: alidev.beisai.com
---
apiVersion: networking.k8s.io/v1
Expand All @@ -129,7 +129,7 @@ metadata:
spec:
ingressClassName: nginx
rules:
- host: xtreme1.alidev.beisai.com
- host: app-dev-ce.alidev.beisai.com
http:
paths:
- backend:
Expand All @@ -141,5 +141,5 @@ spec:
pathType: Prefix
tls:
- hosts:
- xtreme1.alidev.beisai.com
- app-dev-ce.alidev.beisai.com
secretName: alidev.beisai.com
136 changes: 136 additions & 0 deletions .ops/test/backend-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: backend
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/name: $APP_NAME
app.kubernetes.io/instance: $APP_NAME
app.kubernetes.io/component: backend
template:
metadata:
labels:
app.kubernetes.io/name: $APP_NAME
app.kubernetes.io/instance: $APP_NAME
app.kubernetes.io/component: backend
spec:
nodeSelector:
dedicated: app
imagePullSecrets:
- name: basicai-registry
containers:
- name: backend
image: $BACKEND_IMAGE
env:
- name: JAVA_OPTS
value: "-XX:InitialRAMPercentage=20.0 -XX:MinRAMPercentage=80.0 -XX:MaxRAMPercentage=80.0 -XshowSettings:vm"
resources:
requests:
memory: 200Mi
cpu: 10m
limits:
memory: 2Gi
cpu: 1
ports:
- name: http
containerPort: 8080
startupProbe:
httpGet:
path: /actuator/health/liveness
port: 8080
periodSeconds: 10
failureThreshold: 6
livenessProbe:
httpGet:
path: /actuator/health/liveness
port: 8080
periodSeconds: 10
failureThreshold: 3
readinessProbe:
httpGet:
path: /actuator/health/readiness
port: 8080
initialDelaySeconds: 10
periodSeconds: 10
volumeMounts:
- name: config
mountPath: /app/config
volumes:
- name: config
configMap:
name: backend
---
apiVersion: v1
kind: Service
metadata:
name: backend
spec:
selector:
app.kubernetes.io/name: $APP_NAME
app.kubernetes.io/instance: $APP_NAME
app.kubernetes.io/component: backend
ports:
- name: http
port: 80
targetPort: 8080
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /$2
name: backend
spec:
ingressClassName: nginx
rules:
- host: app-test-ce.alidev.beisai.com
http:
paths:
- backend:
service:
name: backend
port:
number: 80
path: /api(/|$)(.*)
pathType: Prefix
tls:
- hosts:
- app-test-ce.alidev.beisai.com
secretName: alidev.beisai.com
---
apiVersion: v1
kind: Service
metadata:
name: minio
spec:
type: ExternalName
externalName: basicai-dataset-tmp-minio-endpoint.alidev.beisai.com
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
nginx.ingress.kubernetes.io/rewrite-target: /$2
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
nginx.ingress.kubernetes.io/upstream-vhost: basicai-dataset-tmp-minio-endpoint.alidev.beisai.com
nginx.ingress.kubernetes.io/proxy-body-size: 1000m
name: minio
spec:
ingressClassName: nginx
rules:
- host: app-test-ce.alidev.beisai.com
http:
paths:
- backend:
service:
name: minio
port:
number: 443
path: /minio(/|$)(.*)
pathType: Prefix
tls:
- hosts:
- app-test-ce.alidev.beisai.com
secretName: alidev.beisai.com
Loading

0 comments on commit 991ff7b

Please sign in to comment.