Skip to content

Commit

Permalink
fix issue with ingress conditions
Browse files Browse the repository at this point in the history
Signed-off-by: Fotis Nikolaidis <[email protected]>
  • Loading branch information
fnikolai committed Jul 5, 2023
1 parent 92a65be commit 874e02c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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, ..)
- ...


Expand Down
4 changes: 2 additions & 2 deletions charts/platform/templates/deployment/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ spec:
serviceAccountName: default
securityContext:
runAsNonRoot: true
runAsUser: 666
runAsGroup: 666
runAsUser: 1000
runAsGroup: 1000
terminationGracePeriodSeconds: 10

volumes:
Expand Down
4 changes: 2 additions & 2 deletions charts/platform/templates/ingress.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions charts/platform/values-hpk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/platform/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion examples/apps/mongodb/templates/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF
# network interfaces
net:
Expand All @@ -45,6 +45,7 @@ spec:
replSetName: app1r0
EOF
# https://www.mongodb.com/basics/replication
echo "Create Replicaset with {{"{{.inputs.parameters.slaves}}"}}"
cat > /tmp/rs-init.js <<EOF
rs.initiate()
Expand Down

0 comments on commit 874e02c

Please sign in to comment.