Synchronize upstreamed folder to 1c45a193d

2026-03-13 14:57:24 +08:00 · 2019-04-03 12:37:33 +00:00
parent 0ff01ee91c
commit bac8263dc1
12 changed files with 62 additions and 11 deletions
--- a/upstreamed/mongodb/Chart.yaml
+++ b/upstreamed/mongodb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mongodb
-version: 5.15.0
+version: 5.16.0
 appVersion: 4.0.8
 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
 keywords:
--- a/upstreamed/mongodb/README.md
+++ b/upstreamed/mongodb/README.md
@@ -138,10 +138,14 @@ The following table lists the configurable parameters of the MongoDB chart and t
 | `metrics.livenessProbe.initialDelaySeconds`        | Initial Delay for Liveness Check of Prometheus metrics exporter                              | `15`                                                    |
 | `metrics.livenessProbe.periodSeconds`              | How often to perform Liveness Check of Prometheus metrics exporter                           | `10`                                                    |
 | `metrics.livenessProbe.timeoutSeconds`             | Timeout for Liveness Check of Prometheus metrics exporter                                    | `5`                                                     |
+| `metrics.livenessProbe.failureThreshold`           | Failure Threshold for Liveness Check of Prometheus metrics exporter                          | `3`                                                     |
+| `metrics.livenessProbe.successThreshold`           | Success Threshold for Liveness Check of Prometheus metrics exporter                          | `1`                                                     |
 | `metrics.readinessProbe.enabled`                   | Enable/disable the Readiness Check of Prometheus metrics exporter                            | `false`                                                 |
 | `metrics.readinessProbe.initialDelaySeconds`       | Initial Delay for Readiness Check of Prometheus metrics exporter                             | `5`                                                     |
 | `metrics.readinessProbe.periodSeconds`             | How often to perform Readiness Check of Prometheus metrics exporter                          | `10`                                                    |
 | `metrics.readinessProbe.timeoutSeconds`            | Timeout for Readiness Check of Prometheus metrics exporter                                   | `1`                                                     |
+| `metrics.readinessProbe.failureThreshold`           | Failure Threshold for Readiness Check of Prometheus metrics exporter                        | `3`                                                     |
+| `metrics.readinessProbe.successThreshold`           | Success Threshold for Readiness Check of Prometheus metrics exporter                        | `1`                                                     |


 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
--- a/upstreamed/mongodb/templates/deployment-standalone.yaml
+++ b/upstreamed/mongodb/templates/deployment-standalone.yaml
@@ -178,18 +178,28 @@ spec:
        ports:
        - name: metrics
          containerPort: 9216
+        {{- if .Values.metrics.livenessProbe.enabled }}
        livenessProbe:
          httpGet:
            path: /metrics
            port: metrics
-          initialDelaySeconds: {{ default 15 .Values.metrics.livenessProbe.initialDelaySeconds }}
-          timeoutSeconds: {{ default 5 .Values.metrics.livenessProbe.timeoutSeconds }}
+          initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
+          successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
+        {{- end }}
+        {{- if .Values.metrics.readinessProbe.enabled }}
        readinessProbe:
          httpGet:
            path: /metrics
            port: metrics
-          initialDelaySeconds: {{ default 5 .Values.metrics.readinessProbe.initialDelaySeconds }}
-          timeoutSeconds: {{ default 1 .Values.metrics.readinessProbe.timeoutSeconds }}
+          initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
+          successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
+        {{- end }}
        resources:
 {{ toYaml .Values.metrics.resources | indent 10 }}
 {{- end }}
--- a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml
@@ -204,18 +204,28 @@ spec:
          ports:
          - name: metrics
            containerPort: 9216
+          {{- if .Values.metrics.livenessProbe.enabled }}
          livenessProbe:
            httpGet:
              path: /metrics
              port: metrics
-            initialDelaySeconds: {{ default 15 .Values.metrics.livenessProbe.initialDelaySeconds }}
-            timeoutSeconds: {{ default 5 .Values.metrics.livenessProbe.timeoutSeconds }}
+            initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
+          {{- end }}
+          {{- if .Values.metrics.readinessProbe.enabled }}
          readinessProbe:
            httpGet:
              path: /metrics
              port: metrics
