From fe6b0679dfc4616d1501fefe774021bba4c14b0b Mon Sep 17 00:00:00 2001 From: che-bot <39771996+che-bot@users.noreply.github.com> Date: Mon, 6 Jun 2022 09:56:04 +0200 Subject: [PATCH 01/10] chore: Update from ubi8/httpd-24:1-193 to ubi8/httpd-24:1-193.1652296462 (#650) Signed-off-by: Mykhailo Kuznietsov Co-authored-by: Mykhailo Kuznietsov --- build/dockerfiles/rhel.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dockerfiles/rhel.Dockerfile b/build/dockerfiles/rhel.Dockerfile index cedc72174..70ccb7a95 100644 --- a/build/dockerfiles/rhel.Dockerfile +++ b/build/dockerfiles/rhel.Dockerfile @@ -59,7 +59,7 @@ RUN chmod -R g+rwX /build/devfiles # Build registry, copying meta.yamls and index.json from builder # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/httpd-24 -FROM registry.access.redhat.com/ubi8/httpd-24:1-193 AS registry +FROM registry.access.redhat.com/ubi8/httpd-24:1-193.1652296462 AS registry USER 0 # latest httpd container doesn't include ssl cert, so generate one From 4d1e0bdca01ee0029287d683fc00e95afb908077 Mon Sep 17 00:00:00 2001 From: che-bot <39771996+che-bot@users.noreply.github.com> Date: Wed, 8 Jun 2022 12:56:48 +0200 Subject: [PATCH 02/10] chore: release: bump to 7.50.0-SNAPSHOT in main (#651) Signed-off-by: Mykhailo Kuznietsov Co-authored-by: Mykhailo Kuznietsov --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fbec8de0a..301760aa8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.49.0-SNAPSHOT +7.50.0-SNAPSHOT From ba87e2f19ec58443342cfeb9441208ab04887ac8 Mon Sep 17 00:00:00 2001 From: che-bot <39771996+che-bot@users.noreply.github.com> Date: Mon, 13 Jun 2022 08:50:27 +0200 Subject: [PATCH 03/10] chore: Update from ubi8/nodejs-16-minimal:1-43 to ubi8/nodejs-16-minimal:1-43.1653913680 (#652) * chore: Update from ubi8/nodejs-16-minimal:1-43 to ubi8/nodejs-16-minimal:1-43.1653913680 Signed-off-by: Mykhailo Kuznietsov * chore: Update from ubi8/httpd-24:1-193.1652296462 to ubi8/httpd-24:1-193.1654147964 Signed-off-by: Mykhailo Kuznietsov Co-authored-by: Mykhailo Kuznietsov --- build/dockerfiles/rhel.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dockerfiles/rhel.Dockerfile b/build/dockerfiles/rhel.Dockerfile index 70ccb7a95..0994de5fe 100644 --- a/build/dockerfiles/rhel.Dockerfile +++ b/build/dockerfiles/rhel.Dockerfile @@ -13,7 +13,7 @@ # Builder: check meta.yamls and create index.json # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-16-minimal -FROM registry.access.redhat.com/ubi8/nodejs-16-minimal:1-43 as builder +FROM registry.access.redhat.com/ubi8/nodejs-16-minimal:1-43.1653913680 as builder USER 0 ################# @@ -59,7 +59,7 @@ RUN chmod -R g+rwX /build/devfiles # Build registry, copying meta.yamls and index.json from builder # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/httpd-24 -FROM registry.access.redhat.com/ubi8/httpd-24:1-193.1652296462 AS registry +FROM registry.access.redhat.com/ubi8/httpd-24:1-193.1654147964 AS registry USER 0 # latest httpd container doesn't include ssl cert, so generate one From 6731dd6443feb08d3ad1737aba29e7557c3b80e5 Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Mon, 20 Jun 2022 18:58:23 +0900 Subject: [PATCH 04/10] chore: Enable to deploy 1.22 clusters with the Helm chart. (#653) Signed-off-by: Masaki Muranaka --- .../templates/ingress.yaml | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/deploy/kubernetes/che-devfile-registry/templates/ingress.yaml b/deploy/kubernetes/che-devfile-registry/templates/ingress.yaml index 1e4fcd51c..91166cf23 100644 --- a/deploy/kubernetes/che-devfile-registry/templates/ingress.yaml +++ b/deploy/kubernetes/che-devfile-registry/templates/ingress.yaml @@ -7,7 +7,13 @@ # SPDX-License-Identifier: EPL-2.0 # +{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} apiVersion: extensions/v1beta1 +{{- end }} kind: Ingress metadata: name: che-devfile-registry @@ -25,9 +31,20 @@ spec: http: paths: - path: / + {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }} + pathType: ImplementationSpecific + {{- else -}} + {{- end }} backend: - serviceName: che-devfile-registry - servicePort: 8080 + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: che-devfile-registry + port: + number: 8080 + {{- else }} + serviceName: che-devfile-registry + servicePort: 8080 + {{- end }} {{- if .Values.cheDevfileRegistryIngressSecretName }} tls: - hosts: From 3694e9324a003f3a8a3c801f58528246f8dc0c8f Mon Sep 17 00:00:00 2001 From: che-bot <39771996+che-bot@users.noreply.github.com> Date: Fri, 24 Jun 2022 08:56:35 +0200 Subject: [PATCH 05/10] chore(digests): update dockerfile base images (#654) Signed-off-by: Mykhailo Kuznietsov Co-authored-by: Mykhailo Kuznietsov --- dockerfiles/golang-1.17/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/golang-1.17/Dockerfile b/dockerfiles/golang-1.17/Dockerfile index bcafb191e..bd1665192 100644 --- a/dockerfiles/golang-1.17/Dockerfile +++ b/dockerfiles/golang-1.17/Dockerfile @@ -9,6 +9,6 @@ ARG BASE_IMAGE="docker.io/golang:1.17-stretch" -FROM docker.io/golang@sha256:2401153d4efc3dd9dad5649564216520e32cd7a5648aac703e8091c5a7140300 +FROM docker.io/golang@sha256:9db49389f8b666d232088389e8b36dccc4ffbf9a562765deeb18e0c4e796724c #{INCLUDE:../base.dockerfile} From 7977d0fcad1247dd58db9173854b2b2401723242 Mon Sep 17 00:00:00 2001 From: che-bot <39771996+che-bot@users.noreply.github.com> Date: Fri, 24 Jun 2022 12:58:26 +0200 Subject: [PATCH 06/10] chore(sidecars): bump to new sidecar tags (#655) Signed-off-by: Mykhailo Kuznietsov Co-authored-by: Mykhailo Kuznietsov --- devfiles/go/devfile.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devfiles/go/devfile.yaml b/devfiles/go/devfile.yaml index cac3c68c6..8e942ac85 100644 --- a/devfiles/go/devfile.yaml +++ b/devfiles/go/devfile.yaml @@ -28,7 +28,7 @@ components: - type: dockerimage # this version is used in the plugin - image: quay.io/eclipse/che-golang-1.17:e2a12fe + image: quay.io/eclipse/che-golang-1.17:3694e93 alias: go-cli env: - name: GOPATH From 8af6ce742220661e340e2e5ed648b2283749e71f Mon Sep 17 00:00:00 2001 From: che-bot <39771996+che-bot@users.noreply.github.com> Date: Mon, 27 Jun 2022 09:37:32 +0200 Subject: [PATCH 07/10] chore: Update from ubi8/nodejs-16-minimal:1-43.1653913680 to ubi8/nodejs-16-minimal:1-43.1655287181 (#656) * chore: Update from ubi8/nodejs-16-minimal:1-43.1653913680 to ubi8/nodejs-16-minimal:1-43.1655287181 Signed-off-by: Mykhailo Kuznietsov * chore: Update from ubi8/httpd-24:1-193.1654147964 to ubi8/httpd-24:1-193.1655143355 Signed-off-by: Mykhailo Kuznietsov Co-authored-by: Mykhailo Kuznietsov --- build/dockerfiles/rhel.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dockerfiles/rhel.Dockerfile b/build/dockerfiles/rhel.Dockerfile index 0994de5fe..e5f6464b1 100644 --- a/build/dockerfiles/rhel.Dockerfile +++ b/build/dockerfiles/rhel.Dockerfile @@ -13,7 +13,7 @@ # Builder: check meta.yamls and create index.json # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-16-minimal -FROM registry.access.redhat.com/ubi8/nodejs-16-minimal:1-43.1653913680 as builder +FROM registry.access.redhat.com/ubi8/nodejs-16-minimal:1-43.1655287181 as builder USER 0 ################# @@ -59,7 +59,7 @@ RUN chmod -R g+rwX /build/devfiles # Build registry, copying meta.yamls and index.json from builder # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/httpd-24 -FROM registry.access.redhat.com/ubi8/httpd-24:1-193.1654147964 AS registry +FROM registry.access.redhat.com/ubi8/httpd-24:1-193.1655143355 AS registry USER 0 # latest httpd container doesn't include ssl cert, so generate one From f052ee4e598b70b91b3fc71c7d0f40c9f03b0abc Mon Sep 17 00:00:00 2001 From: che-bot <39771996+che-bot@users.noreply.github.com> Date: Mon, 27 Jun 2022 09:39:19 +0200 Subject: [PATCH 08/10] chore(digests): update dockerfile base images (#657) Signed-off-by: Mykhailo Kuznietsov Co-authored-by: Mykhailo Kuznietsov --- dockerfiles/golang-1.17/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/golang-1.17/Dockerfile b/dockerfiles/golang-1.17/Dockerfile index bd1665192..5e8ed1823 100644 --- a/dockerfiles/golang-1.17/Dockerfile +++ b/dockerfiles/golang-1.17/Dockerfile @@ -9,6 +9,6 @@ ARG BASE_IMAGE="docker.io/golang:1.17-stretch" -FROM docker.io/golang@sha256:9db49389f8b666d232088389e8b36dccc4ffbf9a562765deeb18e0c4e796724c +FROM docker.io/golang@sha256:9a127d78ef8b3c51ca438ade0840a6af891a3cc502bebf11a7bf432bcda5cefa #{INCLUDE:../base.dockerfile} From 965a7d12c96e49a2bbbf3f2dae22b25a6831dc85 Mon Sep 17 00:00:00 2001 From: che-bot <39771996+che-bot@users.noreply.github.com> Date: Mon, 27 Jun 2022 10:30:43 +0200 Subject: [PATCH 09/10] chore(sidecars): bump to new sidecar tags (#660) Signed-off-by: Mykhailo Kuznietsov Co-authored-by: Mykhailo Kuznietsov --- devfiles/go/devfile.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devfiles/go/devfile.yaml b/devfiles/go/devfile.yaml index 8e942ac85..50202251b 100644 --- a/devfiles/go/devfile.yaml +++ b/devfiles/go/devfile.yaml @@ -28,7 +28,7 @@ components: - type: dockerimage # this version is used in the plugin - image: quay.io/eclipse/che-golang-1.17:3694e93 + image: quay.io/eclipse/che-golang-1.17:f052ee4 alias: go-cli env: - name: GOPATH From b434d532b10bc6a6d5df7f06679c381227355888 Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Wed, 29 Jun 2022 10:02:50 +0000 Subject: [PATCH 10/10] chore: release: bump to 7.50.0 in 7.50.x Signed-off-by: Mykhailo Kuznietsov --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 301760aa8..cf89fc8c7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.50.0-SNAPSHOT +7.50.0