diff --git a/CHANGELOG.md b/CHANGELOG.md index f5b30e9d5..d57742ae6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ## Bug Fixes - Remove VirtualObjects and Templates from the list of CRDs whose finalizers can be forcibly deleted (they have no finalizers). +- Fix issues with partial and conditional deployments (Ingress, chaos, ..) - ... diff --git a/charts/platform/templates/deployment/deployment.yaml b/charts/platform/templates/deployment/deployment.yaml index a95f76f9d..7b80b447b 100644 --- a/charts/platform/templates/deployment/deployment.yaml +++ b/charts/platform/templates/deployment/deployment.yaml @@ -20,8 +20,8 @@ spec: serviceAccountName: default securityContext: runAsNonRoot: true - runAsUser: 666 - runAsGroup: 666 + runAsUser: 1000 + runAsGroup: 1000 terminationGracePeriodSeconds: 10 volumes: diff --git a/charts/platform/templates/ingress.yml b/charts/platform/templates/ingress.yml index 07494cfe4..be4c5d12c 100644 --- a/charts/platform/templates/ingress.yml +++ b/charts/platform/templates/ingress.yml @@ -1,5 +1,5 @@ --- -{{- if ".Values.kubernetes-dashboard.enabled" }} +{{- if index .Values "kubernetes-dashboard" "enabled" }} # retarded way to access directived with dash in the name # https://stackoverflow.com/questions/54506269/simple-ingress-from-host-with-microk8s # https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/annotations/ apiVersion: networking.k8s.io/v1 @@ -25,7 +25,7 @@ spec: number: 443 {{- end}} --- -{{- if ".Values.chaos-mesh.enabled" }} +{{- if index .Values "chaos-mesh" "enabled" }} # retarded way to access directived with dash in the name apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/charts/platform/values-hpk.yaml b/charts/platform/values-hpk.yaml index 1dc809f98..32898a784 100644 --- a/charts/platform/values-hpk.yaml +++ b/charts/platform/values-hpk.yaml @@ -28,6 +28,7 @@ operator: grafana: port: 6666 + ## @section Provision of dynamic volumes ## @param openebs.enabled Whether to enable OpenEBS ## @param openebs.storagePath The filesystem dir where volumes will be provisioned @@ -44,7 +45,6 @@ openebs: enabled: false - ## @section Chaos Injection Parameters ## @param chaos-mesh.enabled Whether to enable the Chaos controllers ## @param chaos-mesh.controllerManager.replicaCount Number of Chaos-Mesh controller replicas @@ -62,7 +62,7 @@ chaos-mesh: ## @section General purpose, web-based UI for Kubernetes clusters ## @param kubernetes-dashboard.enabled Whether to enable Dashboard kubernetes-dashboard: - enabled: true + enabled: false ## @param cert-manager.enabled Enables the certificate manager diff --git a/charts/platform/values.yaml b/charts/platform/values.yaml index 7c8b4b3f3..7243deb62 100644 --- a/charts/platform/values.yaml +++ b/charts/platform/values.yaml @@ -62,7 +62,7 @@ chaos-mesh: ## @section General purpose, web-based UI for Kubernetes clusters ## @param kubernetes-dashboard.enabled Whether to enable Dashboard kubernetes-dashboard: - enabled: true + enabled: false ## @param cert-manager.enabled Enables the certificate manager diff --git a/examples/apps/mongodb/templates/master.yml b/examples/apps/mongodb/templates/master.yml index 00db0950e..66218bce0 100644 --- a/examples/apps/mongodb/templates/master.yml +++ b/examples/apps/mongodb/templates/master.yml @@ -27,7 +27,7 @@ spec: set -eum cut -d ' ' -f 4 /proc/self/stat > /dev/shm/app # Sidecar: use it for entering the cgroup - echo "Create Mongo configuration" + echo "Create the configuration for Mongo server" cat > /tmp/mongod.conf < /tmp/rs-init.js <