Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add cloud cluster image #3462

Merged
merged 8 commits into from Jul 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -33,8 +33,6 @@ spec:
memory: 64Mi
- name: manager
envFrom:
- configMapRef:
name: account-manager-configmap
- secretRef:
name: payment-secret
securityContext:
Expand Down
2 changes: 0 additions & 2 deletions controllers/account/deploy/manifests/deploy.yaml
Expand Up @@ -1146,8 +1146,6 @@ spec:
- name: DebtDetectionCycleSeconds
value: "300"
envFrom:
- configMapRef:
name: account-manager-configmap
- secretRef:
name: payment-secret
image: ghcr.io/labring/sealos-account-controller:dev
Expand Down
10 changes: 10 additions & 0 deletions controllers/cloud/deploy/Kubefile
@@ -0,0 +1,10 @@
FROM scratch

USER 65532:65532

COPY registry registry
COPY manifests manifests

ENV canConnectToExternalNetwork="false"

CMD ["kubectl apply -f manifests"]
21 changes: 21 additions & 0 deletions controllers/cloud/deploy/manifests/configmaps.yaml
@@ -0,0 +1,21 @@
apiVersion: v1
data:
config.json: |
{
"CollectorURL": "https://anqp0y.laf.dev/CollectorHandle",
"NotificationURL": "https://anqp0y.laf.dev/NotificationHandle",
"RegisterURL": "https://anqp0y.laf.dev/RegisterHandle",
"CloudSyncURL": "https://anqp0y.laf.dev/CloudSyncHandle",
"LicenseMonitorURL": "https://anqp0y.laf.dev/LicenseMonitor"
}
kind: ConfigMap
metadata:
name: cloud-config
namespace: cloud-system
---
apiVersion: v1
data: null
kind: ConfigMap
metadata:
name: cloud-license-history
namespace: cloud-system
Expand Up @@ -506,37 +506,6 @@ subjects:
namespace: cloud-system
---
apiVersion: v1
data:
config.json: |
{
"CollectorURL": "https://anqp0y.laf.dev/CollectorHandle",
"NotificationURL": "https://anqp0y.laf.dev/NotificationHandle",
"RegisterURL": "https://anqp0y.laf.dev/RegisterHandle",
"CloudSyncURL": "https://anqp0y.laf.dev/CloudSyncHandle",
"LicenseMonitorURL": "https://anqp0y.laf.dev/LicenseMonitor"
}
kind: ConfigMap
metadata:
name: cloud-config
namespace: cloud-system
---
apiVersion: v1
data: null
kind: ConfigMap
metadata:
name: cloud-license-history
namespace: cloud-system
---
apiVersion: v1
data:
canConnectToExternalNetwork: RmFsc2U=
kind: Secret
metadata:
name: cloud-env
namespace: cloud-system
type: Opaque
---
apiVersion: v1
kind: Service
metadata:
labels:
Expand Down Expand Up @@ -631,11 +600,8 @@ spec:
- /manager
env:
- name: CAN_CONNECT_TO_EXTERNAL_NETWORK
valueFrom:
secretKeyRef:
key: canConnectToExternalNetwork
name: cloud-env
image: ghcr.io/labring/sealos-cloud-controller:latest
value: {{ .canConnectToExternalNetwork } }
image: ghcr.io/labring/sealos-cloud-controller:dev
livenessProbe:
httpGet:
path: /healthz
Expand Down
11 changes: 11 additions & 0 deletions deploy/cloud/manifests/account-secret.yaml
@@ -0,0 +1,11 @@
apiVersion: v1
kind: Secret
metadata:
name: payment-secret
namespace: account-system
Opaque:
MchID:
AppID:
MchAPIv3Key:
MchCertificateSerialNumber:
WechatPrivateKey:
1 change: 0 additions & 1 deletion frontend/providers/costcenter/deploy/Kubefile
Expand Up @@ -7,6 +7,5 @@ COPY manifests manifests

ENV certSecretName="wildcard-cert"
ENV cloudDomain="cloud.example.com"
ENV zalandoEnabled="0"

CMD ["kubectl apply -f manifests"]