Merge pull request #329 from eformat/ipa-add-newer-imagestreams

🪲 add new IS, pull from quay.io 🪲 Merging this as it is breaking things
redhat-cop · May 4, 2023 · 7ddc6a7 · 7ddc6a7
2 parents eaf3910 + ab55e96
commit 7ddc6a7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/charts/ipa/Chart.yaml b/charts/ipa/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: ipa
 description: A Helm chart to install FreeIPA
-version: 1.3.0
+version: 1.3.1
 appVersion: 1.16.0
 home: https://github.com/redhat-cop/helm-charts
 icon: https://www.freeipa.org/images/freeipa/freeipa-logo-small.png

diff --git a/charts/ipa/templates/imagestream.yaml b/charts/ipa/templates/imagestream.yaml
@@ -13,42 +13,63 @@ spec:
       tags: freeipa, identity management
     from:
       kind: ImageStreamTag
-      name: fedora-35
+      name: fedora-37
+  - name: fedora-37
+    annotations:
+      openshift.io/display-name: FreeIPA Server on Fedora 37
+      tags: freeipa, identity management
+    from:
+      kind: DockerImage
+      name: quay.io/freeipa/freeipa-server:fedora-37
+  - name: fedora-36
+    annotations:
+      openshift.io/display-name: FreeIPA Server on Fedora 36
+      tags: freeipa, identity management
+    from:
+      kind: DockerImage
+      name: quay.io/freeipa/freeipa-server:fedora-36
   - name: fedora-35
     annotations:
       openshift.io/display-name: FreeIPA Server on Fedora 35
       tags: freeipa, identity management
     from:
       kind: DockerImage
-      name: freeipa/freeipa-server:fedora-35
+      name: quay.io/freeipa/freeipa-server:fedora-35
   - name: fedora-34
     annotations:
       openshift.io/display-name: FreeIPA Server on Fedora 34
       tags: freeipa, identity management
     from:
       kind: DockerImage
-      name: freeipa/freeipa-server:fedora-34
+      name: quay.io/freeipa/freeipa-server:fedora-34
   - name: fedora-rawhide
     annotations:
       openshift.io/display-name: FreeIPA Server on Fedora rawhide
       tags: freeipa, identity management
     from:
       kind: DockerImage
-      name: freeipa/freeipa-server:fedora-rawhide
+      name: quay.io/freeipa/freeipa-server:fedora-rawhide
+  - name: centos-9-stream
+    annotations:
+      openshift.io/display-name: FreeIPA Server on CentOS 9 Stream
+      tags: freeipa, identity management
+    from:
+      kind: DockerImage
+      name: quay.io/freeipa/freeipa-server:centos-9-stream
   - name: centos-8-stream
     annotations:
       openshift.io/display-name: FreeIPA Server on CentOS 8 Stream
       tags: freeipa, identity management
     from:
       kind: DockerImage
-      name: freeipa/freeipa-server:centos-8-stream
+      name: quay.io/freeipa/freeipa-server:centos-8-stream
   - name: centos-7
     annotations:
       openshift.io/display-name: FreeIPA Server on CentOS 7
       tags: freeipa, identity management
     from:
       kind: DockerImage
-      name: freeipa/freeipa-server:centos-7
+      name: quay.io/freeipa/freeipa-server:centos-7
   - name: rhel-7
     annotations:
       openshift.io/display-name: Identity Management Server on RHEL 7

diff --git a/charts/ipa/values.yaml b/charts/ipa/values.yaml
@@ -5,7 +5,7 @@ admin_password: Passw0rd123
 realm: "-r redhatlabs.dev"
 
 # sensible defaults
-image: freeipa-server:rhel-7
+image: freeipa-server:latest
 install_opts: "-U --setup-dns --no-forwarders --no-ntp"
 container_args: "ipa-server-install"
 volume: 5Gi