Skip to content

Commit

Permalink
feat:cronjob deploy & desktop background (#3776)
Browse files Browse the repository at this point in the history
* feat:cronjob deploy

Signed-off-by: jingyang <3161362058@qq.com>

* desktop background

Signed-off-by: jingyang <3161362058@qq.com>

* delete serviceAccount

* backgrond svg

---------

Signed-off-by: jingyang <3161362058@qq.com>
  • Loading branch information
zjy365 committed Aug 29, 2023
1 parent d1f0ede commit f3a24d6
Show file tree
Hide file tree
Showing 24 changed files with 409 additions and 559 deletions.
1 change: 1 addition & 0 deletions .github/workflows/frontend.yml
Expand Up @@ -44,6 +44,7 @@ jobs:
matrix:
module:
[
providers/cronjob,
providers/template,
providers/adminer,
providers/applaunchpad,
Expand Down
3 changes: 2 additions & 1 deletion frontend/Makefile
Expand Up @@ -23,7 +23,8 @@ buildTargets := \
providers/dbprovider \
providers/applaunchpad \
providers/imagehub \
providers/template
providers/template \
providers/cronjob

buildTargets-all := $(addprefix image-build-,$(buildTargets))
pushTargets-all := $(addprefix image-push-,$(buildTargets))
Expand Down
Binary file removed frontend/desktop/public/images/background.png
Binary file not shown.
178 changes: 178 additions & 0 deletions frontend/desktop/public/images/background.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 0 additions & 12 deletions frontend/desktop/src/components/background/index.module.scss

This file was deleted.

16 changes: 0 additions & 16 deletions frontend/desktop/src/components/background/index.tsx

This file was deleted.

10 changes: 8 additions & 2 deletions frontend/desktop/src/components/desktop_content/index.tsx
Expand Up @@ -69,7 +69,13 @@ export default function DesktopContent(props: any) {
}, [openDesktopApp]);

return (
<div id="desktop" className={styles.desktop}>
<Box
id="desktop"
className={styles.desktop}
backgroundImage={'url(/images/background.svg)'}
backgroundRepeat={'no-repeat'}
backgroundSize={'cover'}
>
<Flex w="100%" h="100%" alignItems={'center'} flexDirection={'column'}>
<Box mt="12vh" minW={'508px'}>
<TimeComponent />
Expand Down Expand Up @@ -137,6 +143,6 @@ export default function DesktopContent(props: any) {
</AppWindow>
);
})}
</div>
</Box>
);
}
6 changes: 1 addition & 5 deletions frontend/desktop/src/components/layout/index.tsx
@@ -1,4 +1,3 @@
import { Background } from '@/components/background';
import Head from 'next/head';
import styles from './index.module.scss';

