Merge pull request #75 from sclorg/nodejs_16_eol

NodeJS 16 reached EOL. Deprecate it

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

@@ -5,10 +5,10 @@ description: |-
 annotations:
   charts.openshift.io/name: Red Hat NodeJS applications on UBI (experimental)
 apiVersion: v2
-appVersion: 0.0.2
+appVersion: 0.0.3
 kubeVersion: '>=1.20.0'
 name: nodejs-imagestreams
 tags: builder,nodejs
 sources:
   - https://github.com/sclorg/helm-charts
-version: 0.0.2
+version: 0.0.3

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

@@ -21,7 +21,7 @@ spec:
       sampleRepo: https://github.com/sclorg/nodejs-ex.git
     from:
       kind: ImageStreamTag
-      name: 16-ubi8
+      name: 20-ubi8
     referencePolicy:
       type: Local
   - name: 20-ubi9
@@ -54,21 +54,6 @@ spec:
       name: registry.redhat.io/ubi9/nodejs-18:latest
     referencePolicy:
       type: Local
-  - name: 16-ubi9
-    annotations:
-      openshift.io/display-name: Node.js 16 (UBI 9)
-      openshift.io/provider-display-name: Red Hat, Inc.
-      description: Build and run Node.js 16 applications on UBI 9. For more information
-        about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.
-      iconClass: icon-nodejs
-      tags: builder,nodejs
-      version: '16'
-      sampleRepo: https://github.com/sclorg/nodejs-ex.git
-    from:
-      kind: DockerImage
-      name: registry.redhat.io/ubi9/nodejs-16:latest
-    referencePolicy:
-      type: Local
   - name: 20-ubi9-minimal
     annotations:
       openshift.io/display-name: Node.js 20 (UBI 9 Minimal)
@@ -101,22 +86,6 @@ spec:
       name: registry.redhat.io/ubi9/nodejs-18-minimal:latest
     referencePolicy:
       type: Local
-  - name: 16-ubi9-minimal
-    annotations:
-      openshift.io/display-name: Node.js 16 (UBI 9 Minimal)
-      openshift.io/provider-display-name: Red Hat, Inc.
-      description: Build and run Node.js 16 applications on UBI 9 Minimal. For more
-        information about using this builder image, including OpenShift considerations,
-        see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.
-      iconClass: icon-nodejs
-      tags: builder,nodejs
-      version: '16'
-      sampleRepo: https://github.com/sclorg/nodejs-ex.git
-    from:
-      kind: DockerImage
-      name: registry.redhat.io/ubi9/nodejs-16-minimal:latest
-    referencePolicy:
-      type: Local
   - name: 20-ubi8
     annotations:
       openshift.io/display-name: Node.js 20 (UBI 8)
@@ -147,21 +116,6 @@ spec:
       name: registry.redhat.io/ubi8/nodejs-18:latest
     referencePolicy:
       type: Local
-  - name: 16-ubi8
-    annotations:
-      openshift.io/display-name: Node.js 16 (UBI 8)
-      openshift.io/provider-display-name: Red Hat, Inc.
-      description: Build and run Node.js 16 applications on UBI 8. For more information
-        about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-nodejs-container/blob/master/16/README.md.
-      iconClass: icon-nodejs
-      tags: builder,nodejs
-      version: '16'
-      sampleRepo: https://github.com/sclorg/nodejs-ex.git
-    from:
-      kind: DockerImage
-      name: registry.redhat.io/ubi8/nodejs-16:latest
-    referencePolicy:
-      type: Local
   - name: 20-ubi8-minimal
     annotations:
       openshift.io/display-name: Node.js 20 (UBI 8 Minimal)
@@ -194,22 +148,6 @@ spec:
       name: registry.redhat.io/ubi8/nodejs-18-minimal:latest
     referencePolicy:
       type: Local
-  - name: 16-ubi8-minimal
-    annotations:
-      openshift.io/display-name: Node.js 16 (UBI 8 Minimal)
-      openshift.io/provider-display-name: Red Hat, Inc.
-      description: Build and run Node.js 16 applications on UBI 8 Minimal. For more
-        information about using this builder image, including OpenShift considerations,
-        see https://github.com/sclorg/s2i-nodejs-container/blob/master/16-minimal/README.md.
-      iconClass: icon-nodejs
-      tags: builder,nodejs
-      version: '16'
-      sampleRepo: https://github.com/sclorg/nodejs-ex.git
-    from:
-      kind: DockerImage
-      name: registry.redhat.io/ubi8/nodejs-16-minimal:latest
-    referencePolicy:
-      type: Local
   - name: 14-ubi7
     annotations:
       openshift.io/display-name: Node.js 14 (UBI 7)

tests/test_nodejs_imagestreams.py

@@ -29,10 +29,6 @@ def teardown_method(self):
             ("18-ubi9-minimal", "registry.redhat.io/ubi9/nodejs-18-minimal:latest"),
             ("18-ubi8", "registry.redhat.io/ubi8/nodejs-18:latest"),
             ("18-ubi8-minimal", "registry.redhat.io/ubi8/nodejs-18-minimal:latest"),
-            ("16-ubi9", "registry.redhat.io/ubi9/nodejs-16:latest"),
-            ("16-ubi9-minimal", "registry.redhat.io/ubi9/nodejs-16-minimal:latest"),
-            ("16-ubi8", "registry.redhat.io/ubi8/nodejs-16:latest"),
-            ("16-ubi8-minimal", "registry.redhat.io/ubi8/nodejs-16-minimal:latest"),
             ("14-ubi7", "registry.redhat.io/ubi7/nodejs-14:latest"),
         ],
     )
@@ -55,17 +51,12 @@ def teardown_method(self):
     @pytest.mark.parametrize(
         "version,registry",
         [
-            ("16-ubi9", "registry.access.redhat.com/ubi9/nodejs-16:latest"),
-            ("16-ubi9-minimal", "registry.access.redhat.com/ubi9/nodejs-16-minimal:latest"),
-            ("16-ubi8", "registry.access.redhat.com/ubi8/nodejs-16:latest"),
-            ("16-ubi8-minimal", "registry.access.redhat.com/ubi8/nodejs-16-minimal:latest"),
             ("14-ubi8", "registry.access.redhat.com/ubi8/nodejs-14:latest"),
             ("14-ubi8-minimal", "registry.access.redhat.com/ubi8/nodejs-14-minimal:latest"),
             ("14-ubi7", "registry.access.redhat.com/ubi7/nodejs-14:latest"),
         ],
     )
     def test_package_imagestream(self, version, registry):
-        self.hc_api.set_version("0.0.1")
         self.hc_api.helm_package()
         self.hc_api.helm_installation()
         assert self.hc_api.check_imagestreams(version=version, registry=registry)