Merge pull request 1Password#119 from 1Password/alice/2.7.4

Bump to v2.7.4, fix some deprecation errors for Kubernetes >1.25
antosimeon · Feb 24, 2023 · 4c10b6f · 4c10b6f
2 parents d097cc7 + 5d04471
commit 4c10b6f
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 12 deletions.
diff --git a/charts/op-scim-bridge/Chart.lock b/charts/op-scim-bridge/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 17.4.3
+  version: 17.8.0
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 2.2.2
-digest: sha256:7c0c33cfe0c6eea874abbb508ae07b81ba45205f78ad16b8e7dba95dbf24636b
-generated: "2023-01-19T16:35:33.315546-05:00"
+  version: 2.2.3
+digest: sha256:3f28104adb38b3bebe451bfc851496a57a7e9540bbc81c32eacf70b0567c311b
+generated: "2023-02-24T15:59:12.225791-05:00"
diff --git a/charts/op-scim-bridge/Chart.yaml b/charts/op-scim-bridge/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: op-scim-bridge
-version: 2.9.3
+version: 2.9.4
 description: A Helm chart for deploying the 1Password SCIM bridge
 keywords:
   - "1Password"
@@ -17,7 +17,7 @@ maintainers:
   - name: 1Password Provisioning Team
     email: support+scim@1password.com
 icon: https://1password.com/img/logo-v1.svg
-appVersion: v2.7.3
+appVersion: v2.7.4
 dependencies:
   - name: redis
     version: ~17

diff --git a/charts/op-scim-bridge/README.md b/charts/op-scim-bridge/README.md
@@ -89,7 +89,7 @@ These values set available SCIM bridge configuation options. For details on the
 |-----|------|---------|-------------|
 | redisURL | string | `redis://op-scim-bridge-redis-master:6379` | Redis connection URL. |
 | domain | string | unset | Allowed 1Password sign in URL. Not set by default. |
-| letsEncryptDomain | string | unset | Domain to attempt to get a certificate for via Let's Encrypt domain. Not set by default. |
+| tlsDomain | string | unset | Domain to attempt to get a certificate for via Let's Encrypt. Not set by default. |
 | debug | bool | `false` | Enable `DEBUG` log level instead of the default `INFO` level. |
 | jsonLogs | bool | `false` | Enable JSON log output. |
 | prettyLogs | bool | `false` | Enable colorized log output. |

diff --git a/charts/op-scim-bridge/charts/common-2.2.2.tgz b/charts/op-scim-bridge/charts/common-2.2.2.tgz
diff --git a/charts/op-scim-bridge/charts/common-2.2.3.tgz b/charts/op-scim-bridge/charts/common-2.2.3.tgz
diff --git a/charts/op-scim-bridge/charts/redis-17.4.3.tgz b/charts/op-scim-bridge/charts/redis-17.4.3.tgz
diff --git a/charts/op-scim-bridge/charts/redis-17.8.0.tgz b/charts/op-scim-bridge/charts/redis-17.8.0.tgz
diff --git a/charts/op-scim-bridge/templates/deployment.yaml b/charts/op-scim-bridge/templates/deployment.yaml
@@ -131,9 +131,9 @@ spec:
               value: "{{ tpl .Values.scim.config.redisURL . }}"
             - name: "OP_PING_SERVER"
               value: "{{ .Values.scim.probes.liveness.enabled }}"
-            {{- if .Values.scim.config.letsEncryptDomain }}
-            - name: "OP_LETSENCRYPT_DOMAIN"
-              value: "{{ .Values.scim.config.letsEncryptDomain }}"
+            {{- if .Values.scim.config.tlsDomain }}
+            - name: "OP_TLS_DOMAIN"
+              value: "{{ .Values.scim.config.tlsDomain }}"
             {{- end }}
             {{- if .Values.scim.config.domain }}
             - name: "OP_DOMAIN"

diff --git a/charts/op-scim-bridge/templates/horizontalPodAutoscaler.yaml b/charts/op-scim-bridge/templates/horizontalPodAutoscaler.yaml
@@ -1,5 +1,9 @@
 {{- if .Values.scim.autoscaling.enabled }}
+{{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ tpl .Values.scim.name . }}
@@ -21,12 +25,24 @@ spec:
     - type: Resource
       resource:
         name: cpu
+        {{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.scim.autoscaling.targetCPUUtilizationPercentage }}
+        {{- else }}
         targetAverageUtilization: {{ .Values.scim.autoscaling.targetCPUUtilizationPercentage }}
+        {{- end }}
     {{- end }}
     {{- if .Values.scim.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
+        {{- if semverCompare ">=1.23-0" .Capabilities.KubeVersion.GitVersion -}}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.scim.autoscaling.targetMemoryUtilizationPercentage }}
+        {{- else }}
         targetAverageUtilization: {{ .Values.scim.autoscaling.targetMemoryUtilizationPercentage }}
+        {{- end }}
     {{- end }}
 {{- end }}
diff --git a/charts/op-scim-bridge/templates/podDisruptionBudget.yaml b/charts/op-scim-bridge/templates/podDisruptionBudget.yaml
@@ -1,5 +1,9 @@
 {{- if .Values.scim.podDisruptionBudget.enabled -}}
+{{- if semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion -}} 
+apiVersion: policy/v1
+{{- else -}}
 apiVersion: policy/v1beta1
+{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ tpl .Values.scim.name . }}

diff --git a/charts/op-scim-bridge/values.yaml b/charts/op-scim-bridge/values.yaml
@@ -89,8 +89,8 @@ scim:
     redisURL: "redis://{{ .Release.Name }}-redis-master:6379"
     # domain sets the allowed 1Password sign in URL. Not set by default.
     # domain: example.1password.com
-    # letsEncryptDomain sets the domain to attempt to get a certificate for via Let's Encrypt.
-    # letsEncryptDomain: scim.example.com
+    # tlsDomain sets the domain to attempt to get a certificate for via Let's Encrypt.
+    # tlsDomain: scim.example.com
     # debug enables DEBUG log level instead of the default INFO level
     # debug: false
     # jsonLogs enables JSON log output