From f9d1eaebe6a427832d50161ac5e720530bd42f05 Mon Sep 17 00:00:00 2001 From: Noe Luaces Date: Wed, 28 Aug 2024 15:37:01 +0200 Subject: [PATCH] update for 1.8.1 --- Dockerfile.flow-collector | 8 ++++---- cmd/flow-collector/deploy.yaml | 2 +- cmd/site-controller/deploy-watch-all-ns.yaml | 2 +- cmd/site-controller/deploy-watch-current-ns.yaml | 2 +- pkg/images/images.go | 12 ++++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile.flow-collector b/Dockerfile.flow-collector index 21ad85cda..e266c50c7 100644 --- a/Dockerfile.flow-collector +++ b/Dockerfile.flow-collector @@ -16,9 +16,9 @@ RUN make GOOS=$TARGETOS GOARCH=$TARGETARCH FROM --platform=$BUILDPLATFORM node:18.18.2 AS console-builder WORKDIR /skupper-console/ -ADD https://github.com/skupperproject/skupper-console/archive/main.tar.gz . -RUN tar -zxf main.tar.gz -WORKDIR ./skupper-console-main +ADD https://github.com/skupperproject/skupper-console/archive/refs/tags/1.8.0.tar.gz . +RUN tar -zxf 1.8.0.tar.gz +WORKDIR ./skupper-console-1.8.0 RUN yarn install && yarn build FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9-minimal @@ -31,5 +31,5 @@ USER 10000 WORKDIR /app COPY --from=builder /go/src/app/flow-collector . -COPY --from=console-builder /skupper-console/skupper-console-main/build/ console +COPY --from=console-builder /skupper-console/skupper-console-1.8.0/build/ console CMD ["/app/flow-collector"] diff --git a/cmd/flow-collector/deploy.yaml b/cmd/flow-collector/deploy.yaml index 979b0f408..584cfcd2f 100644 --- a/cmd/flow-collector/deploy.yaml +++ b/cmd/flow-collector/deploy.yaml @@ -66,7 +66,7 @@ spec: #type: RuntimeDefault containers: - name: skupper-flow-collector - image: quay.io/skupper/flow-collector:main + image: quay.io/skupper/flow-collector:1.8.0 imagePullPolicy: Always securityContext: capabilities: diff --git a/cmd/site-controller/deploy-watch-all-ns.yaml b/cmd/site-controller/deploy-watch-all-ns.yaml index 370b81492..b51d94bfc 100644 --- a/cmd/site-controller/deploy-watch-all-ns.yaml +++ b/cmd/site-controller/deploy-watch-all-ns.yaml @@ -194,7 +194,7 @@ spec: type: RuntimeDefault containers: - name: site-controller - image: quay.io/skupper/site-controller:main + image: quay.io/skupper/site-controller:1.8.0 securityContext: capabilities: drop: diff --git a/cmd/site-controller/deploy-watch-current-ns.yaml b/cmd/site-controller/deploy-watch-current-ns.yaml index 6e50b5f87..087046f94 100644 --- a/cmd/site-controller/deploy-watch-current-ns.yaml +++ b/cmd/site-controller/deploy-watch-current-ns.yaml @@ -137,7 +137,7 @@ spec: type: RuntimeDefault containers: - name: site-controller - image: quay.io/skupper/site-controller:main + image: quay.io/skupper/site-controller:1.8.0 securityContext: capabilities: drop: diff --git a/pkg/images/images.go b/pkg/images/images.go index 750d28560..644319ce1 100644 --- a/pkg/images/images.go +++ b/pkg/images/images.go @@ -2,12 +2,12 @@ package images const ( DefaultImageRegistry string = "quay.io/skupper" - RouterImageName string = "skupper-router:2.6.1" - ServiceControllerImageName string = "service-controller:main" - ControllerPodmanImageName string = "controller-podman:main" - ConfigSyncImageName string = "config-sync:main" - FlowCollectorImageName string = "flow-collector:main" - SiteControllerImageName string = "site-controller:main" + RouterImageName string = "skupper-router:2.7.0" + ServiceControllerImageName string = "service-controller:1.8.0" + ControllerPodmanImageName string = "controller-podman:1.8.0" + ConfigSyncImageName string = "config-sync:1.8.0" + FlowCollectorImageName string = "flow-collector:1.8.0" + SiteControllerImageName string = "site-controller:1.8.0" PrometheusImageRegistry string = "quay.io/prometheus" PrometheusServerImageName string = "prometheus:v2.42.0" OauthProxyImageRegistry string = "quay.io/openshift"