From 533cc2905a56014355a6b1ebad5bce56c686bce4 Mon Sep 17 00:00:00 2001 From: che-bot <39771996+che-bot@users.noreply.github.com> Date: Mon, 3 Jul 2023 14:22:29 +0200 Subject: [PATCH] chore: Update from ubi8/go-toolset:1.19.9-2 to ubi8/go-toolset:1.19.10-3 (#1715) * chore: Update from ubi8/go-toolset:1.19.9-2 to ubi8/go-toolset:1.19.10-3 Signed-off-by: Nick Boldt * chore: Update from ubi8-minimal:8.8-860 to ubi8-minimal:8.8-1014 Signed-off-by: Nick Boldt * fix: start workspaces on minikube cluster Signed-off-by: Anatolii Bazko --------- Signed-off-by: Nick Boldt Signed-off-by: Anatolii Bazko Co-authored-by: Nick Boldt Co-authored-by: Anatolii Bazko --- Dockerfile | 4 ++-- build/scripts/minikube-tests/common.sh | 1 + .../minikube-tests/minikube-checluster-patch.yaml | 14 ++++++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 94ba308c6..3a5dc7fc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ # # https://registry.access.redhat.com/ubi8/go-toolset -FROM registry.access.redhat.com/ubi8/go-toolset:1.19.9-2 as builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.19.10-3 as builder ENV GOPATH=/go/ ARG DEV_HEADER_REWRITE_TRAEFIK_PLUGIN="main" ARG SKIP_TESTS="false" @@ -45,7 +45,7 @@ RUN export ARCH="$(uname -m)" && if [[ ${ARCH} == "x86_64" ]]; then export ARCH= CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=on go build -mod=vendor -a -o che-operator main.go # https://registry.access.redhat.com/ubi8-minimal -FROM registry.access.redhat.com/ubi8-minimal:8.8-860 +FROM registry.access.redhat.com/ubi8-minimal:8.8-1014 COPY --from=builder /tmp/header-rewrite-traefik-plugin /tmp/header-rewrite-traefik-plugin COPY --from=builder /che-operator/che-operator /manager diff --git a/build/scripts/minikube-tests/common.sh b/build/scripts/minikube-tests/common.sh index 71fc28e8e..003ab5cc4 100755 --- a/build/scripts/minikube-tests/common.sh +++ b/build/scripts/minikube-tests/common.sh @@ -220,6 +220,7 @@ spec: container: image: quay.io/devfile/universal-developer-image:ubi8-latest cpuLimit: 100m + cpuRequest: 100m EOF } diff --git a/build/scripts/minikube-tests/minikube-checluster-patch.yaml b/build/scripts/minikube-tests/minikube-checluster-patch.yaml index e985dfba9..5aa033298 100644 --- a/build/scripts/minikube-tests/minikube-checluster-patch.yaml +++ b/build/scripts/minikube-tests/minikube-checluster-patch.yaml @@ -11,7 +11,17 @@ # apiVersion: org.eclipse.che/v2 +metadata: + annotations: + che.eclipse.org/checluster-defaults-cleanup: '{"spec.components.pluginRegistry.openVSXURL":"true"}' spec: + devEnvironments: + gatewayContainer: + resources: + request: + cpu: '20m' + limits: + cpu: '20m' components: pluginRegistry: openVSXURL: https://open-vsx.org @@ -35,9 +45,9 @@ spec: containers: - resources: limits: - cpu: '400m' + cpu: '300m' request: - cpu: '400m' + cpu: '300m' dashboard: deployment: containers: