From 6a4608416e279e410e1ecf5f59806f4b5c546955 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Fri, 6 Sep 2024 09:19:42 +0100 Subject: [PATCH 1/6] fix: relicense helm chart to Apache-2.0 fixes #460 --- helm/flowforge/LICENSE | 212 ++++++++++++++++++++++++++++++++++------- 1 file changed, 178 insertions(+), 34 deletions(-) diff --git a/helm/flowforge/LICENSE b/helm/flowforge/LICENSE index 7e40621b..14fbb35f 100644 --- a/helm/flowforge/LICENSE +++ b/helm/flowforge/LICENSE @@ -1,34 +1,178 @@ -The FlowForge License -Copyright (c) 2021-present FlowForge Inc - -With regard to the FlowForge Software: - -This software and associated documentation files (the "Software") may only be -used in production, if you (and any entity that you represent) have agreed to, -and are in compliance with, the FlowForge Subscription Terms (the "Terms"), -or other agreements governing the use of the Software, as mutually agreed by you -and FlowForge Inc ("FlowForge"), and otherwise have a valid FlowForge Subscription -for the active usage. Subject to the foregoing sentence, you are free to modify -this Software and publish patches to the Software. You agree that FlowForge and/or -its licensors (as applicable) retain all right, title and interest in and to all -such modifications and/or patches, and all such modifications and/or patches may -only be used, copied, modified, displayed, distributed, or otherwise exploited -with a valid Subscription. -Notwithstanding the foregoing, you may copy and modify the Software for development -and testing purposes, without requiring a subscription. You agree that FlowForge -and/or its licensors (as applicable) retain all right, title and interest in and -to all such modifications. You are not granted any other rights beyond what is -expressly stated herein. Subject to the foregoing, it is forbidden to copy, merge, -publish, distribute, sublicense, and/or sell the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -For all third party components incorporated into the FlowForge Software, those -components are licensed under the original license provided by the owner of the -applicable component. +Copyright FlowForge Inc, and other contributors, https://flowforge.com/ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS From 48adda18c3f6906f9237ec5f22f11e58446025b3 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Tue, 10 Sep 2024 15:56:11 +0200 Subject: [PATCH 2/6] Add taints for all deployments --- helm/flowforge/templates/broker.yaml | 4 ++++ helm/flowforge/templates/deployment.yaml | 4 ++++ helm/flowforge/templates/file-storage.yml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/helm/flowforge/templates/broker.yaml b/helm/flowforge/templates/broker.yaml index 4fdd7312..de41e6da 100644 --- a/helm/flowforge/templates/broker.yaml +++ b/helm/flowforge/templates/broker.yaml @@ -92,6 +92,10 @@ spec: {{- if .Values.forge.broker.resources }} resources: {{- toYaml .Values.forge.broker.resources | nindent 12 }} {{- end }} + {{- if .Values.forge.broker.tolerations}} + tolerations: + {{ toYaml .Values.forge.broker.tolerations | nindent 8 }} + {{- end }} {{- if .Values.forge.registrySecrets }} imagePullSecrets: {{- range .Values.forge.registrySecrets }} diff --git a/helm/flowforge/templates/deployment.yaml b/helm/flowforge/templates/deployment.yaml index 9929877d..147e9ae3 100644 --- a/helm/flowforge/templates/deployment.yaml +++ b/helm/flowforge/templates/deployment.yaml @@ -161,6 +161,10 @@ spec: resources: {{- toYaml .Values.forge.resources | nindent 12 }} {{- end }} securityContext: {{- toYaml .Values.forge.containerSecurityContext | nindent 10 }} + {{- if .Values.forge.tolerations}} + tolerations: + {{ toYaml .Values.forge.tolerations | nindent 8 }} + {{- end }} {{- if .Values.forge.registrySecrets }} imagePullSecrets: {{- range .Values.forge.registrySecrets }} diff --git a/helm/flowforge/templates/file-storage.yml b/helm/flowforge/templates/file-storage.yml index 342d45bf..93818f0c 100644 --- a/helm/flowforge/templates/file-storage.yml +++ b/helm/flowforge/templates/file-storage.yml @@ -131,6 +131,10 @@ spec: {{- if .Values.forge.fileStore.resources }} resources: {{- toYaml .Values.forge.fileStore.resources | nindent 12 }} {{- end }} + {{- if .Values.forge.fileStore.tolerations}} + tolerations: + {{ toYaml .Values.forge.fileStore.tolerations | nindent 8 }} + {{- end }} {{- if .Values.forge.registrySecrets }} imagePullSecrets: {{- range .Values.forge.registrySecrets }} From b1931309cd5a073ea87947bf7e40e7408ecdc958 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Tue, 10 Sep 2024 15:56:32 +0200 Subject: [PATCH 3/6] Update default values and values schema --- helm/flowforge/values.schema.json | 9 +++++++++ helm/flowforge/values.yaml | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/helm/flowforge/values.schema.json b/helm/flowforge/values.schema.json index 93f6d3bb..5ab037c5 100644 --- a/helm/flowforge/values.schema.json +++ b/helm/flowforge/values.schema.json @@ -346,6 +346,9 @@ "labels": { "type": "object" }, + "tolerations": { + "type": "array" + }, "ingress": { "type": "object", "properties": { @@ -586,6 +589,9 @@ "labels": { "type": "object" }, + "tolerations": { + "type": "array" + }, "image": { "type": "string" }, @@ -816,6 +822,9 @@ "labels": { "type": "object" }, + "tolerations": { + "type": "array" + }, "logPassthrough": { "type": "boolean" }, diff --git a/helm/flowforge/values.yaml b/helm/flowforge/values.yaml index 501b0427..ca299cae 100644 --- a/helm/flowforge/values.yaml +++ b/helm/flowforge/values.yaml @@ -43,6 +43,7 @@ forge: readOnlyRootFilesystem: true labels: {} podLabels: {} + tolerations: [] ingress.annotations: {} persistentStorage: @@ -70,6 +71,7 @@ forge: readOnlyRootFilesystem: true labels: {} podLabels: {} + tolerations: [] telemetry: backend: prometheus: @@ -120,6 +122,8 @@ forge: timeoutSeconds: 5 successThreshold: 1 failureThreshold: 3 + + tolerations: [] logPassthrough: false customHostname: From 070f6ef02f91308d9e5f773066b9b129f3f6f23a Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Tue, 10 Sep 2024 15:56:54 +0200 Subject: [PATCH 4/6] Update chart documentation --- helm/flowforge/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/helm/flowforge/README.md b/helm/flowforge/README.md index 3fa3ed33..518ae063 100644 --- a/helm/flowforge/README.md +++ b/helm/flowforge/README.md @@ -50,6 +50,7 @@ For other values please refer to the documentation below. - `forge.labels` allows to add custom labels to the core application related objects (e.g. deployment, services, etc.) (default `{}`) - `forge.podLabels` allows to add custom labels to the core application pod (default `{}`) - `forge.replicas` allows the number of instances of the FlowFuse App to be set. Scaling only supported with ingress-nginx controller (default `1`) + - `forge.tolerations` allows to configure [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for the core application deployment (default `[]`) note: `forge.projectSelector` and `forge.managementSelector` defaults mean that you must have at least 2 nodes in your cluster and they need to be labeled before installing. @@ -100,6 +101,7 @@ To use STMP to send email - `forge.broker.startupProbe` block with [startupProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) configuration for the broker pod (check [here](#liveness-readiness-and-startup-probes) for more details) - `forge.broker.labels` allows to add custom labels to the broker related objects (e.g. deployment, services, etc.) (default `{}`) - `forge.broker.podLabels` allows to add custom labels to the broker pod (default `{}`) + - `forge.broker.tolerations` allows to configure [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for the broker deployment (default `[]`) - `forge.broker.ingress.annotations` broker ingress annotations (default is `{}`) `forge.broker.ingress.annotations` values can contain the following tokens that will be replaced as follows: @@ -167,6 +169,7 @@ Enables FlowForge Telemetry - `forge.fileStore.startupProbe` block with [startupProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) configuration for the flowforge-file pod (check [here](#liveness-readiness-and-startup-probes) for more details) - `forge.fileStore.labels` allows to add custom labels to the file-server related objects (e.g. deployment, services, etc.) (default `{}`) - `forge.fileStore.podLabels` allows to add custom labels to the file-server pod (default `{}`) +- `forge.fileStore.tolerations` allows to configure [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for the file-server deployment (default `[]`) - `forge.fileStore.telemetry.backend.prometheus.enabled` enables the `/metrics` endpoint on the fileStore app for scraping by Prometheus ### Persistent Storage From 0f1f416ae28cd500f76db2973e47ef15e2eecb39 Mon Sep 17 00:00:00 2001 From: ppawlowski Date: Tue, 10 Sep 2024 16:01:30 +0200 Subject: [PATCH 5/6] Lint --- helm/flowforge/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/flowforge/values.yaml b/helm/flowforge/values.yaml index ca299cae..21397693 100644 --- a/helm/flowforge/values.yaml +++ b/helm/flowforge/values.yaml @@ -122,7 +122,7 @@ forge: timeoutSeconds: 5 successThreshold: 1 failureThreshold: 3 - + tolerations: [] logPassthrough: false From b53bec5f81af1f78847da40ea3e2ecac782136b4 Mon Sep 17 00:00:00 2001 From: hardillb Date: Tue, 10 Sep 2024 15:52:37 +0000 Subject: [PATCH 6/6] Update CHANGELOG for 2.14.0 [no ci] --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ba3b5e0..aea56d25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +#### 2.14.0: Release + + - feat: add possibility to configure tolerations (#464) @ppawlowski + - fix: relicense helm chart to Apache-2.0 (#461) @hardillb + - fix: Update README.md (#458) @hardillb + - ci: Revert `merge_multiarch_images` workflow version bump (#457) @ppawlowski + - chore(deps): bump flowfuse/github-actions-workflows from 0.14.0 to 0.28.0 (#454) @app/dependabot + - chore(deps): bump docker/build-push-action from 6.0.0 to 6.7.0 (#452) @app/dependabot + - chore(deps): bump flowfuse/github-actions-workflows from 0.10.0 to 0.28.0 (#408) @app/dependabot + #### 2.13.0: Release - feat: Release 2.8.0 (#453) @Steve-Mcl