From 10352f84a592223f35ed9a4772b85d85f07e9e2d Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Mon, 6 Sep 2021 23:25:35 +0200 Subject: [PATCH] remove HPB from SCALE App (as it wasn't working anyway) --- charts/stable/nextcloud/Chart.yaml | 2 +- charts/stable/nextcloud/SCALE/ix_values.yaml | 25 --- charts/stable/nextcloud/SCALE/questions.yaml | 219 ------------------- charts/stable/nextcloud/values.yaml | 26 --- 4 files changed, 1 insertion(+), 271 deletions(-) diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml index 18d27a85a4f..e4715f23c79 100644 --- a/charts/stable/nextcloud/Chart.yaml +++ b/charts/stable/nextcloud/Chart.yaml @@ -33,4 +33,4 @@ sources: - https://github.com/nextcloud/docker - https://github.com/nextcloud/helm type: application -version: 3.7.10 +version: 3.7.11 diff --git a/charts/stable/nextcloud/SCALE/ix_values.yaml b/charts/stable/nextcloud/SCALE/ix_values.yaml index 101abb3208c..f791c144a92 100644 --- a/charts/stable/nextcloud/SCALE/ix_values.yaml +++ b/charts/stable/nextcloud/SCALE/ix_values.yaml @@ -56,31 +56,6 @@ initContainers: name: dbcreds key: plainhost -additionalContainers: -- name: hpb - image: nextcloud:21.0.2 - imagePullPolicy: IfNotPresent - command: - - "/bin/bash" - - "-c" - - "--" - args: - - 'while [ ! -f "/var/www/html/custom_apps/notify_push/bin/x86_64/notify_push" ]; do sleep 30; echo "notify_push not found, waiting"; done && /var/www/html/custom_apps/notify_push/bin/x86_64/notify_push /var/www/html/config/config.php' - env: - - name: PORT - value: "7867" - envFrom: - - configMapRef: - name: hpbconfig - ports: - - name: hpb - containerPort: 7867 - volumeMounts: - - mountPath: /var/www/html - name: data - securityContext: - runAsUser: 33 - runAsGroup: 33 # -- Probe configuration # -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) diff --git a/charts/stable/nextcloud/SCALE/questions.yaml b/charts/stable/nextcloud/SCALE/questions.yaml index 6d98702aae1..32482410e59 100644 --- a/charts/stable/nextcloud/SCALE/questions.yaml +++ b/charts/stable/nextcloud/SCALE/questions.yaml @@ -359,103 +359,6 @@ questions: max: 65535 default: 36091 required: true - - variable: hpb - label: "High Performance Backend Service" - description: "The service which runs the High Performance Backend" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable the service" - schema: - type: boolean - default: false - - variable: type - label: "Service Type" - description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" - schema: - type: string - default: "NodePort" - enum: - - value: "NodePort" - description: "NodePort" - - value: "ClusterIP" - description: "ClusterIP" - - value: "LoadBalancer" - description: "LoadBalancer" - - variable: loadBalancerIP - label: "LoadBalancer IP" - description: "LoadBalancerIP" - schema: - show_if: [["type", "=", "LoadBalancer"]] - type: string - default: "" - - variable: externalIPs - label: "External IP's" - description: "External IP's" - schema: - show_if: [["type", "=", "LoadBalancer"]] - type: list - default: [] - items: - - variable: externalIP - label: "External IP" - schema: - type: string - - variable: ports - label: "Service's Port(s) Configuration" - schema: - type: dict - attrs: - - variable: hpb - label: "Main Service Port Configuration" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable the port" - schema: - type: boolean - default: true - hidden: true - - variable: protocol - label: "Port Type" - schema: - type: string - default: "HTTP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: targetPort - label: "Target Port" - description: "This port exposes the container port on the service" - schema: - type: int - default: 7867 - editable: false - hidden: true - - variable: port - label: "Container Port" - schema: - type: int - default: 7867 - editable: true - required: true - - variable: nodePort - label: "Node Port (Optional)" - description: "This port gets exposed to the node. Only considered when service type is NodePort" - schema: - type: int - min: 9000 - max: 65535 - default: 36092 - required: true - variable: persistence label: "Integrated Persistent Storage" @@ -884,128 +787,6 @@ questions: default: "" required: true - - variable: hpb - label: "High Performance Backend Ingress" - schema: - type: dict - attrs: - - variable: enabled - label: "Enable Ingress" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: hosts - label: "Hosts" - schema: - type: list - default: [] - items: - - variable: hostEntry - label: "Host" - schema: - type: dict - attrs: - - variable: host - label: "HostName" - schema: - type: string - default: "" - required: true - - variable: paths - label: "Paths" - schema: - type: list - default: [] - items: - - variable: pathEntry - label: "Host" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/push" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "Prefix" - - variable: service - label: "Service" - schema: - type: dict - hidden: true - attrs: - - variable: name - label: "service name" - schema: - type: string - hidden: true - default: "{{ .Release.Name }}-nextcloud-hpb" - - variable: port - label: "serviceport" - schema: - type: int - hidden: true - default: 7867 - - variable: tls - label: "TLS-Settings" - schema: - type: list - default: [] - items: - - variable: tlsEntry - label: "Host" - schema: - type: dict - attrs: - - variable: hosts - label: "Certificate Hosts" - schema: - type: list - default: [] - items: - - variable: host - label: "Host" - schema: - type: string - default: "" - required: true - - variable: scaleCert - label: "Select TrueNAS SCALE Certificate" - schema: - type: int - $ref: - - "definitions/certificate" - - variable: entrypoint - label: "Traefik Entrypoint" - description: "Entrypoint used by Traefik when using Traefik as Ingress Provider" - schema: - type: string - default: "websecure" - required: true - - variable: middlewares - label: "Traefik Middlewares" - description: "Add previously created Traefik Middlewares to this Ingress" - schema: - type: list - default: [] - items: - - variable: name - label: "Name" - schema: - type: string - default: "" - required: true - - - - variable: ingressList label: "Additional Ingress" group: "Ingress" diff --git a/charts/stable/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml index 0e066ac090a..f2e80b820aa 100644 --- a/charts/stable/nextcloud/values.yaml +++ b/charts/stable/nextcloud/values.yaml @@ -82,32 +82,6 @@ initContainers: name: dbcreds key: plainhost -additionalContainers: -- name: hpb - image: nextcloud:21.0.2 - imagePullPolicy: IfNotPresent - command: - - "/bin/bash" - - "-c" - - "--" - args: - - 'while [ ! -f "/var/www/html/custom_apps/notify_push/bin/x86_64/notify_push" ]; do sleep 30; echo "notify_push not found, waiting"; done && /var/www/html/custom_apps/notify_push/bin/x86_64/notify_push /var/www/html/config/config.php' - env: - - name: PORT - value: "7867" - envFrom: - - configMapRef: - name: hpbconfig - ports: - - name: hpb - containerPort: 7867 - volumeMounts: - - mountPath: /var/www/html - name: data - securityContext: - runAsUser: 33 - runAsGroup: 33 - podSecurityContext: fsGroup: 33