chore: update minio and resolve renovate issues (#42)

* chore: update minio and resolve renovate issues * cut a new release after merge * fix tests * fix values * regular minio * registry1
defenseunicorns · Dec 17, 2024 · e443240 · e443240
1 parent 3f6134a
commit e443240
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 19 deletions.
diff --git a/chart/templates/uds-package-minio.yaml b/chart/templates/uds-package-minio.yaml
@@ -19,15 +19,14 @@ spec:
       - service: {{ .Values.name }}-hl
         selector:
           v1.min.io/tenant: {{ .Values.name }}
-
         host: minio
         gateway: tenant
         port: 9000
       - service: {{ .Values.name }}-console
         selector:
           v1.min.io/tenant: {{ .Values.name }}
         host: minio-console
-        gateway: tenant
+        gateway: {{ .Values.console.gateway }}
         port: 9090
     allow:
       # Needed for jobs that provision resources in minio from the tenant namespace

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -11,6 +11,9 @@ domain: ###ZARF_VAR_DOMAIN###
 rootPassword:
 rootUser: minio
 
+console:
+  gateway: admin
+
 # sso disabled until we can define the protocol mappers via sso secret
 # or update the uds-core keycloak image
 sso:

diff --git a/releaser.yaml b/releaser.yaml
@@ -4,10 +4,10 @@
 flavors:
   - name: upstream
     # renovate-uds: datasource=docker depName=quay.io/minio/operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
-    version: 6.0.4-uds.3
+    version: 6.0.4-uds.4
   - name: registry1
     # renovate-uds: datasource=docker depName=registry1.dso.mil/ironbank/opensource/minio/operator extractVersion=^v?(?<version>\d+\.\d+\.\d+)$
-    version: 6.0.4-uds.3
+    version: 6.0.4-uds.4
   - name: unicorn
     # renovate-uds: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/minio-operator-fips
-    version: 6.0.4-uds.3
+    version: 6.0.4-uds.4
diff --git a/tasks/test.yaml b/tasks/test.yaml
@@ -38,6 +38,6 @@ tasks:
           # wait for a network address to return a 200 OK response
           network:
             protocol: https
-            address: minio-console.uds.dev
+            address: minio-console.admin.uds.dev
             code: 200
 # TODO add playwright tests for ui + sso once sso is fully automatable in CI
diff --git a/values/registry1-config-values.yaml b/values/registry1-config-values.yaml
@@ -1,5 +1,6 @@
 # Copyright 2024 Defense Unicorns
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
-mcImage: registry1.dso.mil/ironbank/opensource/minio/mc:RELEASE.2024-08-13T05-33-17Z
+# renovate: datasource=docker depName=registry1.dso.mil/ironbank/opensource/minio/mc versioning=regex:^RELEASE\.(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)T(?<build>\d+)-(?<revision>\d+)-\d+Z$
+mcImage: registry1.dso.mil/ironbank/opensource/minio/mc:RELEASE.2024-11-21T17-21-54Z
 mcShell: /bin/sh
diff --git a/values/registry1-tenant-values.yaml b/values/registry1-tenant-values.yaml
@@ -4,5 +4,6 @@
 tenant:
   image:
     repository: registry1.dso.mil/ironbank/opensource/minio/minio
-    tag: RELEASE.2024-06-04T19-20-08Z
+    # renovate: datasource=docker depName=registry1.dso.mil/ironbank/opensource/minio/minio versioning=regex:^RELEASE\.(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)T(?<build>\d+)-(?<revision>\d+)-\d+Z$
+    tag: RELEASE.2024-12-13T22-19-12Z
     pullPolicy: IfNotPresent
diff --git a/values/unicorn-config-values.yaml b/values/unicorn-config-values.yaml
@@ -1,5 +1,6 @@
 # Copyright 2024 Defense Unicorns
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
-mcImage: cgr.dev/du-uds-defenseunicorns/minio-client-fips:0
+# renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/minio-client-fips
+mcImage: cgr.dev/du-uds-defenseunicorns/minio-client-fips:0.20241121.172154
 mcShell: /bin/bash
diff --git a/values/unicorn-tenant-values.yaml b/values/unicorn-tenant-values.yaml
@@ -3,6 +3,7 @@
 
 tenant:
   image:
-    repository: cgr.dev/du-uds-defenseunicorns/minio-fips
-    tag: "0"
+    repository: cgr.dev/du-uds-defenseunicorns/minio
+    # renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/minio
+    tag: "0.20241213.221912"
     pullPolicy: IfNotPresent
diff --git a/values/upstream-config-values.yaml b/values/upstream-config-values.yaml
@@ -1,5 +1,6 @@
 # Copyright 2024 Defense Unicorns
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
-mcImage: minio/mc:RELEASE.2024-08-13T05-33-17Z
+# renovate: datasource=docker depName=minio/mc versioning=regex:^RELEASE\.(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)T(?<build>\d+)-(?<revision>\d+)-\d+Z$
+mcImage: minio/mc:RELEASE.2024-11-21T17-21-54Z
 mcShell: /bin/sh
diff --git a/values/upstream-tenant-values.yaml b/values/upstream-tenant-values.yaml
@@ -4,4 +4,5 @@
 tenant:
   image:
     repository: quay.io/minio/minio
-    tag: RELEASE.2024-08-03T04-33-23Z
+    # renovate: datasource=docker depName=quay.io/minio/minio versioning=regex:^RELEASE\.(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)T(?<build>\d+)-(?<revision>\d+)-\d+Z$
+    tag: RELEASE.2024-12-13T22-19-12Z
diff --git a/zarf.yaml b/zarf.yaml
@@ -33,9 +33,10 @@ components:
           - values/upstream-tenant-values.yaml
     images:
       - quay.io/minio/operator:v6.0.4
-      - minio/mc:RELEASE.2024-08-13T05-33-17Z
-      - quay.io/minio/minio:RELEASE.2024-08-03T04-33-23Z
       - quay.io/minio/operator-sidecar:v6.0.2
+      # minio RELEASE regex: https://regex101.com/r/Xc6mrh/1
+      - minio/mc:RELEASE.2024-11-21T17-21-54Z # renovate: versioning=regex:^RELEASE\.(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)T(?<build>\d+)-(?<revision>\d+)-\d+Z$
+      - quay.io/minio/minio:RELEASE.2024-12-13T22-19-12Z # renovate: versioning=regex:^RELEASE\.(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)T(?<build>\d+)-(?<revision>\d+)-\d+Z$
 
 
   - name: minio-operator
@@ -59,8 +60,9 @@ components:
     images:
       - registry1.dso.mil/ironbank/opensource/minio/operator:v6.0.4
       - registry1.dso.mil/ironbank/opensource/minio/operator-sidecar:v6.0.2
-      - registry1.dso.mil/ironbank/opensource/minio/mc:RELEASE.2024-08-13T05-33-17Z
-      - registry1.dso.mil/ironbank/opensource/minio/minio:RELEASE.2024-06-04T19-20-08Z
+      # minio RELEASE regex: https://regex101.com/r/Xc6mrh/1
+      - registry1.dso.mil/ironbank/opensource/minio/mc:RELEASE.2024-11-21T17-21-54Z # renovate: versioning=regex:^RELEASE\.(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)T(?<build>\d+)-(?<revision>\d+)-\d+Z$
+      - registry1.dso.mil/ironbank/opensource/minio/minio:RELEASE.2024-12-13T22-19-12Z # renovate: versioning=regex:^RELEASE\.(?<major>\d+)-(?<minor>\d+)-(?<patch>\d+)T(?<build>\d+)-(?<revision>\d+)-\d+Z$
 
   - name: minio-operator
     required: true
@@ -81,5 +83,5 @@ components:
     images:
       - cgr.dev/du-uds-defenseunicorns/minio-operator-fips:6.0.4
       - cgr.dev/du-uds-defenseunicorns/minio-operator-sidecar:6.0.4
-      - cgr.dev/du-uds-defenseunicorns/minio-client-fips:0
-      - cgr.dev/du-uds-defenseunicorns/minio-fips:0
+      - cgr.dev/du-uds-defenseunicorns/minio-client-fips:0.20241121.172154
+      - cgr.dev/du-uds-defenseunicorns/minio:0.20241213.221912