From fd74d0d0723f23ce548e4d202e4d0cb5294d5586 Mon Sep 17 00:00:00 2001 From: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com> Date: Wed, 26 Mar 2025 11:30:50 +0100 Subject: [PATCH 1/2] remove unused helm values Signed-off-by: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com> --- functions/kubernetes/charts/shuffle/README.md | 7 +---- .../charts/shuffle/values.schema.json | 30 ------------------- .../kubernetes/charts/shuffle/values.yaml | 24 --------------- 3 files changed, 1 insertion(+), 60 deletions(-) diff --git a/functions/kubernetes/charts/shuffle/README.md b/functions/kubernetes/charts/shuffle/README.md index 495d2690..dc0d8a41 100644 --- a/functions/kubernetes/charts/shuffle/README.md +++ b/functions/kubernetes/charts/shuffle/README.md @@ -196,9 +196,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier" | `backend.args` | Override default backend container args (useful when using custom images) | `[]` | | `backend.automountServiceAccountToken` | Mount Service Account token in backend pods | `true` | | `backend.hostAliases` | backend pods host aliases | `[]` | -| `backend.daemonsetAnnotations` | Annotations for backend daemonset | `{}` | | `backend.deploymentAnnotations` | Annotations for backend deployment | `{}` | -| `backend.statefulsetAnnotations` | Annotations for backend statefulset | `{}` | | `backend.podLabels` | Extra labels for backend pods | `{}` | | `backend.podAnnotations` | Annotations for backend pods | `{}` | | `backend.podAffinityPreset` | Pod affinity preset. Ignored if `backend.affinity` is set. Allowed values: `soft` or `hard` | `""` | @@ -314,9 +312,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier" | `frontend.args` | Override default frontend container args (useful when using custom images) | `[]` | | `frontend.automountServiceAccountToken` | Mount Service Account token in frontend pods | `false` | | `frontend.hostAliases` | frontend pods host aliases | `[]` | -| `frontend.daemonsetAnnotations` | Annotations for frontend daemonset | `{}` | | `frontend.deploymentAnnotations` | Annotations for frontend deployment | `{}` | -| `frontend.statefulsetAnnotations` | Annotations for frontend statefulset | `{}` | | `frontend.podLabels` | Extra labels for frontend pods | `{}` | | `frontend.podAnnotations` | Annotations for frontend pods | `{}` | | `frontend.podAffinityPreset` | Pod affinity preset. Ignored if `frontend.affinity` is set. Allowed values: `soft` or `hard` | `""` | @@ -421,9 +417,7 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier" | `orborus.args` | Override default orborus container args (useful when using custom images) | `[]` | | `orborus.automountServiceAccountToken` | Mount Service Account token in orborus pods | `true` | | `orborus.hostAliases` | orborus pods host aliases | `[]` | -| `orborus.daemonsetAnnotations` | Annotations for orborus daemonset | `{}` | | `orborus.deploymentAnnotations` | Annotations for orborus deployment | `{}` | -| `orborus.statefulsetAnnotations` | Annotations for orborus statefulset | `{}` | | `orborus.podLabels` | Extra labels for orborus pods | `{}` | | `orborus.podAnnotations` | Annotations for orborus pods | `{}` | | `orborus.podAffinityPreset` | Pod affinity preset. Ignored if `orborus.affinity` is set. Allowed values: `soft` or `hard` | `""` | @@ -605,3 +599,4 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier" ### Other Parameters + diff --git a/functions/kubernetes/charts/shuffle/values.schema.json b/functions/kubernetes/charts/shuffle/values.schema.json index 7a85b9fa..5cbcaa3c 100644 --- a/functions/kubernetes/charts/shuffle/values.schema.json +++ b/functions/kubernetes/charts/shuffle/values.schema.json @@ -444,21 +444,11 @@ "default": [], "items": {} }, - "daemonsetAnnotations": { - "type": "object", - "description": "Annotations for backend daemonset", - "default": {} - }, "deploymentAnnotations": { "type": "object", "description": "Annotations for backend deployment", "default": {} }, - "statefulsetAnnotations": { - "type": "object", - "description": "Annotations for backend statefulset", - "default": {} - }, "podLabels": { "type": "object", "description": "Extra labels for backend pods", @@ -1133,21 +1123,11 @@ "default": [], "items": {} }, - "daemonsetAnnotations": { - "type": "object", - "description": "Annotations for frontend daemonset", - "default": {} - }, "deploymentAnnotations": { "type": "object", "description": "Annotations for frontend deployment", "default": {} }, - "statefulsetAnnotations": { - "type": "object", - "description": "Annotations for frontend statefulset", - "default": {} - }, "podLabels": { "type": "object", "description": "Extra labels for frontend pods", @@ -1752,21 +1732,11 @@ "default": [], "items": {} }, - "daemonsetAnnotations": { - "type": "object", - "description": "Annotations for orborus daemonset", - "default": {} - }, "deploymentAnnotations": { "type": "object", "description": "Annotations for orborus deployment", "default": {} }, - "statefulsetAnnotations": { - "type": "object", - "description": "Annotations for orborus statefulset", - "default": {} - }, "podLabels": { "type": "object", "description": "Extra labels for orborus pods", diff --git a/functions/kubernetes/charts/shuffle/values.yaml b/functions/kubernetes/charts/shuffle/values.yaml index 35492f94..4b7ab585 100644 --- a/functions/kubernetes/charts/shuffle/values.yaml +++ b/functions/kubernetes/charts/shuffle/values.yaml @@ -260,18 +260,10 @@ backend: ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## hostAliases: [] - ## @param backend.daemonsetAnnotations Annotations for backend daemonset - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - ## - daemonsetAnnotations: {} ## @param backend.deploymentAnnotations Annotations for backend deployment ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ ## deploymentAnnotations: {} - ## @param backend.statefulsetAnnotations Annotations for backend statefulset - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - ## - statefulsetAnnotations: {} ## @param backend.podLabels Extra labels for backend pods ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ ## @@ -728,18 +720,10 @@ frontend: ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## hostAliases: [] - ## @param frontend.daemonsetAnnotations Annotations for frontend daemonset - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - ## - daemonsetAnnotations: {} ## @param frontend.deploymentAnnotations Annotations for frontend deployment ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ ## deploymentAnnotations: {} - ## @param frontend.statefulsetAnnotations Annotations for frontend statefulset - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - ## - statefulsetAnnotations: {} ## @param frontend.podLabels Extra labels for frontend pods ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ ## @@ -1132,18 +1116,10 @@ orborus: ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## hostAliases: [] - ## @param orborus.daemonsetAnnotations Annotations for orborus daemonset - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - ## - daemonsetAnnotations: {} ## @param orborus.deploymentAnnotations Annotations for orborus deployment ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ ## deploymentAnnotations: {} - ## @param orborus.statefulsetAnnotations Annotations for orborus statefulset - ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ - ## - statefulsetAnnotations: {} ## @param orborus.podLabels Extra labels for orborus pods ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ ## From 8be77be1194c2a159b9ee97bbe213c6277b681d1 Mon Sep 17 00:00:00 2001 From: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com> Date: Wed, 26 Mar 2025 11:50:51 +0100 Subject: [PATCH 2/2] remove statefulset values Signed-off-by: Pascal Sthamer <10992664+P4sca1@users.noreply.github.com> --- functions/kubernetes/charts/shuffle/README.md | 7 +--- .../charts/shuffle/values.schema.json | 21 ++--------- .../kubernetes/charts/shuffle/values.yaml | 35 ------------------- 3 files changed, 4 insertions(+), 59 deletions(-) diff --git a/functions/kubernetes/charts/shuffle/README.md b/functions/kubernetes/charts/shuffle/README.md index dc0d8a41..ad4dd87f 100644 --- a/functions/kubernetes/charts/shuffle/README.md +++ b/functions/kubernetes/charts/shuffle/README.md @@ -208,8 +208,6 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier" | `backend.nodeSelector` | Node labels for backend pods assignment | `{}` | | `backend.tolerations` | Tolerations for backend pods assignment | `[]` | | `backend.updateStrategy.type` | backend deployment strategy type | `RollingUpdate` | -| `backend.updateStrategy.type` | backend statefulset strategy type | `RollingUpdate` | -| `backend.podManagementPolicy` | Pod management policy for backend statefulset | `OrderedReady` | | `backend.priorityClassName` | backend pods' priorityClassName | `""` | | `backend.topologySpreadConstraints` | Topology Spread Constraints for backend pod assignment spread across your cluster among failure-domains | `[]` | | `backend.schedulerName` | Name of the k8s scheduler (other than default) for backend pods | `""` | @@ -324,8 +322,6 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier" | `frontend.nodeSelector` | Node labels for frontend pods assignment | `{}` | | `frontend.tolerations` | Tolerations for frontend pods assignment | `[]` | | `frontend.updateStrategy.type` | frontend deployment strategy type | `RollingUpdate` | -| `frontend.updateStrategy.type` | frontend statefulset strategy type | `RollingUpdate` | -| `frontend.podManagementPolicy` | Pod management policy for frontend statefulset | `OrderedReady` | | `frontend.priorityClassName` | frontend pods' priorityClassName | `""` | | `frontend.topologySpreadConstraints` | Topology Spread Constraints for frontend pod assignment spread across your cluster among failure-domains | `[]` | | `frontend.schedulerName` | Name of the k8s scheduler (other than default) for frontend pods | `""` | @@ -429,8 +425,6 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier" | `orborus.nodeSelector` | Node labels for orborus pods assignment | `{}` | | `orborus.tolerations` | Tolerations for orborus pods assignment | `[]` | | `orborus.updateStrategy.type` | orborus deployment strategy type | `RollingUpdate` | -| `orborus.updateStrategy.type` | orborus statefulset strategy type | `RollingUpdate` | -| `orborus.podManagementPolicy` | Pod management policy for orborus statefulset | `OrderedReady` | | `orborus.priorityClassName` | orborus pods' priorityClassName | `""` | | `orborus.topologySpreadConstraints` | Topology Spread Constraints for orborus pod assignment spread across your cluster among failure-domains | `[]` | | `orborus.schedulerName` | Name of the k8s scheduler (other than default) for orborus pods | `""` | @@ -600,3 +594,4 @@ SHUFFLE_ENCRYPTION_MODIFIER: "MyShuffleEncryptionModifier" ### Other Parameters + diff --git a/functions/kubernetes/charts/shuffle/values.schema.json b/functions/kubernetes/charts/shuffle/values.schema.json index 5cbcaa3c..6704da8b 100644 --- a/functions/kubernetes/charts/shuffle/values.schema.json +++ b/functions/kubernetes/charts/shuffle/values.schema.json @@ -511,16 +511,11 @@ "properties": { "type": { "type": "string", - "description": "backend statefulset strategy type", + "description": "backend deployment strategy type", "default": "RollingUpdate" } } }, - "podManagementPolicy": { - "type": "string", - "description": "Pod management policy for backend statefulset", - "default": "OrderedReady" - }, "priorityClassName": { "type": "string", "description": "backend pods' priorityClassName", @@ -1190,16 +1185,11 @@ "properties": { "type": { "type": "string", - "description": "frontend statefulset strategy type", + "description": "frontend deployment strategy type", "default": "RollingUpdate" } } }, - "podManagementPolicy": { - "type": "string", - "description": "Pod management policy for frontend statefulset", - "default": "OrderedReady" - }, "priorityClassName": { "type": "string", "description": "frontend pods' priorityClassName", @@ -1799,16 +1789,11 @@ "properties": { "type": { "type": "string", - "description": "orborus statefulset strategy type", + "description": "orborus deployment strategy type", "default": "RollingUpdate" } } }, - "podManagementPolicy": { - "type": "string", - "description": "Pod management policy for orborus statefulset", - "default": "OrderedReady" - }, "priorityClassName": { "type": "string", "description": "orborus pods' priorityClassName", diff --git a/functions/kubernetes/charts/shuffle/values.yaml b/functions/kubernetes/charts/shuffle/values.yaml index 4b7ab585..3b78b196 100644 --- a/functions/kubernetes/charts/shuffle/values.yaml +++ b/functions/kubernetes/charts/shuffle/values.yaml @@ -313,22 +313,11 @@ backend: ## ONLY FOR DEPLOYMENTS: ## @param backend.updateStrategy.type backend deployment strategy type ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy - ## ONLY FOR STATEFULSETS: - ## @param backend.updateStrategy.type backend statefulset strategy type - ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies ## updateStrategy: - ## ONLY FOR DEPLOYMENTS: ## Can be set to RollingUpdate or Recreate - ## ONLY FOR STATEFULSETS: - ## Can be set to RollingUpdate or OnDelete ## type: RollingUpdate - ## ONLY FOR STATEFULSETS: - ## @param backend.podManagementPolicy Pod management policy for backend statefulset - ## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies - ## - podManagementPolicy: OrderedReady ## @param backend.priorityClassName backend pods' priorityClassName ## priorityClassName: "" @@ -770,25 +759,13 @@ frontend: ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] - ## ONLY FOR DEPLOYMENTS: ## @param frontend.updateStrategy.type frontend deployment strategy type ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy - ## ONLY FOR STATEFULSETS: - ## @param frontend.updateStrategy.type frontend statefulset strategy type - ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies ## updateStrategy: - ## ONLY FOR DEPLOYMENTS: ## Can be set to RollingUpdate or Recreate - ## ONLY FOR STATEFULSETS: - ## Can be set to RollingUpdate or OnDelete ## type: RollingUpdate - ## ONLY FOR STATEFULSETS: - ## @param frontend.podManagementPolicy Pod management policy for frontend statefulset - ## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies - ## - podManagementPolicy: OrderedReady ## @param frontend.priorityClassName frontend pods' priorityClassName ## priorityClassName: "" @@ -1166,25 +1143,13 @@ orborus: ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] - ## ONLY FOR DEPLOYMENTS: ## @param orborus.updateStrategy.type orborus deployment strategy type ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy - ## ONLY FOR STATEFULSETS: - ## @param orborus.updateStrategy.type orborus statefulset strategy type - ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies ## updateStrategy: - ## ONLY FOR DEPLOYMENTS: ## Can be set to RollingUpdate or Recreate - ## ONLY FOR STATEFULSETS: - ## Can be set to RollingUpdate or OnDelete ## type: RollingUpdate - ## ONLY FOR STATEFULSETS: - ## @param orborus.podManagementPolicy Pod management policy for orborus statefulset - ## Ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies - ## - podManagementPolicy: OrderedReady ## @param orborus.priorityClassName orborus pods' priorityClassName ## priorityClassName: ""