From 02eb4544e4c6f3b3743d1a63b292967cd4f07415 Mon Sep 17 00:00:00 2001 From: Yash Gorana Date: Mon, 16 Oct 2023 12:53:18 +0000 Subject: [PATCH 1/3] [k8s] split tls from basic ingress --- packages/grid/helm/helm.py | 37 +++++++++++++++++-- packages/grid/helm/manifests.yaml | 27 ++++++++++++++ .../templates/grid-stack-ingress-ingress.yaml | 8 ++-- .../grid-stack-ingress-tls-ingress.yaml | 28 ++++++++++++++ packages/grid/helm/syft/values.yaml | 1 + packages/grid/k8s/manifests/ingress-tls.yaml | 26 +++++++++++++ 6 files changed, 118 insertions(+), 9 deletions(-) create mode 100644 packages/grid/helm/syft/templates/grid-stack-ingress-tls-ingress.yaml create mode 100644 packages/grid/k8s/manifests/ingress-tls.yaml diff --git a/packages/grid/helm/helm.py b/packages/grid/helm/helm.py index 8b0f18a8190..9931842a584 100644 --- a/packages/grid/helm/helm.py +++ b/packages/grid/helm/helm.py @@ -65,8 +65,9 @@ def replace_variables(d: Any) -> None: if "kubernetes.io/ingress.class" in d: d["kubernetes.io/ingress.class"] = "{{ .Values.ingress.ingressClass }}" - if "kind" in d and d["kind"] == "Ingress" and "spec" in d: - d["spec"]["tls"] = [{"hosts": ["{{ .Values.node.settings.hostname }}"]}] + # ONLY FOR TLS + if d.get("kind") == "Ingress" and "tls" in d.get("spec", {}): + d["spec"]["tls"][0]["hosts"][0] = "{{ .Values.node.settings.hostname }}" d["spec"]["rules"][0]["host"] = "{{ .Values.node.settings.hostname }}" @@ -91,7 +92,19 @@ def get_yaml_name(doc: dict) -> Any: return "" -def apply_patches(yaml: str, resource_name: str) -> str: +def ingress_with_tls() -> str: + script_path = os.path.dirname(os.path.realpath(__file__)) + manifest_path = os.path.normpath( + os.path.join(script_path, "..", "k8s", "manifests") + ) + ingress_tls = os.path.join(manifest_path, "ingress-tls.yaml") + + with open(ingress_tls) as fp: + return fp.read() + + +def apply_patches(yaml: str, resource_name: str, resource_kind: str) -> str: + # print(resource_kind, resource_name) # apply resource specific patches if resource_name.startswith("seaweedfs"): yaml = ( @@ -99,6 +112,14 @@ def apply_patches(yaml: str, resource_name: str) -> str: + yaml.rstrip() + "\n{{ end }}\n" ) + elif resource_kind == "ingress" and resource_name.endswith("tls"): + yaml = "{{- if .Values.node.settings.tls }}\n" + yaml.rstrip() + "\n{{ end }}\n" + elif resource_kind == "ingress" and not resource_name.endswith("tls"): + yaml = ( + "{{- if not .Values.node.settings.tls }}\n" + + yaml.rstrip() + + "\n{{ end }}\n" + ) # global patches yaml = ( @@ -140,6 +161,14 @@ def main() -> None: # Load the multi-doc yaml file try: + # append custom docs + input_data = "\n---\n".join( + [ + input_data, + ingress_with_tls(), + ] + ) + yaml_docs = list(yaml.safe_load_all(input_data)) except Exception as e: print(f"❌ Error while parsing yaml file: {e}") @@ -169,7 +198,7 @@ def main() -> None: # Create new file with name or append if it already exists new_file = os.path.join(helm_chart_template_dir, f"{name}-{kind}.yaml") yaml_dump = yaml.dump(doc) - yaml_dump = apply_patches(yaml_dump, name) + yaml_dump = apply_patches(yaml_dump, name, kind) with open(new_file, "w") as f: f.write(yaml_dump) # add document separator diff --git a/packages/grid/helm/manifests.yaml b/packages/grid/helm/manifests.yaml index b6ce5d6d21d..cc20c5b278d 100644 --- a/packages/grid/helm/manifests.yaml +++ b/packages/grid/helm/manifests.yaml @@ -277,6 +277,33 @@ spec: path: / pathType: Prefix --- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + kubernetes.io/ingress.class: '' + name: grid-stack-ingress-tls +spec: + defaultBackend: + service: + name: proxy + port: + number: 80 + rules: + - host: '' + http: + paths: + - backend: + service: + name: proxy + port: + number: 80 + path: / + pathType: Prefix + tls: + - hosts: + - '' +--- apiVersion: v1 kind: Service metadata: diff --git a/packages/grid/helm/syft/templates/grid-stack-ingress-ingress.yaml b/packages/grid/helm/syft/templates/grid-stack-ingress-ingress.yaml index 4047ef28ee6..34a8891d930 100644 --- a/packages/grid/helm/syft/templates/grid-stack-ingress-ingress.yaml +++ b/packages/grid/helm/syft/templates/grid-stack-ingress-ingress.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.node.settings.tls }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -11,8 +12,7 @@ spec: port: number: 80 rules: - - host: {{ .Values.node.settings.hostname }} - http: + - http: paths: - backend: service: @@ -21,6 +21,4 @@ spec: number: 80 path: / pathType: Prefix - tls: - - hosts: - - {{ .Values.node.settings.hostname }} +{{ end }} diff --git a/packages/grid/helm/syft/templates/grid-stack-ingress-tls-ingress.yaml b/packages/grid/helm/syft/templates/grid-stack-ingress-tls-ingress.yaml new file mode 100644 index 00000000000..afcfe0f4b49 --- /dev/null +++ b/packages/grid/helm/syft/templates/grid-stack-ingress-tls-ingress.yaml @@ -0,0 +1,28 @@ +{{- if .Values.node.settings.tls }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + annotations: + kubernetes.io/ingress.class: {{ .Values.ingress.ingressClass }} + name: grid-stack-ingress-tls +spec: + defaultBackend: + service: + name: proxy + port: + number: 80 + rules: + - host: {{ .Values.node.settings.hostname }} + http: + paths: + - backend: + service: + name: proxy + port: + number: 80 + path: / + pathType: Prefix + tls: + - hosts: + - {{ .Values.node.settings.hostname }} +{{ end }} diff --git a/packages/grid/helm/syft/values.yaml b/packages/grid/helm/syft/values.yaml index ae9ee621c0d..14097fb011e 100644 --- a/packages/grid/helm/syft/values.yaml +++ b/packages/grid/helm/syft/values.yaml @@ -22,6 +22,7 @@ db: node: settings: + tls: false hostname: "localhost" nodeName: "mynode" nodeType: "domain" diff --git a/packages/grid/k8s/manifests/ingress-tls.yaml b/packages/grid/k8s/manifests/ingress-tls.yaml new file mode 100644 index 00000000000..6476e4c846a --- /dev/null +++ b/packages/grid/k8s/manifests/ingress-tls.yaml @@ -0,0 +1,26 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: grid-stack-ingress-tls + annotations: + kubernetes.io/ingress.class: "" +spec: + defaultBackend: + service: + name: proxy + port: + number: 80 + rules: + - host: "" + http: + paths: + - backend: + service: + name: proxy + port: + number: 80 + path: / + pathType: Prefix + tls: + - hosts: + - "" From 9930592fa9dca03cd7c957b31e85ce25af5784be Mon Sep 17 00:00:00 2001 From: Yash Gorana Date: Mon, 16 Oct 2023 14:31:29 +0000 Subject: [PATCH 2/3] [k8s] remove localhost hostname --- packages/grid/helm/syft/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/grid/helm/syft/values.yaml b/packages/grid/helm/syft/values.yaml index 14097fb011e..bf42d768b8f 100644 --- a/packages/grid/helm/syft/values.yaml +++ b/packages/grid/helm/syft/values.yaml @@ -23,7 +23,7 @@ db: node: settings: tls: false - hostname: "localhost" + hostname: "" # do not make this localhost nodeName: "mynode" nodeType: "domain" versionHash: "abc" From 13384e8ff420a81e1b81fba489f569880b189284 Mon Sep 17 00:00:00 2001 From: alfred-openmined-bot <145415986+alfred-openmined-bot@users.noreply.github.com> Date: Mon, 16 Oct 2023 14:50:55 +0000 Subject: [PATCH 3/3] [syft]bump version --- .bumpversion.cfg | 2 +- VERSION | 2 +- packages/grid/VERSION | 2 +- packages/grid/devspace.yaml | 4 +- packages/grid/frontend/package.json | 2 +- packages/grid/helm/repo/index.yaml | 102 ++++++++++-------- .../grid/helm/repo/syft-0.8.2-beta.37.tgz | Bin 0 -> 8767 bytes packages/grid/helm/syft/Chart.yaml | 4 +- .../podman/podman-kube/podman-syft-kube.yaml | 4 +- packages/hagrid/hagrid/deps.py | 2 +- packages/hagrid/hagrid/manifest_template.yml | 6 +- packages/syft/setup.cfg | 2 +- packages/syft/src/syft/VERSION | 2 +- packages/syft/src/syft/__init__.py | 2 +- packages/syftcli/manifest.yml | 8 +- 15 files changed, 80 insertions(+), 64 deletions(-) create mode 100644 packages/grid/helm/repo/syft-0.8.2-beta.37.tgz diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a7b213fafc0..02c859bebff 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.8.2-beta.36 +current_version = 0.8.2-beta.37 tag = False tag_name = {new_version} commit = True diff --git a/VERSION b/VERSION index 1fd250eb1a5..7fc870fda8c 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.2-beta.36" +__version__ = "0.8.2-beta.37" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/packages/grid/VERSION b/packages/grid/VERSION index 1fd250eb1a5..7fc870fda8c 100644 --- a/packages/grid/VERSION +++ b/packages/grid/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.2-beta.36" +__version__ = "0.8.2-beta.37" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/packages/grid/devspace.yaml b/packages/grid/devspace.yaml index fe0d2227599..75b9dcefdb9 100644 --- a/packages/grid/devspace.yaml +++ b/packages/grid/devspace.yaml @@ -15,13 +15,13 @@ pipelines: run: |- run_dependencies --all ensure_pull_secrets --all - build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.36 -t dev-latest + build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.37 -t dev-latest create_deployments --all vars: DEVSPACE_ENV_FILE: "default.env" CONTAINER_REGISTRY: "docker.io" - VERSION: "0.8.2-beta.36" + VERSION: "0.8.2-beta.37" # This is a list of `images` that DevSpace can build for this project # We recommend to skip image building during development (devspace dev) as much as possible diff --git a/packages/grid/frontend/package.json b/packages/grid/frontend/package.json index b410be726cb..5b404830b24 100644 --- a/packages/grid/frontend/package.json +++ b/packages/grid/frontend/package.json @@ -1,6 +1,6 @@ { "name": "pygrid-ui", - "version": "0.8.2-beta.36", + "version": "0.8.2-beta.37", "private": true, "scripts": { "dev": "pnpm i && vite dev --host --port 80", diff --git a/packages/grid/helm/repo/index.yaml b/packages/grid/helm/repo/index.yaml index fa17adf3531..7a2ee817b8f 100644 --- a/packages/grid/helm/repo/index.yaml +++ b/packages/grid/helm/repo/index.yaml @@ -1,9 +1,25 @@ apiVersion: v1 entries: syft: + - apiVersion: v2 + appVersion: 0.8.2-beta.37 + created: "2023-10-16T14:50:09.42329655Z" + dependencies: + - name: component-chart + repository: https://charts.devspace.sh + version: 0.9.1 + description: Perform numpy-like analysis on data that remains in someone elses + server + digest: a7bfbe113d473c4edec3ffe69703633756207c8faeb9d41ac333616b97a085ce + icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png + name: syft + type: application + urls: + - https://openmined.github.io/PySyft/helm/syft-0.8.2-beta.37.tgz + version: 0.8.2-beta.37 - apiVersion: v2 appVersion: 0.8.2-beta.36 - created: "2023-10-15T13:01:00.574686139Z" + created: "2023-10-16T14:50:09.422265428Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -19,7 +35,7 @@ entries: version: 0.8.2-beta.36 - apiVersion: v2 appVersion: 0.8.2-beta.35 - created: "2023-10-15T13:01:00.574062267Z" + created: "2023-10-16T14:50:09.42173002Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -35,7 +51,7 @@ entries: version: 0.8.2-beta.35 - apiVersion: v2 appVersion: 0.8.2-beta.34 - created: "2023-10-15T13:01:00.57353823Z" + created: "2023-10-16T14:50:09.421196947Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -51,7 +67,7 @@ entries: version: 0.8.2-beta.34 - apiVersion: v2 appVersion: 0.8.2-beta.33 - created: "2023-10-15T13:01:00.572988386Z" + created: "2023-10-16T14:50:09.420665376Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -67,7 +83,7 @@ entries: version: 0.8.2-beta.33 - apiVersion: v2 appVersion: 0.8.2-beta.32 - created: "2023-10-15T13:01:00.572504413Z" + created: "2023-10-16T14:50:09.420174832Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -83,7 +99,7 @@ entries: version: 0.8.2-beta.32 - apiVersion: v2 appVersion: 0.8.2-beta.31 - created: "2023-10-15T13:01:00.571968334Z" + created: "2023-10-16T14:50:09.419612083Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -99,7 +115,7 @@ entries: version: 0.8.2-beta.31 - apiVersion: v2 appVersion: 0.8.2-beta.30 - created: "2023-10-15T13:01:00.571467281Z" + created: "2023-10-16T14:50:09.41912747Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -115,7 +131,7 @@ entries: version: 0.8.2-beta.30 - apiVersion: v2 appVersion: 0.8.2-beta.29 - created: "2023-10-15T13:01:00.57049566Z" + created: "2023-10-16T14:50:09.418146452Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -131,7 +147,7 @@ entries: version: 0.8.2-beta.29 - apiVersion: v2 appVersion: 0.8.2-beta.28 - created: "2023-10-15T13:01:00.570005867Z" + created: "2023-10-16T14:50:09.417651189Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -147,7 +163,7 @@ entries: version: 0.8.2-beta.28 - apiVersion: v2 appVersion: 0.8.2-beta.27 - created: "2023-10-15T13:01:00.569504894Z" + created: "2023-10-16T14:50:09.417144174Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -163,7 +179,7 @@ entries: version: 0.8.2-beta.27 - apiVersion: v2 appVersion: 0.8.2-beta.26 - created: "2023-10-15T13:01:00.568932747Z" + created: "2023-10-16T14:50:09.416494954Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -179,7 +195,7 @@ entries: version: 0.8.2-beta.26 - apiVersion: v2 appVersion: 0.8.2-beta.25 - created: "2023-10-15T13:01:00.56790377Z" + created: "2023-10-16T14:50:09.415435685Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -195,7 +211,7 @@ entries: version: 0.8.2-beta.25 - apiVersion: v2 appVersion: 0.8.2-beta.24 - created: "2023-10-15T13:01:00.567406372Z" + created: "2023-10-16T14:50:09.414952595Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -211,7 +227,7 @@ entries: version: 0.8.2-beta.24 - apiVersion: v2 appVersion: 0.8.2-beta.23 - created: "2023-10-15T13:01:00.566910949Z" + created: "2023-10-16T14:50:09.414462702Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -227,7 +243,7 @@ entries: version: 0.8.2-beta.23 - apiVersion: v2 appVersion: 0.8.2-beta.22 - created: "2023-10-15T13:01:00.566429412Z" + created: "2023-10-16T14:50:09.413983348Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -243,7 +259,7 @@ entries: version: 0.8.2-beta.22 - apiVersion: v2 appVersion: 0.8.2-beta.21 - created: "2023-10-15T13:01:00.56594561Z" + created: "2023-10-16T14:50:09.413480081Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -259,7 +275,7 @@ entries: version: 0.8.2-beta.21 - apiVersion: v2 appVersion: 0.8.2-beta.20 - created: "2023-10-15T13:01:00.565455076Z" + created: "2023-10-16T14:50:09.412995217Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -275,7 +291,7 @@ entries: version: 0.8.2-beta.20 - apiVersion: v2 appVersion: 0.8.2-beta.19 - created: "2023-10-15T13:01:00.564465632Z" + created: "2023-10-16T14:50:09.41201492Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -291,7 +307,7 @@ entries: version: 0.8.2-beta.19 - apiVersion: v2 appVersion: 0.8.2-beta.18 - created: "2023-10-15T13:01:00.563964478Z" + created: "2023-10-16T14:50:09.411503948Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -307,7 +323,7 @@ entries: version: 0.8.2-beta.18 - apiVersion: v2 appVersion: 0.8.2-beta.17 - created: "2023-10-15T13:01:00.56342904Z" + created: "2023-10-16T14:50:09.410995911Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -323,7 +339,7 @@ entries: version: 0.8.2-beta.17 - apiVersion: v2 appVersion: 0.8.2-beta.16 - created: "2023-10-15T13:01:00.562881249Z" + created: "2023-10-16T14:50:09.410460493Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -339,7 +355,7 @@ entries: version: 0.8.2-beta.16 - apiVersion: v2 appVersion: 0.8.2-beta.15 - created: "2023-10-15T13:01:00.56226985Z" + created: "2023-10-16T14:50:09.409712519Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -355,7 +371,7 @@ entries: version: 0.8.2-beta.15 - apiVersion: v2 appVersion: 0.8.2-beta.14 - created: "2023-10-15T13:01:00.561149662Z" + created: "2023-10-16T14:50:09.408590578Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -371,7 +387,7 @@ entries: version: 0.8.2-beta.14 - apiVersion: v2 appVersion: 0.8.2-beta.13 - created: "2023-10-15T13:01:00.560652345Z" + created: "2023-10-16T14:50:09.407929136Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -387,7 +403,7 @@ entries: version: 0.8.2-beta.13 - apiVersion: v2 appVersion: 0.8.2-beta.12 - created: "2023-10-15T13:01:00.560162763Z" + created: "2023-10-16T14:50:09.407429004Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -403,7 +419,7 @@ entries: version: 0.8.2-beta.12 - apiVersion: v2 appVersion: 0.8.2-beta.11 - created: "2023-10-15T13:01:00.559636152Z" + created: "2023-10-16T14:50:09.406930745Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -419,7 +435,7 @@ entries: version: 0.8.2-beta.11 - apiVersion: v2 appVersion: 0.8.2-beta.10 - created: "2023-10-15T13:01:00.559108408Z" + created: "2023-10-16T14:50:09.406412109Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -435,7 +451,7 @@ entries: version: 0.8.2-beta.10 - apiVersion: v2 appVersion: 0.8.2-beta.9 - created: "2023-10-15T13:01:00.57820715Z" + created: "2023-10-16T14:50:09.426400234Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -451,7 +467,7 @@ entries: version: 0.8.2-beta.9 - apiVersion: v2 appVersion: 0.8.2-beta.8 - created: "2023-10-15T13:01:00.57772415Z" + created: "2023-10-16T14:50:09.425907015Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -467,7 +483,7 @@ entries: version: 0.8.2-beta.8 - apiVersion: v2 appVersion: 0.8.2-beta.7 - created: "2023-10-15T13:01:00.577236852Z" + created: "2023-10-16T14:50:09.425419887Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -483,7 +499,7 @@ entries: version: 0.8.2-beta.7 - apiVersion: v2 appVersion: 0.8.2-beta.6 - created: "2023-10-15T13:01:00.576734105Z" + created: "2023-10-16T14:50:09.424934352Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -499,7 +515,7 @@ entries: version: 0.8.2-beta.6 - apiVersion: v2 appVersion: 0.8.2-beta.5 - created: "2023-10-15T13:01:00.576234213Z" + created: "2023-10-16T14:50:09.424438999Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -515,7 +531,7 @@ entries: version: 0.8.2-beta.5 - apiVersion: v2 appVersion: 0.8.2-beta.4 - created: "2023-10-15T13:01:00.57567997Z" + created: "2023-10-16T14:50:09.423890026Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -531,7 +547,7 @@ entries: version: 0.8.2-beta.4 - apiVersion: v2 appVersion: 0.8.2-beta.3 - created: "2023-10-15T13:01:00.570985182Z" + created: "2023-10-16T14:50:09.418637697Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -547,7 +563,7 @@ entries: version: 0.8.2-beta.3 - apiVersion: v2 appVersion: 0.8.2-beta.2 - created: "2023-10-15T13:01:00.564968339Z" + created: "2023-10-16T14:50:09.412507989Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -563,7 +579,7 @@ entries: version: 0.8.2-beta.2 - apiVersion: v2 appVersion: 0.8.2-beta.1 - created: "2023-10-15T13:01:00.558610971Z" + created: "2023-10-16T14:50:09.405917146Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -579,7 +595,7 @@ entries: version: 0.8.2-beta.1 - apiVersion: v2 appVersion: 0.8.1 - created: "2023-10-15T13:01:00.558112793Z" + created: "2023-10-16T14:50:09.405412375Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -595,7 +611,7 @@ entries: version: 0.8.1 - apiVersion: v2 appVersion: 0.8.1-beta.21 - created: "2023-10-15T13:01:00.557633229Z" + created: "2023-10-16T14:50:09.404920398Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -611,7 +627,7 @@ entries: version: 0.8.1-beta.21 - apiVersion: v2 appVersion: 0.8.1-beta.20 - created: "2023-10-15T13:01:00.557135371Z" + created: "2023-10-16T14:50:09.404425236Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -627,7 +643,7 @@ entries: version: 0.8.1-beta.20 - apiVersion: v2 appVersion: 0.8.1-beta.19 - created: "2023-10-15T13:01:00.55662508Z" + created: "2023-10-16T14:50:09.403874499Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -643,7 +659,7 @@ entries: version: 0.8.1-beta.19 - apiVersion: v2 appVersion: 0.8.1-beta.15 - created: "2023-10-15T13:01:00.556099871Z" + created: "2023-10-16T14:50:09.403374267Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -659,7 +675,7 @@ entries: version: 0.8.1-beta.15 - apiVersion: v2 appVersion: 0.8.1-beta.12 - created: "2023-10-15T13:01:00.555553894Z" + created: "2023-10-16T14:50:09.402842526Z" dependencies: - name: component-chart repository: https://charts.devspace.sh @@ -673,4 +689,4 @@ entries: urls: - https://openmined.github.io/PySyft/helm/syft-0.8.1-beta.12.tgz version: 0.8.1-beta.12 -generated: "2023-10-15T13:01:00.554839182Z" +generated: "2023-10-16T14:50:09.402121342Z" diff --git a/packages/grid/helm/repo/syft-0.8.2-beta.37.tgz b/packages/grid/helm/repo/syft-0.8.2-beta.37.tgz new file mode 100644 index 0000000000000000000000000000000000000000..25714654aabfb75cecf3c8c2e71a1adf9bfb3ad2 GIT binary patch literal 8767 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 literal 0 HcmV?d00001 diff --git a/packages/grid/helm/syft/Chart.yaml b/packages/grid/helm/syft/Chart.yaml index 5dc13168ea1..80c7c691bf9 100644 --- a/packages/grid/helm/syft/Chart.yaml +++ b/packages/grid/helm/syft/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: syft description: Perform numpy-like analysis on data that remains in someone elses server type: application -version: "0.8.2-beta.36" -appVersion: "0.8.2-beta.36" +version: "0.8.2-beta.37" +appVersion: "0.8.2-beta.37" icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png dependencies: diff --git a/packages/grid/podman/podman-kube/podman-syft-kube.yaml b/packages/grid/podman/podman-kube/podman-syft-kube.yaml index 1c8ee482c05..53b96b5e889 100644 --- a/packages/grid/podman/podman-kube/podman-syft-kube.yaml +++ b/packages/grid/podman/podman-kube/podman-syft-kube.yaml @@ -41,7 +41,7 @@ spec: - configMapRef: name: podman-syft-config - image: docker.io/openmined/grid-backend:0.8.2-beta.36 + image: docker.io/openmined/grid-backend:0.8.2-beta.37 imagePullPolicy: IfNotPresent resources: {} tty: true @@ -57,7 +57,7 @@ spec: envFrom: - configMapRef: name: podman-syft-config - image: docker.io/openmined/grid-frontend:0.8.2-beta.36 + image: docker.io/openmined/grid-frontend:0.8.2-beta.37 imagePullPolicy: IfNotPresent resources: {} tty: true diff --git a/packages/hagrid/hagrid/deps.py b/packages/hagrid/hagrid/deps.py index a1880e6ea63..f805381aaba 100644 --- a/packages/hagrid/hagrid/deps.py +++ b/packages/hagrid/hagrid/deps.py @@ -42,7 +42,7 @@ from .version import __version__ LATEST_STABLE_SYFT = "0.8.1" -LATEST_BETA_SYFT = "0.8.2-beta.36" +LATEST_BETA_SYFT = "0.8.2-beta.37" DOCKER_ERROR = """ You are running an old version of docker, possibly on Linux. You need to install v2. diff --git a/packages/hagrid/hagrid/manifest_template.yml b/packages/hagrid/hagrid/manifest_template.yml index 8268cb96302..eebcf145e9f 100644 --- a/packages/hagrid/hagrid/manifest_template.yml +++ b/packages/hagrid/hagrid/manifest_template.yml @@ -1,9 +1,9 @@ manifestVersion: 0.1 hagrid_version: 0.3.77 -syft_version: 0.8.2-beta.36 -dockerTag: 0.8.2-beta.36 +syft_version: 0.8.2-beta.37 +dockerTag: 0.8.2-beta.37 baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/ -hash: c1288b238d1703b236ed852ec7f61c101135f6b0 +hash: ffdb1e3dcbc96d98b9a124ba9e9684dd0f6e3a1f target_dir: ~/.hagrid/PySyft/ files: grid: diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg index 34c9a1c8f63..b20b46444dd 100644 --- a/packages/syft/setup.cfg +++ b/packages/syft/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = syft -version = attr: "0.8.2-beta.36" +version = attr: "0.8.2-beta.37" description = Perform numpy-like analysis on data that remains in someone elses server author = OpenMined author_email = info@openmined.org diff --git a/packages/syft/src/syft/VERSION b/packages/syft/src/syft/VERSION index 1fd250eb1a5..7fc870fda8c 100644 --- a/packages/syft/src/syft/VERSION +++ b/packages/syft/src/syft/VERSION @@ -1,5 +1,5 @@ # Mono Repo Global Version -__version__ = "0.8.2-beta.36" +__version__ = "0.8.2-beta.37" # elsewhere we can call this file: `python VERSION` and simply take the stdout # stdlib diff --git a/packages/syft/src/syft/__init__.py b/packages/syft/src/syft/__init__.py index 2804a356c90..b21552c4a38 100644 --- a/packages/syft/src/syft/__init__.py +++ b/packages/syft/src/syft/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.8.2-beta.36" +__version__ = "0.8.2-beta.37" # stdlib import pathlib diff --git a/packages/syftcli/manifest.yml b/packages/syftcli/manifest.yml index 2619f037837..3fdeb24120f 100644 --- a/packages/syftcli/manifest.yml +++ b/packages/syftcli/manifest.yml @@ -1,11 +1,11 @@ manifestVersion: 1.0 -syftVersion: 0.8.2-beta.36 -dockerTag: 0.8.2-beta.36 +syftVersion: 0.8.2-beta.37 +dockerTag: 0.8.2-beta.37 images: - - docker.io/openmined/grid-frontend:0.8.2-beta.36 - - docker.io/openmined/grid-backend:0.8.2-beta.36 + - docker.io/openmined/grid-frontend:0.8.2-beta.37 + - docker.io/openmined/grid-backend:0.8.2-beta.37 - docker.io/library/mongo:latest - docker.io/traefik:v2.10