-            initialDelaySeconds: {{ default 5 .Values.metrics.readinessProbe.initialDelaySeconds }}
-            timeoutSeconds: {{ default 1 .Values.metrics.readinessProbe.timeoutSeconds }}
+            initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
+          {{- end }}
          resources:
 {{ toYaml .Values.metrics.resources | indent 12 }}
 {{- end }}
--- a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
@@ -196,6 +196,8 @@ spec:
            initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
            timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.metrics.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.metrics.livenessProbe.successThreshold }}
          {{- end }}
          {{- if .Values.metrics.readinessProbe.enabled }}
          readinessProbe:
@@ -205,6 +207,8 @@ spec:
            initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
            periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
            timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.metrics.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.metrics.readinessProbe.successThreshold }}
          {{- end }}
          resources:
 {{ toYaml .Values.metrics.resources | indent 12 }}
--- a/upstreamed/mongodb/values-production.yaml
+++ b/upstreamed/mongodb/values-production.yaml
@@ -319,11 +319,15 @@ metrics:
    initialDelaySeconds: 15
    periodSeconds: 5
    timeoutSeconds: 5
+    failureThreshold: 3
+    successThreshold: 1
  readinessProbe:
    enabled: true
    initialDelaySeconds: 5
    periodSeconds: 5
    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1

  ## Metrics exporter pod Annotation
  podAnnotations:
--- a/upstreamed/mongodb/values.yaml
+++ b/upstreamed/mongodb/values.yaml
@@ -318,11 +318,15 @@ metrics:
    initialDelaySeconds: 15
    periodSeconds: 5
    timeoutSeconds: 5
+    failureThreshold: 3
+    successThreshold: 1
  readinessProbe:
    enabled: false
    initialDelaySeconds: 5
    periodSeconds: 5
    timeoutSeconds: 1
+    failureThreshold: 3
+    successThreshold: 1

  ## Metrics exporter pod Annotation
  podAnnotations:
--- a/upstreamed/rabbitmq/Chart.yaml
+++ b/upstreamed/rabbitmq/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: rabbitmq
-version: 4.10.0
+version: 4.11.0
 appVersion: 3.7.14
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
--- a/upstreamed/rabbitmq/README.md
+++ b/upstreamed/rabbitmq/README.md
@@ -73,6 +73,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and
 | `service.distPort`                   | Erlang distribution server port                  | `25672`                                                 |
 | `service.nodePort`                   | Node port override, if serviceType NodePort      | _random available between 30000-32767_                  |
 | `service.managerPort`                | RabbitMQ Manager port                            | `15672`                                                 |
+| `service.annotations`                | service annotations as an array                  | []                                                      |
 | `persistence.enabled`                | Use a PVC to persist data                        | `false`                                                 |
 | `persistence.storageClass`           | Storage class of backing PVC                     | `nil` (uses alpha storage class annotation)             |
 | `persistence.accessMode`             | Use volume as ReadOnly or ReadWrite              | `ReadWriteOnce`                                         |
--- a/upstreamed/rabbitmq/templates/svc.yaml
+++ b/upstreamed/rabbitmq/templates/svc.yaml
@@ -7,8 +7,13 @@ metadata:
    chart: {{ template "rabbitmq.chart" .  }}
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
-{{- if .Values.metrics.enabled }}
+{{- if or .Values.service.annotations .Values.metrics.enabled }}
  annotations:
+{{- end }}
+{{- if .Values.service.annotations }}
+{{ toYaml .Values.service.annotations | indent 4 }}
+{{- end }}
+{{- if .Values.metrics.enabled }}
 {{ toYaml .Values.metrics.annotations | indent 4 }}
 {{- end }}
 spec:
--- a/upstreamed/rabbitmq/values-production.yaml
+++ b/upstreamed/rabbitmq/values-production.yaml
@@ -125,6 +125,10 @@ service:
  ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables
  ##
  managerPort: 15672
+  
+  ## Service annotations
+  annotations:
+    # service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0

 # Additional pod labels to apply
 podLabels: {}
--- a/upstreamed/rabbitmq/values.yaml
+++ b/upstreamed/rabbitmq/values.yaml
@@ -126,6 +126,11 @@ service:
  ##
  managerPort: 15672

+  ## Service annotations
+  annotations:
+    # service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
+
+
 # Additional pod labels to apply
 podLabels: {}