diff --git a/packages/grid/helm/manifests.yaml b/packages/grid/helm/manifests.yaml index 933a8df8509..bfaf4ce3dae 100644 --- a/packages/grid/helm/manifests.yaml +++ b/packages/grid/helm/manifests.yaml @@ -1,3 +1,5 @@ +--- + --- # Source: component-chart/templates/ingress.yaml # @@ -16,7 +18,10 @@ --- # Source: component-chart/templates/deployment.yaml # Create headless service for StatefulSet ------- +--- +# Source: component-chart/templates/ingress.yaml +# +--- # Source: component-chart/templates/service.yaml apiVersion: v1 kind: Service @@ -26,7 +31,7 @@ metadata: "app.kubernetes.io/name": "backend" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: externalIPs: ports: @@ -49,7 +54,7 @@ metadata: "app.kubernetes.io/component": "backend" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: replicas: 1 podManagementPolicy: "OrderedReady" @@ -66,7 +71,7 @@ spec: "app.kubernetes.io/component": "backend" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: imagePullSecrets: nodeSelector: @@ -93,7 +98,7 @@ spec: ephemeralContainers: null containers: - - image: "docker.io/openmined/grid-backend:0.8.2-beta.1" + - image: "docker.io/openmined/grid-backend:0.8.2-beta.32" name: "container-0" command: args: @@ -111,7 +116,7 @@ spec: - name: RELEASE value: production - name: VERSION - value: 0.8.2-beta.1 + value: 0.8.2-beta.32 - name: VERSION_HASH value: unknown - name: NODE_TYPE @@ -177,7 +182,7 @@ spec: "app.kubernetes.io/component": "backend" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: accessModes: - ReadWriteOnce @@ -185,6 +190,7 @@ spec: requests: storage: "100Mi" --- +# Source: component-chart/templates/deployment.yaml # Create headless service for StatefulSet apiVersion: v1 kind: Service @@ -194,7 +200,7 @@ metadata: "app.kubernetes.io/name": "backend" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: ports: # At least one port is required to have Kubernetes define an endpoint which is required for DNS to work @@ -215,7 +221,7 @@ metadata: "app.kubernetes.io/name": "frontend" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: externalIPs: ports: @@ -238,7 +244,7 @@ metadata: "app.kubernetes.io/component": "frontend" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: replicas: 1 strategy: @@ -255,7 +261,7 @@ spec: "app.kubernetes.io/component": "frontend" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: imagePullSecrets: nodeSelector: @@ -282,13 +288,13 @@ spec: ephemeralContainers: null containers: - - image: "docker.io/openmined/grid-frontend:0.8.2-beta.1" + - image: "docker.io/openmined/grid-frontend:0.8.2-beta.32" name: "container-0" command: args: env: - name: VERSION - value: 0.8.2-beta.1 + value: 0.8.2-beta.32 - name: VERSION_HASH value: unknown - name: NODE_TYPE @@ -331,7 +337,8 @@ spec: port: number: 80 rules: - - http: + - host: "" + http: paths: - backend: service: @@ -340,6 +347,9 @@ spec: number: 80 path: / pathType: Prefix + tls: + - hosts: + - "" --- # Source: component-chart/templates/service.yaml @@ -351,7 +361,7 @@ metadata: "app.kubernetes.io/name": "mongo" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: externalIPs: ports: @@ -374,7 +384,7 @@ metadata: "app.kubernetes.io/component": "mongo" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: replicas: 1 podManagementPolicy: "OrderedReady" @@ -391,7 +401,7 @@ spec: "app.kubernetes.io/component": "mongo" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: imagePullSecrets: nodeSelector: @@ -418,7 +428,7 @@ spec: ephemeralContainers: null containers: - - image: "mongo:latest" + - image: "mongo:7.0.0" name: "container-0" command: args: @@ -456,7 +466,7 @@ spec: "app.kubernetes.io/component": "mongo" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: accessModes: - ReadWriteOnce @@ -474,7 +484,7 @@ metadata: "app.kubernetes.io/name": "mongo" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: ports: # At least one port is required to have Kubernetes define an endpoint which is required for DNS to work @@ -495,7 +505,7 @@ metadata: "app.kubernetes.io/name": "proxy" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: externalIPs: ports: @@ -518,7 +528,7 @@ metadata: "app.kubernetes.io/component": "proxy" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: replicas: 1 strategy: @@ -535,7 +545,7 @@ spec: "app.kubernetes.io/component": "proxy" "app.kubernetes.io/managed-by": "Helm" annotations: - "helm.sh/chart": "component-chart-0.8.6" + "helm.sh/chart": "component-chart-0.9.1" spec: imagePullSecrets: nodeSelector: @@ -562,7 +572,7 @@ spec: ephemeralContainers: null containers: - - image: "traefik:v2.8.1" + - image: "traefik:v2.10" name: "container-0" command: args: @@ -594,9 +604,192 @@ spec: name: traefik-main-config volumeClaimTemplates: --- +# Source: component-chart/templates/service.yaml +apiVersion: v1 +kind: Service +metadata: + name: "seaweedfs" + labels: + "app.kubernetes.io/name": "seaweedfs" + "app.kubernetes.io/managed-by": "Helm" + annotations: + "helm.sh/chart": "component-chart-0.9.1" +spec: + externalIPs: + ports: + - name: "port-0" + port: 8888 + targetPort: 8888 + protocol: "TCP" + - name: "port-1" + port: 8333 + targetPort: 8333 + protocol: "TCP" + selector: + "app.kubernetes.io/name": "devspace-app" + "app.kubernetes.io/component": "seaweedfs" + type: "ClusterIP" +--- +# Source: component-chart/templates/deployment.yaml +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: "seaweedfs" + labels: + "app.kubernetes.io/name": "devspace-app" + "app.kubernetes.io/component": "seaweedfs" + "app.kubernetes.io/managed-by": "Helm" + annotations: + "helm.sh/chart": "component-chart-0.9.1" +spec: + replicas: 1 + podManagementPolicy: "OrderedReady" + serviceName: "seaweedfs-headless" + selector: + matchLabels: + "app.kubernetes.io/name": "devspace-app" + "app.kubernetes.io/component": "seaweedfs" + "app.kubernetes.io/managed-by": "Helm" + template: + metadata: + labels: + "app.kubernetes.io/name": "devspace-app" + "app.kubernetes.io/component": "seaweedfs" + "app.kubernetes.io/managed-by": "Helm" + annotations: + "helm.sh/chart": "component-chart-0.9.1" + spec: + imagePullSecrets: + nodeSelector: + null + nodeName: + null + affinity: + null + tolerations: + null + dnsConfig: + null + hostAliases: + null + overhead: + null + readinessGates: + null + securityContext: + null + topologySpreadConstraints: + null + terminationGracePeriodSeconds: 5 + ephemeralContainers: + null + containers: + - image: "chrislusf/seaweedfs:3.55" + name: "container-0" + command: + - "sh" + - "/etc/seaweedfs/start.sh" + args: + env: + - name: S3_VOLUME_SIZE_MB + value: "1024" + - name: S3_ROOT_USER + value: admin + - name: S3_ROOT_PWD + value: admin + - name: S3_PORT + value: "8333" + envFrom: + null + securityContext: + null + lifecycle: + null + livenessProbe: + null + readinessProbe: + null + startupProbe: + null + volumeDevices: + null + volumeMounts: + - mountPath: "/etc/seaweedfs/filer.toml" + name: "seaweedfs-config" + subPath: "filer.toml" + readOnly: false + - mountPath: "/etc/seaweedfs/start.sh" + name: "seaweedfs-config" + subPath: "start.sh" + readOnly: false + - mountPath: "/data/blob" + name: "seaweedfs-data" + subPath: "" + readOnly: false + initContainers: + volumes: + - name: "seaweedfs-config" + configMap: + name: seaweedfs-config + volumeClaimTemplates: + - metadata: + name: "seaweedfs-data" + labels: + "app.kubernetes.io/name": "devspace-app" + "app.kubernetes.io/component": "seaweedfs" + "app.kubernetes.io/managed-by": "Helm" + annotations: + "helm.sh/chart": "component-chart-0.9.1" + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: "5Gi" +--- # Source: component-chart/templates/ingress.yaml # +apiVersion: v1 +data: + filer.toml: | + [leveldb2] + enabled = true + dir = "./filerldb2" + start.sh: | + #! /usr/bin/env bash + + sleep 30 && + echo "s3.configure -access_key ${S3_ROOT_USER} -secret_key ${S3_ROOT_PWD} -user iam -actions Read,Write,List,Tagging,Admin -apply" \ + | weed shell > /dev/null 2>&1 \ + & weed server -s3 -s3.port=${S3_PORT} -master.volumeSizeLimitMB=${S3_VOLUME_SIZE_MB} +kind: ConfigMap +metadata: + name: seaweedfs-config + namespace: default + +--- +# Create headless service for StatefulSet +apiVersion: v1 +kind: Service +metadata: + name: "seaweedfs-headless" + labels: + "app.kubernetes.io/name": "seaweedfs" + "app.kubernetes.io/managed-by": "Helm" + annotations: + "helm.sh/chart": "component-chart-0.9.1" +spec: + ports: + # At least one port is required to have Kubernetes define an endpoint which is required for DNS to work + - port: 80 + name: web + clusterIP: None + selector: + "app.kubernetes.io/name": "devspace-app" + "app.kubernetes.io/component": "seaweedfs" + "app.kubernetes.io/managed-by": "Helm" +--- apiVersion: v1 data: dynamic.yml: | diff --git a/packages/grid/helm/syft/Chart.lock b/packages/grid/helm/syft/Chart.lock index ca5dba38a8e..e171adaed3c 100644 --- a/packages/grid/helm/syft/Chart.lock +++ b/packages/grid/helm/syft/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: component-chart repository: https://charts.devspace.sh - version: 0.8.6 -digest: sha256:dbc0467d06d4890514b116edbeb834771de9a5d61b54c2b221bb0f9147c48113 -generated: "2023-06-20T12:26:38.550418+10:00" + version: 0.9.1 +digest: sha256:fbc2b8447b97f168c9199a0bbdc3a95501a19a3213a5ddbd7a78bc4ef2ab999f +generated: "2023-09-28T21:45:16.869504405+05:30" diff --git a/packages/grid/helm/syft/Chart.yaml b/packages/grid/helm/syft/Chart.yaml index 5f97ec4593d..98f58ea14f9 100644 --- a/packages/grid/helm/syft/Chart.yaml +++ b/packages/grid/helm/syft/Chart.yaml @@ -8,5 +8,5 @@ icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft dependencies: - name: component-chart - version: "0.8.6" + version: "0.9.1" repository: "https://charts.devspace.sh" diff --git a/packages/grid/helm/syft/charts/component-chart-0.8.6.tgz b/packages/grid/helm/syft/charts/component-chart-0.8.6.tgz deleted file mode 100644 index 6681f8c86d8..00000000000 Binary files a/packages/grid/helm/syft/charts/component-chart-0.8.6.tgz and /dev/null differ diff --git a/packages/grid/helm/syft/charts/component-chart-0.9.1.tgz b/packages/grid/helm/syft/charts/component-chart-0.9.1.tgz new file mode 100644 index 00000000000..fa9d380b7e1 Binary files /dev/null and b/packages/grid/helm/syft/charts/component-chart-0.9.1.tgz differ diff --git a/packages/grid/helm/syft/templates/backend-headless.yaml b/packages/grid/helm/syft/templates/backend-headless-service.yaml similarity index 88% rename from packages/grid/helm/syft/templates/backend-headless.yaml rename to packages/grid/helm/syft/templates/backend-headless-service.yaml index 3b90239e026..5cd1e6668ac 100644 --- a/packages/grid/helm/syft/templates/backend-headless.yaml +++ b/packages/grid/helm/syft/templates/backend-headless-service.yaml @@ -1,9 +1,8 @@ ---- apiVersion: v1 kind: Service metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: backend diff --git a/packages/grid/helm/syft/templates/backend-service.yaml b/packages/grid/helm/syft/templates/backend-service.yaml new file mode 100644 index 00000000000..f1e676707bb --- /dev/null +++ b/packages/grid/helm/syft/templates/backend-service.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + helm.sh/chart: component-chart-0.9.1 + labels: + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: backend + name: backend +spec: + externalIPs: null + ports: + - name: port-0 + port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/component: backend + app.kubernetes.io/name: devspace-app + type: ClusterIP diff --git a/packages/grid/helm/syft/templates/backend.yaml b/packages/grid/helm/syft/templates/backend-statefulset.yaml similarity index 84% rename from packages/grid/helm/syft/templates/backend.yaml rename to packages/grid/helm/syft/templates/backend-statefulset.yaml index aef07935c67..73b7c565331 100644 --- a/packages/grid/helm/syft/templates/backend.yaml +++ b/packages/grid/helm/syft/templates/backend-statefulset.yaml @@ -1,30 +1,8 @@ ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - helm.sh/chart: component-chart-0.8.6 - labels: - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: backend - name: backend -spec: - externalIPs: null - ports: - - name: port-0 - port: 80 - protocol: TCP - targetPort: 80 - selector: - app.kubernetes.io/component: backend - app.kubernetes.io/name: devspace-app - type: ClusterIP ---- apiVersion: apps/v1 kind: StatefulSet metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: backend app.kubernetes.io/managed-by: Helm @@ -42,7 +20,7 @@ spec: template: metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: backend app.kubernetes.io/managed-by: Helm @@ -66,7 +44,7 @@ spec: - name: RELEASE value: production - name: VERSION - value: 0.8.2-beta.1 + value: 0.8.2-beta.32 - name: VERSION_HASH value: {{ .Values.node.settings.versionHash }} - name: NODE_TYPE @@ -104,7 +82,7 @@ spec: - name: BACKEND_STORAGE_PATH value: /storage envFrom: null - image: docker.io/openmined/grid-backend:0.8.2-beta.1 + image: docker.io/openmined/grid-backend:0.8.2-beta.32 lifecycle: null livenessProbe: null name: container-0 @@ -134,7 +112,7 @@ spec: volumeClaimTemplates: - metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: backend app.kubernetes.io/managed-by: Helm diff --git a/packages/grid/helm/syft/templates/frontend.yaml b/packages/grid/helm/syft/templates/frontend-deployment.yaml similarity index 72% rename from packages/grid/helm/syft/templates/frontend.yaml rename to packages/grid/helm/syft/templates/frontend-deployment.yaml index 5259dedd3d6..21f102978c3 100644 --- a/packages/grid/helm/syft/templates/frontend.yaml +++ b/packages/grid/helm/syft/templates/frontend-deployment.yaml @@ -1,30 +1,8 @@ ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - helm.sh/chart: component-chart-0.8.6 - labels: - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: frontend - name: frontend -spec: - externalIPs: null - ports: - - name: port-0 - port: 80 - protocol: TCP - targetPort: 80 - selector: - app.kubernetes.io/component: frontend - app.kubernetes.io/name: devspace-app - type: ClusterIP ---- apiVersion: apps/v1 kind: Deployment metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: frontend app.kubernetes.io/managed-by: Helm @@ -42,7 +20,7 @@ spec: template: metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: frontend app.kubernetes.io/managed-by: Helm @@ -54,7 +32,7 @@ spec: command: null env: - name: VERSION - value: 0.8.2-beta.1 + value: 0.8.2-beta.32 - name: VERSION_HASH value: {{ .Values.node.settings.versionHash }} - name: NODE_TYPE @@ -62,7 +40,7 @@ spec: - name: NEXT_PUBLIC_API_URL value: ${NEXT_PUBLIC_API_URL} envFrom: null - image: docker.io/openmined/grid-frontend:0.8.2-beta.1 + image: docker.io/openmined/grid-frontend:0.8.2-beta.32 lifecycle: null livenessProbe: null name: container-0 diff --git a/packages/grid/helm/syft/templates/frontend-service.yaml b/packages/grid/helm/syft/templates/frontend-service.yaml new file mode 100644 index 00000000000..5b9916d409c --- /dev/null +++ b/packages/grid/helm/syft/templates/frontend-service.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + helm.sh/chart: component-chart-0.9.1 + labels: + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: frontend + name: frontend +spec: + externalIPs: null + ports: + - name: port-0 + port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/component: frontend + app.kubernetes.io/name: devspace-app + type: ClusterIP diff --git a/packages/grid/helm/syft/templates/grid-stack-ingress.yaml b/packages/grid/helm/syft/templates/grid-stack-ingress-ingress.yaml similarity index 83% rename from packages/grid/helm/syft/templates/grid-stack-ingress.yaml rename to packages/grid/helm/syft/templates/grid-stack-ingress-ingress.yaml index 134a05a92f9..4047ef28ee6 100644 --- a/packages/grid/helm/syft/templates/grid-stack-ingress.yaml +++ b/packages/grid/helm/syft/templates/grid-stack-ingress-ingress.yaml @@ -1,4 +1,3 @@ ---- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -11,10 +10,6 @@ spec: name: proxy port: number: 80 - tls: - - hosts: - - {{ .Values.node.settings.hostname }} - # secretName: Add custom TLS secret here or default certificate is used rules: - host: {{ .Values.node.settings.hostname }} http: @@ -25,4 +20,7 @@ spec: port: number: 80 path: / - pathType: Prefix \ No newline at end of file + pathType: Prefix + tls: + - hosts: + - {{ .Values.node.settings.hostname }} diff --git a/packages/grid/helm/syft/templates/mongo-headless.yaml b/packages/grid/helm/syft/templates/mongo-headless-service.yaml similarity index 88% rename from packages/grid/helm/syft/templates/mongo-headless.yaml rename to packages/grid/helm/syft/templates/mongo-headless-service.yaml index c6cd2b22bc8..685f3c81f96 100644 --- a/packages/grid/helm/syft/templates/mongo-headless.yaml +++ b/packages/grid/helm/syft/templates/mongo-headless-service.yaml @@ -1,9 +1,8 @@ ---- apiVersion: v1 kind: Service metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: mongo diff --git a/packages/grid/helm/syft/templates/mongo-service.yaml b/packages/grid/helm/syft/templates/mongo-service.yaml new file mode 100644 index 00000000000..23699f74f21 --- /dev/null +++ b/packages/grid/helm/syft/templates/mongo-service.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + helm.sh/chart: component-chart-0.9.1 + labels: + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: mongo + name: mongo +spec: + externalIPs: null + ports: + - name: port-0 + port: 27017 + protocol: TCP + targetPort: 27017 + selector: + app.kubernetes.io/component: mongo + app.kubernetes.io/name: devspace-app + type: ClusterIP diff --git a/packages/grid/helm/syft/templates/mongo.yaml b/packages/grid/helm/syft/templates/mongo-statefulset.yaml similarity index 77% rename from packages/grid/helm/syft/templates/mongo.yaml rename to packages/grid/helm/syft/templates/mongo-statefulset.yaml index eba25bf46cd..9da6335d889 100644 --- a/packages/grid/helm/syft/templates/mongo.yaml +++ b/packages/grid/helm/syft/templates/mongo-statefulset.yaml @@ -1,30 +1,8 @@ ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - helm.sh/chart: component-chart-0.8.6 - labels: - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: mongo - name: mongo -spec: - externalIPs: null - ports: - - name: port-0 - port: 27017 - protocol: TCP - targetPort: 27017 - selector: - app.kubernetes.io/component: mongo - app.kubernetes.io/name: devspace-app - type: ClusterIP ---- apiVersion: apps/v1 kind: StatefulSet metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: mongo app.kubernetes.io/managed-by: Helm @@ -42,7 +20,7 @@ spec: template: metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: mongo app.kubernetes.io/managed-by: Helm @@ -58,7 +36,7 @@ spec: - name: MONGO_INITDB_ROOT_PASSWORD value: {{ .Values.secrets.db.mongo.mongoInitdbRootPassword }} envFrom: null - image: mongo:latest + image: mongo:7.0.0 lifecycle: null livenessProbe: null name: container-0 @@ -88,7 +66,7 @@ spec: volumeClaimTemplates: - metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: mongo app.kubernetes.io/managed-by: Helm diff --git a/packages/grid/helm/syft/templates/proxy.yaml b/packages/grid/helm/syft/templates/proxy-deployment.yaml similarity index 74% rename from packages/grid/helm/syft/templates/proxy.yaml rename to packages/grid/helm/syft/templates/proxy-deployment.yaml index 700f6b52e75..4197618d8ef 100644 --- a/packages/grid/helm/syft/templates/proxy.yaml +++ b/packages/grid/helm/syft/templates/proxy-deployment.yaml @@ -1,30 +1,8 @@ ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - helm.sh/chart: component-chart-0.8.6 - labels: - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: proxy - name: proxy -spec: - externalIPs: null - ports: - - name: proxy - port: 80 - protocol: TCP - targetPort: 80 - selector: - app.kubernetes.io/component: proxy - app.kubernetes.io/name: devspace-app - type: ClusterIP ---- apiVersion: apps/v1 kind: Deployment metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: proxy app.kubernetes.io/managed-by: Helm @@ -42,7 +20,7 @@ spec: template: metadata: annotations: - helm.sh/chart: component-chart-0.8.6 + helm.sh/chart: component-chart-0.9.1 labels: app.kubernetes.io/component: proxy app.kubernetes.io/managed-by: Helm @@ -56,7 +34,7 @@ spec: - name: SERVICE_NAME value: proxy envFrom: null - image: traefik:v2.8.1 + image: traefik:v2.10 lifecycle: null livenessProbe: null name: container-0 diff --git a/packages/grid/helm/syft/templates/proxy-service.yaml b/packages/grid/helm/syft/templates/proxy-service.yaml new file mode 100644 index 00000000000..987607391df --- /dev/null +++ b/packages/grid/helm/syft/templates/proxy-service.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + helm.sh/chart: component-chart-0.9.1 + labels: + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: proxy + name: proxy +spec: + externalIPs: null + ports: + - name: proxy + port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/component: proxy + app.kubernetes.io/name: devspace-app + type: ClusterIP diff --git a/packages/grid/k8s/manifests/seaweedfs-conf.yaml b/packages/grid/helm/syft/templates/seaweedfs-config-configmap.yaml similarity index 93% rename from packages/grid/k8s/manifests/seaweedfs-conf.yaml rename to packages/grid/helm/syft/templates/seaweedfs-config-configmap.yaml index 02e088faa95..f12bd2e697b 100644 --- a/packages/grid/k8s/manifests/seaweedfs-conf.yaml +++ b/packages/grid/helm/syft/templates/seaweedfs-config-configmap.yaml @@ -1,11 +1,9 @@ apiVersion: v1 -kind: ConfigMap data: filer.toml: | [leveldb2] enabled = true dir = "./filerldb2" - start.sh: | #! /usr/bin/env bash @@ -13,5 +11,6 @@ data: echo "s3.configure -access_key ${S3_ROOT_USER} -secret_key ${S3_ROOT_PWD} -user iam -actions Read,Write,List,Tagging,Admin -apply" \ | weed shell > /dev/null 2>&1 \ & weed server -s3 -s3.port=${S3_PORT} -master.volumeSizeLimitMB=${S3_VOLUME_SIZE_MB} +kind: ConfigMap metadata: - name: seaweed-config-filer + name: seaweedfs-config diff --git a/packages/grid/helm/syft/templates/seaweedfs-headless-service.yaml b/packages/grid/helm/syft/templates/seaweedfs-headless-service.yaml new file mode 100644 index 00000000000..850425304a2 --- /dev/null +++ b/packages/grid/helm/syft/templates/seaweedfs-headless-service.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + helm.sh/chart: component-chart-0.9.1 + labels: + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: seaweedfs + name: seaweedfs-headless +spec: + clusterIP: None + ports: + - name: web + port: 80 + selector: + app.kubernetes.io/component: seaweedfs + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: devspace-app diff --git a/packages/grid/helm/syft/templates/seaweedfs-service.yaml b/packages/grid/helm/syft/templates/seaweedfs-service.yaml new file mode 100644 index 00000000000..5bfa2fbaec4 --- /dev/null +++ b/packages/grid/helm/syft/templates/seaweedfs-service.yaml @@ -0,0 +1,24 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + helm.sh/chart: component-chart-0.9.1 + labels: + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: seaweedfs + name: seaweedfs +spec: + externalIPs: null + ports: + - name: port-0 + port: 8888 + protocol: TCP + targetPort: 8888 + - name: port-1 + port: 8333 + protocol: TCP + targetPort: 8333 + selector: + app.kubernetes.io/component: seaweedfs + app.kubernetes.io/name: devspace-app + type: ClusterIP diff --git a/packages/grid/helm/syft/templates/seaweedfs-statefulset.yaml b/packages/grid/helm/syft/templates/seaweedfs-statefulset.yaml new file mode 100644 index 00000000000..fbd97f33530 --- /dev/null +++ b/packages/grid/helm/syft/templates/seaweedfs-statefulset.yaml @@ -0,0 +1,97 @@ +apiVersion: apps/v1 +kind: StatefulSet +metadata: + annotations: + helm.sh/chart: component-chart-0.9.1 + labels: + app.kubernetes.io/component: seaweedfs + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: devspace-app + name: seaweedfs +spec: + podManagementPolicy: OrderedReady + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/component: seaweedfs + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: devspace-app + serviceName: seaweedfs-headless + template: + metadata: + annotations: + helm.sh/chart: component-chart-0.9.1 + labels: + app.kubernetes.io/component: seaweedfs + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: devspace-app + spec: + affinity: null + containers: + - args: null + command: + - sh + - /etc/seaweedfs/start.sh + env: + - name: S3_VOLUME_SIZE_MB + value: '1024' + - name: S3_ROOT_USER + value: admin + - name: S3_ROOT_PWD + value: admin + - name: S3_PORT + value: '8333' + envFrom: null + image: chrislusf/seaweedfs:3.55 + lifecycle: null + livenessProbe: null + name: container-0 + readinessProbe: null + securityContext: null + startupProbe: null + volumeDevices: null + volumeMounts: + - mountPath: /etc/seaweedfs/filer.toml + name: seaweedfs-config + readOnly: false + subPath: filer.toml + - mountPath: /etc/seaweedfs/start.sh + name: seaweedfs-config + readOnly: false + subPath: start.sh + - mountPath: /data/blob + name: seaweedfs-data + readOnly: false + subPath: '' + dnsConfig: null + ephemeralContainers: null + hostAliases: null + imagePullSecrets: null + initContainers: null + nodeName: null + nodeSelector: null + overhead: null + readinessGates: null + securityContext: null + terminationGracePeriodSeconds: 5 + tolerations: null + topologySpreadConstraints: null + volumes: + - configMap: + name: seaweedfs-config + name: seaweedfs-config + volumeClaimTemplates: + - metadata: + annotations: + helm.sh/chart: component-chart-0.9.1 + labels: + app.kubernetes.io/component: seaweedfs + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: devspace-app + name: seaweedfs-data + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 5Gi diff --git a/packages/grid/helm/syft/templates/traefik-main-config-configmap.yaml b/packages/grid/helm/syft/templates/traefik-main-config-configmap.yaml new file mode 100644 index 00000000000..829e7220b55 --- /dev/null +++ b/packages/grid/helm/syft/templates/traefik-main-config-configmap.yaml @@ -0,0 +1,68 @@ +apiVersion: v1 +data: + dynamic.yml: | + http: + services: + frontend: + loadBalancer: + servers: + - url: "http://frontend" + backend: + loadBalancer: + servers: + - url: "http://backend" + seaweedfs: + loadBalancer: + servers: + - url: "http://seaweedfs:8333" + routers: + frontend: + rule: "PathPrefix(`/`)" + entryPoints: + - "web" + service: "frontend" + backend: + rule: "PathPrefix(`/api`) || PathPrefix(`/docs`) || PathPrefix(`/redoc`)" + entryPoints: + - "web" + service: "backend" + blob-storage: + rule: "PathPrefix(`/blob`)" + entryPoints: + - "web" + service: "seaweedfs" + middlewares: + - "blob-storage-url" + - "blob-storage-host" + middlewares: + blob-storage-host: + headers: + customrequestheaders: + Host: seaweedfs:8333 + blob-storage-url: + stripprefix: + prefixes: /blob + forceslash: true + traefik.yml: | + global: + checkNewVersion: false + sendAnonymousUsage: false + + log: + level: INFO + + entryPoints: + web: + address: :80 + ping: + address: :8082 + + ping: + entryPoint: "ping" + + providers: + file: + filename: /etc/traefik/dynamic.yml +kind: ConfigMap +metadata: + name: traefik-main-config diff --git a/packages/grid/helm/syft/templates/traefik-main-config.yaml b/packages/grid/helm/syft/templates/traefik-main-config.yaml deleted file mode 100644 index e3b28b6d9ea..00000000000 --- a/packages/grid/helm/syft/templates/traefik-main-config.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -apiVersion: v1 -data: - dynamic.yml: "http:\n services:\n frontend:\n loadBalancer:\n servers:\n\ - \ - url: \"http://frontend\"\n backend:\n loadBalancer:\n \ - \ servers:\n - url: \"http://backend\"\n seaweedfs:\n loadBalancer:\n\ - \ servers:\n - url: \"http://seaweedfs:8333\"\n routers:\n \ - \ frontend:\n rule: \"PathPrefix(`/`)\"\n entryPoints:\n - \"\ - web\"\n service: \"frontend\"\n backend:\n rule: \"PathPrefix(`/api`)\ - \ || PathPrefix(`/docs`) || PathPrefix(`/redoc`)\"\n entryPoints:\n \ - \ - \"web\"\n service: \"backend\"\n blob-storage:\n rule: \"PathPrefix(`/blob`)\"\ - \n entryPoints:\n - \"web\"\n service: \"seaweedfs\"\n middlewares:\n\ - \ - \"blob-storage-url\"\n - \"blob-storage-host\"\n middlewares:\n\ - \ blob-storage-host:\n headers:\n customrequestheaders:\n \ - \ Host: seaweedfs:8333\n blob-storage-url:\n stripprefix:\n \ - \ prefixes: /blob\n forceslash: true\n" - traefik.yml: "global:\n checkNewVersion: false\n sendAnonymousUsage: false\n\n\ - log:\n level: INFO\n\nentryPoints:\n web:\n address: :80\n ping:\n address:\ - \ :8082\n\nping:\n entryPoint: \"ping\"\n\nproviders:\n file:\n filename:\ - \ /etc/traefik/dynamic.yml\n" -kind: ConfigMap -metadata: - name: traefik-main-config