Update ruby-imagestreams

charts/centos/ruby-imagestreams/src/Chart.yaml

@@ -1,14 +1,14 @@
 description: |-
   This content is expermental, do not use it in production. Build and run Ruby applications on UBI.
   For more information about using this builder image, including OpenShift considerations,
-  see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.
+  see https://github.com/sclorg/s2i-ruby-container/blob/master/3.3/README.md.
 annotations:
   charts.openshift.io/name: CentOS Ruby applications on UBI (experimental)
 apiVersion: v2
-appVersion: 0.0.1
+appVersion: 0.0.2
 kubeVersion: '>=1.20.0'
 name: ruby-imagestreams
 tags: builder,ruby
 sources:
   - https://github.com/sclorg/helm-charts
-version: 0.0.1
+version: 0.0.2

charts/centos/ruby-imagestreams/src/templates/imagestreams.yaml

@@ -13,7 +13,7 @@ spec:
         description: >-
           Build and run Ruby applications on UBI. For more information about 
           using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-ruby-container/tree/master/3.0/README.md.
+          https://github.com/sclorg/s2i-ruby-container/tree/master/3.3/README.md.
 
           WARNING: By selecting this tag, your application will automatically 
           update to use the latest version of Ruby available on OpenShift, 
@@ -24,33 +24,87 @@ spec:
         sampleRepo: https://github.com/sclorg/ruby-ex.git
       from:
         kind: ImageStreamTag
-        name: 3.0-ubi8
+        name: 3.3-ubi8
       referencePolicy:
         type: Local
-    - name: 3.0-ubi9
+    - name: 3.3-ubi9
       annotations:
-        openshift.io/display-name: Ruby 3.0 (UBI 9)
+        openshift.io/display-name: Ruby 3.3 (UBI 9)
         openshift.io/provider-display-name: Red Hat, Inc.
         description: >-
-          Build and run Ruby 3.0 applications on UBI 9. For more information 
+          Build and run Ruby 3.3 applications on UBI 9. For more information 
           about using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.
+          https://github.com/sclorg/s2i-ruby-container/blob/master/3.3/README.md.
         iconClass: icon-ruby
         tags: builder,ruby
-        supports: ruby:3.0,ruby
-        version: "3.0"
+        supports: ruby:3.3,ruby
+        version: "3.3"
         sampleRepo: https://github.com/sclorg/ruby-ex.git
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/ubi9/ruby-30:latest
+        name: registry.access.redhat.com/ubi9/ruby-33:latest
+      referencePolicy:
+        type: Local
+    - name: 3.3-ubi8
+      annotations:
+        openshift.io/display-name: Ruby 3.3 (UBI 8)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Build and run Ruby 3.3 applications on UBI 8. For more information 
+          about using this builder image, including OpenShift considerations, see 
+          https://github.com/sclorg/s2i-ruby-container/blob/master/3.3/README.md.
+        iconClass: icon-ruby
+        tags: builder,ruby
+        supports: ruby:3.3,ruby
+        version: "3.3"
+        sampleRepo: https://github.com/sclorg/ruby-ex.git
+      from:
+        kind: DockerImage
+        name: registry.access.redhat.com/ubi8/ruby-33:latest
+      referencePolicy:
+        type: Local
+    - name: 3.1-ubi9
+      annotations:
+        openshift.io/display-name: Ruby 3.1 (UBI 9)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Build and run Ruby 3.1 applications on UBI 9. For more information 
+          about using this builder image, including OpenShift considerations, see 
+          https://github.com/sclorg/s2i-ruby-container/blob/master/3.1/README.md.
+        iconClass: icon-ruby
+        tags: builder,ruby
+        supports: ruby:3.1,ruby
+        version: "3.1"
+        sampleRepo: https://github.com/sclorg/ruby-ex.git
+      from:
+        kind: DockerImage
+        name: registry.access.redhat.com/ubi9/ruby-31:latest
+      referencePolicy:
+        type: Local
+    - name: 3.1-ubi8
+      annotations:
+        openshift.io/display-name: Ruby 3.1 (UBI 8)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Build and run Ruby 3.1 applications on UBI 8. For more information 
+          about using this builder image, including OpenShift considerations, see 
+          https://github.com/sclorg/s2i-ruby-container/blob/master/3.1/README.md.
+        iconClass: icon-ruby
+        tags: builder,ruby
+        supports: ruby:3.1,ruby
+        version: "3.1"
+        sampleRepo: https://github.com/sclorg/ruby-ex.git
+      from:
+        kind: DockerImage
+        name: registry.access.redhat.com/ubi8/ruby-31:latest
       referencePolicy:
         type: Local
-    - name: 3.0-ubi8
+    - name: 3.0-ubi9
       annotations:
-        openshift.io/display-name: Ruby 3.0 (UBI 8)
+        openshift.io/display-name: Ruby 3.0 (UBI 9)
         openshift.io/provider-display-name: Red Hat, Inc.
         description: >-
-          Build and run Ruby 3.0 applications on UBI 8. For more information 
+          Build and run Ruby 3.0 applications on UBI 9. For more information 
           about using this builder image, including OpenShift considerations, see 
           https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.
         iconClass: icon-ruby
@@ -60,7 +114,7 @@ spec:
         sampleRepo: https://github.com/sclorg/ruby-ex.git
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/ubi8/ruby-30:latest
+        name: registry.access.redhat.com/ubi9/ruby-30:latest
       referencePolicy:
         type: Local
     - name: 2.5-ubi8

charts/redhat/ruby-imagestreams/src/Chart.yaml

@@ -1,14 +1,14 @@
 description: |-
   This content is expermental, do not use it in production. Build and run Ruby applications on UBI.
   For more information about using this builder image, including OpenShift considerations,
