diff --git a/functions/kubernetes/charts/shuffle/README.md b/functions/kubernetes/charts/shuffle/README.md index 95329d8e..c022f1e7 100644 --- a/functions/kubernetes/charts/shuffle/README.md +++ b/functions/kubernetes/charts/shuffle/README.md @@ -197,9 +197,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` | `""` | @@ -211,8 +209,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 | `""` | @@ -316,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` | `""` | @@ -330,8 +324,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 | `""` | @@ -424,9 +416,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` | `""` | @@ -438,8 +428,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 | `""` | @@ -610,4 +598,3 @@ 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 f326c08c..c733cd70 100644 --- a/functions/kubernetes/charts/shuffle/values.schema.json +++ b/functions/kubernetes/charts/shuffle/values.schema.json @@ -449,21 +449,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", @@ -526,16 +516,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", @@ -1143,21 +1128,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", @@ -1220,16 +1195,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", @@ -1767,21 +1737,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", @@ -1844,16 +1804,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 8092f041..68480593 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/ ## @@ -321,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: "" @@ -728,18 +709,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/ ## @@ -786,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: "" @@ -1132,18 +1093,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/ ## @@ -1190,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: ""