Expand All @@ -9,10 +8,7 @@ export default function Layout(props: any) {
<title>sealos Cloud</title>
<meta name="description" content="sealos cloud dashboard" />
</Head>
<div className={styles.desktopContainer}>
<Background />
{props.children}
</div>
<div className={styles.desktopContainer}>{props.children}</div>
</>
);
}
15 changes: 10 additions & 5 deletions frontend/providers/cronjob/deploy/manifests/appcr.yaml.tmpl
@@ -1,16 +1,21 @@
apiVersion: app.sealos.io/v1
kind: App
metadata:
name: dbprovider
name: cronjob
namespace: app-system
spec:
data:
desc: Database
url: "https://dbprovider.{{ .cloudDomain }}"
icon: "https://dbprovider.{{ .cloudDomain }}/logo.svg"
desc: CronJob
url: "https://cronjob.{{ .cloudDomain }}"
icon: "https://cronjob.{{ .cloudDomain }}/logo.svg"
menuData:
helpDropDown: false
nameColor: text-black
name: Database
name: CronJob
type: iframe
displayType: normal
i18n:
zh:
name: 定时任务
zh-Hans:
name: 定时任务
35 changes: 17 additions & 18 deletions frontend/providers/cronjob/deploy/manifests/deploy.yaml.tmpl
Expand Up @@ -2,28 +2,28 @@ apiVersion: v1
kind: Namespace
metadata:
labels:
app: dbprovider-frontend
name: dbprovider-frontend
app: cronjob-frontend
name: cronjob-frontend
---
apiVersion: v1
kind: ConfigMap
metadata:
name: dbprovider-frontend-config
namespace: dbprovider-frontend
name: cronjob-frontend-config
namespace: cronjob-frontend
data:
config.yaml: |-
addr: :3000
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: dbprovider-frontend
namespace: dbprovider-frontend
name: cronjob-frontend
namespace: cronjob-frontend
spec:
replicas: 1
selector:
matchLabels:
app: dbprovider-frontend
app: cronjob-frontend
strategy:
type: RollingUpdate
rollingUpdate:
Expand All @@ -32,11 +32,10 @@ spec:
template:
metadata:
labels:
app: dbprovider-frontend
app: cronjob-frontend
spec:
serviceAccountName: cluster-version-reader
containers:
- name: dbprovider-frontend
- name: cronjob-frontend
env:
- name: SEALOS_DOMAIN
value: {{ .cloudDomain }}
Expand All @@ -55,29 +54,29 @@ spec:
cpu: 10m
memory: 128Mi
# do not modify this image, it is used for CI/CD
image: ghcr.io/labring/sealos-dbprovider-frontend:latest
image: ghcr.io/labring/sealos-cronjob-frontend:latest
imagePullPolicy: Always
volumeMounts:
- name: dbprovider-frontend-volume
- name: cronjob-frontend-volume
mountPath: /config.yaml
subPath: config.yaml
volumes:
- name: dbprovider-frontend-volume
- name: cronjob-frontend-volume
configMap:
name: dbprovider-frontend-config
name: cronjob-frontend-config
---
apiVersion: v1
kind: Service
metadata:
labels:
app: dbprovider-frontend
name: dbprovider-frontend
namespace: dbprovider-frontend
app: cronjob-frontend
name: cronjob-frontend
namespace: cronjob-frontend
spec:
ports:
- name: http
port: 3000
protocol: TCP
targetPort: 3000
selector:
app: dbprovider-frontend
app: cronjob-frontend
39 changes: 5 additions & 34 deletions frontend/providers/cronjob/deploy/manifests/ingress.yaml.tmpl
@@ -1,32 +1,3 @@
#apiVersion: cert-manager.io/v1
#kind: ClusterIssuer
#metadata:
# name: dbprovider-cluster-issuer
# namespace: dbprovider-frontend
#spec:
# acme:
# server: https://acme-v02.api.letsencrypt.org/directory
# email: admin@sealos.io
# privateKeySecretRef:
# name: letsencrypt-prod
# solvers:
# - http01:
# ingress:
# class: nginx
#---
#apiVersion: cert-manager.io/v1
#kind: Certificate
#metadata:
# name: dbprovider-cert
# namespace: dbprovider-frontend
#spec:
# secretName: dbprovider-cert-secret
# dnsNames:
# - dbprovider.{{ .cloudDomain }}
# issuerRef:
# name: dbprovider-cluster-issuer
# kind: ClusterIssuer
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand All @@ -42,21 +13,21 @@ metadata:
expires 30d;
add_header Cache-Control "public";
}
name: dbprovider-frontend
namespace: dbprovider-frontend
name: cronjob-frontend
namespace: cronjob-frontend
spec:
rules:
- host: dbprovider.{{ .cloudDomain }}
- host: cronjob.{{ .cloudDomain }}
http:
paths:
- pathType: Prefix
path: /
backend:
service:
name: dbprovider-frontend
name: cronjob-frontend
port:
number: 3000
tls:
- hosts:
- dbprovider.{{ .cloudDomain }}
- cronjob.{{ .cloudDomain }}
secretName: {{ .certSecretName }}
Binary file modified frontend/providers/cronjob/public/favicon.ico
Binary file not shown.
4 changes: 2 additions & 2 deletions frontend/providers/cronjob/public/logo.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
106 changes: 0 additions & 106 deletions frontend/providers/cronjob/src/components/DBStatusTag/index.tsx

This file was deleted.

Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f3a24d6

Please sign in to comment.