Merge branch 'master' into node-problem-detector-0.8.15

deliveryhero · Apr 8, 2024 · 6d7572c · 6d7572c
2 parents d9edd84 + e24b5c6
commit 6d7572c
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 15 deletions.
diff --git a/.github/workflows/check_pr.yaml b/.github/workflows/check_pr.yaml
@@ -15,5 +15,5 @@ jobs:
         uses: actions/checkout@v2
       - uses: deepakputhraya/action-pr-title@master
         with:
-          regex: '^\[stable\/+.+]\s.+'
+          regex: '^\[stable\/+.+].*'
           prefix_case_sensitive: false
diff --git a/README.md b/README.md
@@ -118,16 +118,17 @@ All commands to be run from the root of this repo.
 
 `helm-docs`:
 
-  To generate chart `README.md` files from the [template](ci/README.md.gotmpl):
+  To generate chart `README.md` files from the [template](ci/README.md.gotmpl), you can run `helm-docs` via docker:
 
   ```console
-  <!-- docker -->
   docker run --rm -v "${PWD}:/helm-docs" jnorwood/helm-docs:v1.11.3 --template-files ./ci/README.md.gotmpl
-  <!-- pre-commit -->
-  # install pre-commit https://pre-commit.com/#install
-  $ brew install pre-commit
-  $  pre-commit install
-  $ pre-commit install-hooks
+  ```
+
+  Or alternatively install via [pre-commit](https://pre-commit.com/#install):
+
+  ```console
+  pre-commit install
+  pre-commit install-hooks
   ```
 
 `helm-conftest`:

diff --git a/stable/k8s-resources/Chart.yaml b/stable/k8s-resources/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 0.6.5
+version: 0.6.6
 appVersion: 0.0.1
 name: k8s-resources
 description: |

diff --git a/stable/k8s-resources/README.md b/stable/k8s-resources/README.md
@@ -1,6 +1,6 @@
 # k8s-resources
 
-![Version: 0.6.5](https://img.shields.io/badge/Version-0.6.5-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
+![Version: 0.6.6](https://img.shields.io/badge/Version-0.6.6-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square)
 
 Not an application but a Helm chart to create any and many resources in Kubernetes.
 

diff --git a/stable/k8s-resources/templates/hpa.yaml b/stable/k8s-resources/templates/hpa.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.HorizontalPodAutoscalers -}}
 {{- range .Values.HorizontalPodAutoscalers }}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
 {{- if .namespace }}
@@ -26,13 +26,17 @@ spec:
   - type: Resource
     resource:
       name: cpu
-      targetAverageUtilization: {{ .targetCPUUtilizationPercentage }}
+      target:
+          type: Utilization
+          averageUtilization: {{ .targetCPUUtilizationPercentage }}
 {{- end }}
 {{- if .targetMemoryUtilizationPercentage }}
   - type: Resource
     resource:
       name: memory
-      targetAverageUtilization: {{ .targetMemoryUtilizationPercentage }}
+      target:
+          type: Utilization
+          averageUtilization: {{ .targetMemoryUtilizationPercentage }}
 {{- end }}
 ---
 {{- end }}

diff --git a/stable/node-local-dns/Chart.yaml b/stable/node-local-dns/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: node-local-dns
-version: 2.0.6
+version: 2.0.7
 appVersion: 1.22.23
 maintainers:
 - name: gabrieladt

diff --git a/stable/node-local-dns/README.md b/stable/node-local-dns/README.md
@@ -1,6 +1,6 @@
 # node-local-dns
 
-![Version: 2.0.6](https://img.shields.io/badge/Version-2.0.6-informational?style=flat-square) ![AppVersion: 1.22.23](https://img.shields.io/badge/AppVersion-1.22.23-informational?style=flat-square)
+![Version: 2.0.7](https://img.shields.io/badge/Version-2.0.7-informational?style=flat-square) ![AppVersion: 1.22.23](https://img.shields.io/badge/AppVersion-1.22.23-informational?style=flat-square)
 
 A chart to install node-local-dns.
 
@@ -52,6 +52,7 @@ helm install my-release deliveryhero/node-local-dns -f values.yaml
 | config.bindIp | bool | `false` |  |
 | config.commProtocol | string | `"force_tcp"` |  |
 | config.customConfig | string | `""` |  |
+| config.customUpstreamsvc | string | `""` |  |
 | config.dnsDomain | string | `"cluster.local"` |  |
 | config.dnsServer | string | `"172.20.0.10"` |  |
 | config.healthPort | int | `8080` |  |

diff --git a/stable/node-local-dns/templates/daemonset.yaml b/stable/node-local-dns/templates/daemonset.yaml
@@ -71,7 +71,11 @@ spec:
           - "-conf"
           - "/etc/Corefile"
           - "-upstreamsvc"
+        {{- if .Values.config.customUpstreamsvc }}
+          - "{{ .Values.config.customUpstreamsvc }}"
+        {{- else }}
           - "{{ include "node-local-dns.fullname" . }}-upstream"
+        {{- end }}
           - "-skipteardown={{ .Values.config.skipTeardown }}"
           - "-setupinterface={{ .Values.config.setupInterface }}"
           - "-setupiptables={{ .Values.config.setupIptables }}"

diff --git a/stable/node-local-dns/templates/service-upstream.yaml b/stable/node-local-dns/templates/service-upstream.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.config.customUpstreamsvc -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -17,3 +18,4 @@ spec:
     targetPort: 53
   selector:
     k8s-app: kube-dns
+{{- end -}}
diff --git a/stable/node-local-dns/values.yaml b/stable/node-local-dns/values.yaml
@@ -13,6 +13,9 @@ config:
   # Virtual IP to be used by ipvs mode, to be used as --cluster-dns, must not collide.
   localDns: "169.254.20.25"
 
+  # Use a custom upstreamsvc for -upstreamsvc
+  customUpstreamsvc: ""
+
   # If true, it will bind 0.0.0.0, otherwise dnsServer and localDns will be used. https://github.com/bottlerocket-os/bottlerocket/issues/3711#issuecomment-1907087528
   bindIp: false