-  see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.
+  see https://github.com/sclorg/s2i-ruby-container/blob/master/3.3/README.md.
 annotations:
   charts.openshift.io/name: Red Hat Ruby applications on UBI (experimental)
 apiVersion: v2
-appVersion: 0.0.2
+appVersion: 0.0.3
 kubeVersion: '>=1.20.0'
 name: ruby-imagestreams
 tags: builder,ruby
 sources:
   - https://github.com/sclorg/helm-charts
-version: 0.0.2
+version: 0.0.3

charts/redhat/ruby-imagestreams/src/templates/ruby-imagestream.yaml

@@ -21,7 +21,23 @@ spec:
       sampleRepo: https://github.com/sclorg/ruby-ex.git
     from:
       kind: ImageStreamTag
-      name: 3.0-ubi8
+      name: 3.3-ubi8
+    referencePolicy:
+      type: Local
+  - name: 3.3-ubi9
+    annotations:
+      openshift.io/display-name: Ruby 3.3 (UBI 9)
+      openshift.io/provider-display-name: Red Hat, Inc.
+      description: Build and run Ruby 3.3 applications on UBI 9. For more information
+        about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.3/README.md.
+      iconClass: icon-ruby
+      tags: builder,ruby
+      supports: ruby:3.3,ruby
+      version: '3.3'
+      sampleRepo: https://github.com/sclorg/ruby-ex.git
+    from:
+      kind: DockerImage
+      name: registry.redhat.io/ubi9/ruby-33:latest
     referencePolicy:
       type: Local
   - name: 3.1-ubi9
@@ -40,6 +56,22 @@ spec:
       name: registry.redhat.io/ubi9/ruby-31:latest
     referencePolicy:
       type: Local
+  - name: 3.3-ubi8
+    annotations:
+      openshift.io/display-name: Ruby 3.3 (UBI 8)
+      openshift.io/provider-display-name: Red Hat, Inc.
+      description: Build and run Ruby 3.3 applications on UBI 8. For more information
+        about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.3/README.md.
+      iconClass: icon-ruby
+      tags: builder,ruby
+      supports: ruby:3.3,ruby
+      version: '3.3'
+      sampleRepo: https://github.com/sclorg/ruby-ex.git
+    from:
+      kind: DockerImage
+      name: registry.redhat.io/ubi8/ruby-33:latest
+    referencePolicy:
+      type: Local
   - name: 3.0-ubi9
     annotations:
       openshift.io/display-name: Ruby 3.0 (UBI 9)
@@ -72,22 +104,6 @@ spec:
       name: registry.redhat.io/ubi8/ruby-31:latest
     referencePolicy:
       type: Local
-  - name: 3.0-ubi8
-    annotations:
-      openshift.io/display-name: Ruby 3.0 (UBI 8)
-      openshift.io/provider-display-name: Red Hat, Inc.
-      description: Build and run Ruby 3.0 applications on UBI 8. For more information
-        about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md.
-      iconClass: icon-ruby
-      tags: builder,ruby
-      supports: ruby:3.0,ruby
-      version: '3.0'
-      sampleRepo: https://github.com/sclorg/ruby-ex.git
-    from:
-      kind: DockerImage
-      name: registry.redhat.io/ubi8/ruby-30:latest
-    referencePolicy:
-      type: Local
   - name: 2.5-ubi8
     annotations:
       openshift.io/display-name: Ruby 2.5 (UBI 8)

tests/test_ruby_imagestreams.py

@@ -21,10 +21,11 @@ def teardown_method(self):
     @pytest.mark.parametrize(
         "version,registry",
         [
+            ("3.3-ubi9", "registry.redhat.io/ubi9/ruby-33:latest"),
+            ("3.3-ubi8", "registry.redhat.io/ubi8/ruby-33:latest"),
             ("3.1-ubi9", "registry.redhat.io/ubi9/ruby-31:latest"),
             ("3.1-ubi8", "registry.redhat.io/ubi8/ruby-31:latest"),
             ("3.0-ubi9", "registry.redhat.io/ubi9/ruby-30:latest"),
-            ("3.0-ubi8", "registry.redhat.io/ubi8/ruby-30:latest"),
             ("2.5-ubi8", "registry.redhat.io/ubi8/ruby-25:latest"),
         ],
     )
@@ -47,8 +48,11 @@ def teardown_method(self):
     @pytest.mark.parametrize(
         "version,registry",
         [
+            ("3.3-ubi9", "registry.access.redhat.com/ubi9/ruby-33:latest"),
+            ("3.1-ubi9", "registry.access.redhat.com/ubi9/ruby-31:latest"),
+            ("3.3-ubi8", "registry.access.redhat.com/ubi8/ruby-33:latest"),
+            ("3.1-ubi8", "registry.access.redhat.com/ubi8/ruby-31:latest"),
             ("3.0-ubi9", "registry.access.redhat.com/ubi9/ruby-30:latest"),
-            ("3.0-ubi8", "registry.access.redhat.com/ubi8/ruby-30:latest"),
             ("2.5-ubi8", "registry.access.redhat.com/ubi8/ruby-25:latest"),
         ],
     )

tests/test_ruby_rails_application.py

@@ -26,7 +26,7 @@ def test_curl_connection(self):
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={
-                "ruby_version": "3.1-ubi8",
+                "ruby_version": "3.1-ubi9",
                 "namespace": self.hc_api.namespace
             }
         )
@@ -44,7 +44,7 @@ def test_by_helm_test(self):
         assert self.hc_api.helm_package()
         assert self.hc_api.helm_installation(
             values={
-                "ruby_version": "3.1-ubi8",
+                "ruby_version": "3.1-ubi9",
                 "namespace": self.hc_api.namespace
             }
         )