Merge branch 'main' into support-lifecycle-hooks

yekibud · web-flow · commit c42077978603 · 2025-03-17T12:08:19.000+01:00
diff --git a/.asf.yaml b/.asf.yaml
@@ -12,3 +12,5 @@ github:
     gh-pages: {}
   ghp_branch: gh-pages
   ghp_path: ~
+  dependabot_alerts:  false
+  dependabot_updates: true
diff --git a/.github/actions/chart-releaser-action b/.github/actions/chart-releaser-action
@@ -1 +1 @@
-Subproject commit 98bccfd32b0f76149d188912ac8e45ddd3f8695f
+Subproject commit 45af99f369889d20f904e42dbad98118e80ff194
diff --git a/.github/actions/chart-testing-action b/.github/actions/chart-testing-action
@@ -1 +1 @@
-Subproject commit afea100a513515fbd68b0e72a7bb0ae34cb62aec
+Subproject commit 4f62db170e3aa295575ba779f7141287841da474
diff --git a/.github/actions/create-pull-request b/.github/actions/create-pull-request
@@ -1 +1 @@
-Subproject commit b4d51739f96fca8047ad065eccef63442d8e99f7
+Subproject commit 15410bdb79bc0f69a005c1c860378ed08968f998
diff --git a/.github/actions/kind-action b/.github/actions/kind-action
@@ -1 +1 @@
-Subproject commit 9e8295d178de23cbfbd8fa16cf844eec1d773a07
+Subproject commit 674d091bc04169975c009f639f81631679b2f3d7
diff --git a/.github/actions/setup-helm b/.github/actions/setup-helm
@@ -1 +1 @@
-Subproject commit b5b231a831f96336bbfeccc1329990f0005c5bb1
+Subproject commit df50d879fa2c7ad2245510549f2c2eb28d0da618
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,18 @@
+version: 2
+updates:
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  commit-message:
+    prefix: " build(deps-dev): "
+    include: "scope"
+- package-ecosystem: "gitsubmodule"
+  schedule:
+    interval: daily
+  directory: "/"
+  open-pull-requests-limit: 10
+  commit-message:
+    prefix: " build(deps-dev): "
+    include: "scope"
diff --git a/.github/workflows/chart-rebuild.yaml b/.github/workflows/chart-rebuild.yaml
@@ -12,16 +12,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           ref: 'gh-pages'
           fetch-depth: 0
 
+      - name: Build Setup Helm
+        run: cd ./.github/actions/setup-helm && npm run-script build
+
       - name: Set up Helm
         uses: ./.github/actions/setup-helm
         with:
-          version: v3.10.0
+          version: v3.14.4
+        id: install
 
       - name: Rebuild index.yaml
         env:
diff --git a/.github/workflows/chart-releaser.yaml b/.github/workflows/chart-releaser.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -25,10 +25,14 @@ jobs:
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
+      - name: Build Setup Helm
+        run: cd ./.github/actions/setup-helm && npm run-script build
+
       - name: Install Helm
         uses: ./.github/actions/setup-helm
         with:
-          version: v3.10.0
+          version: v3.14.4
+        id: install
 
       - name: Run chart-releaser
         uses: ./.github/actions/chart-releaser-action
diff --git a/.github/workflows/chart-test.yaml b/.github/workflows/chart-test.yaml
@@ -20,16 +20,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
           submodules: recursive
 
+      - name: Build Setup Helm
+        run: cd ./.github/actions/setup-helm && npm run-script build
+
       - name: Set up Helm
         uses: ./.github/actions/setup-helm
         with:
-          version: v3.10.0
+          version: v3.14.4
 
       - name: Set up chart-testing
         uses: ./.github/actions/chart-testing-action
@@ -41,16 +44,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
           submodules: recursive
 
+      - name: Build Setup Helm
+        run: cd ./.github/actions/setup-helm && npm run-script build
+
       - name: Set up Helm
         uses: ./.github/actions/setup-helm
         with:
-          version: v3.10.0
+          version: v3.14.4
+        id: install
 
       - name: Set up chart-testing
         uses: ./.github/actions/chart-testing-action
diff --git a/couchdb/NEWS.md b/couchdb/NEWS.md
@@ -1,5 +1,21 @@
 # NEWS
 
+## 4.5.6
+
+- Add `extraPorts` to the network policy when the network policy is enabled.
+
+## 4.5.5
+
+- Give the default port on the CouchDB `Service` a name so that `service.extraPorts` can be used properly.
+
+## 4.5.4
+
+- Expose `extraPorts` and `service.extraPorts` to allow specifying arbitrary ports to be exposed from the CouchDB pods
+
+## 4.5.3
+
+- Fix ability to define pull secrets using `imagePullSecrets`.
+
 ## 4.5.2
 
 - Allow to specify a persistentVolumeClaimRetentionPolicy in both the primary and secondary StatefulSet.
diff --git a/couchdb/README.md b/couchdb/README.md
@@ -171,6 +171,7 @@ A variety of other parameters are also configurable. See the comments in the
 | `adminPassword`                      | auto-generated                                   |
 | `adminHash`                          |                                                  |
 | `cookieAuthSecret`                   | auto-generated                                   |
+| `extraPorts`                         | [] (a list of ContainerPort objects)             |
 | `image.repository`                   | couchdb                                          |
 | `image.tag`                          | 3.3.3                                            |
 | `image.pullPolicy`                   | IfNotPresent                                     |
@@ -218,11 +219,12 @@ A variety of other parameters are also configurable. See the comments in the
 | `service.type`                       | ClusterIP                                        |
 | `service.externalPort`               | 5984                                             |
 | `service.targetPort`                 | 5984                                             |
+| `service.extraPorts`                 | [] (a list of ServicePort objects)               |
 | `dns.clusterDomainSuffix`            | cluster.local                                    |
 | `networkPolicy.enabled`              | true                                             |
 | `serviceAccount.enabled`             | true                                             |
 | `serviceAccount.create`              | true                                             |
-| `serviceAccount.imagePullSecrets`    |                                                  |
+| `imagePullSecrets`                   |                                                  |
 | `sidecars`                           | {}                                               |
 | `livenessProbe.enabled`              | true                                             |
 | `livenessProbe.failureThreshold`     | 3                                                |
@@ -274,6 +276,7 @@ use GitHub Issues, do not report anything on Docker's website.
 - [@kevinwlau](https://github.com/kevinwlau)
 - [@jeyenzo](https://github.com/jeyenzo)
 - [@Pinpin31.](https://github.com/Pinpin31)
+- [@yekibud](https://github.com/yekibud)
 
 [1]: http://mail-archives.apache.org/mod_mbox/couchdb-user/
 [2]: http://mail-archives.apache.org/mod_mbox/couchdb-dev/
diff --git a/couchdb/templates/networkpolicy.yaml b/couchdb/templates/networkpolicy.yaml
@@ -21,6 +21,10 @@ spec:
         - protocol: TCP
           port: {{ .Values.prometheusPort.port }}
 {{- end }}
+{{ range .Values.extraPorts }}
+        - protocol: TCP
+          port: {{ .containerPort }} 
+{{ end }}
     - ports:
         - protocol: TCP
           port: 9100
diff --git a/couchdb/templates/service.yaml b/couchdb/templates/service.yaml
@@ -18,8 +18,12 @@ metadata:
 spec:
   ports:
     - port: {{ .Values.service.externalPort }}
+      name: couchdb
       protocol: TCP
       targetPort: {{ .Values.service.targetPort }}
+    {{ with .Values.service.extraPorts }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   type: {{ .Values.service.type }}
   selector:
 {{ include "couchdb.ss.selector" . | indent 4 }}
diff --git a/couchdb/templates/statefulset.yaml b/couchdb/templates/statefulset.yaml
@@ -37,6 +37,9 @@ spec:
       {{- if .Values.serviceAccount.enabled }}
       serviceAccountName: {{ template "couchdb.serviceAccount" . }}
       {{- end }}
+      {{- if .Values.imagePullSecrets }}
+      imagePullSecrets: {{ .Values.imagePullSecrets | toYaml | nindent 8 }}
+      {{- end }}
       initContainers:
         - name: init-copy
           image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
@@ -98,6 +101,9 @@ spec:
             - name: metrics
               containerPort: {{ .Values.prometheusPort.port }}
 {{- end }}
+{{ with .Values.extraPorts }}
+{{ toYaml . | indent 12 }}
+{{ end }}
 {{- if .Values.lifecycle }}
           lifecycle: {{ toYaml .Values.lifecycle | nindent 12 }}
 {{- else if .Values.lifecycleTemplate }}
diff --git a/couchdb/values.yaml b/couchdb/values.yaml
@@ -57,8 +57,9 @@ serviceAccount:
   enabled: true
   create: true
 # name:
+
 # imagePullSecrets:
-# - name: myimagepullsecret
+#   - name: myimagepullsecret
 
 # -- The storage volume used by each Pod in the StatefulSet. If a
 # persistentVolume is not enabled, the Pods will use `emptyDir` ephemeral
@@ -153,6 +154,18 @@ service:
   externalPort: 5984
   targetPort: 5984
   labels: {}
+  extraPorts: []
+  # - name: sqs
+  #   port: 4984
+  #   targetPort: 4984
+  #   protocol: TCP
+
+## If you need to expose any additional ports on the CouchDB container, for example
+## if you're running CouchDB container with additional processes that need to
+## be accessible outside of the pod, you can define them here.
+extraPorts: []
+  # - name: sqs
+  #   containerPort: 4984
 
 ## An Ingress resource can provide name-based virtual hosting and TLS
 ## termination among other things for CouchDB deployments which are accessed
