Update for 1.7.0

skupperproject · May 2, 2024 · 8bdc4e6 · 8bdc4e6
1 parent 6fb3a1d
commit 8bdc4e6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git 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.7.0.tar.gz .
+RUN tar -zxf 1.7.0.tar.gz
+WORKDIR ./skupper-console-1.7.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.7.0/build/ console
 CMD ["/app/flow-collector"]
diff --git 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.7.0
         securityContext:
           capabilities:
             drop:

diff --git 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.7.0
         securityContext:
           capabilities:
             drop:

diff --git 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:main"
-	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.6.0"
+	ServiceControllerImageName string = "service-controller:1.7.0"
+	ControllerPodmanImageName  string = "controller-podman:1.7.0"
+	ConfigSyncImageName        string = "config-sync:1.7.0"
+	FlowCollectorImageName     string = "flow-collector:1.7.0"
+	SiteControllerImageName    string = "site-controller:1.7.0"
 	PrometheusImageRegistry    string = "quay.io/prometheus"
 	PrometheusServerImageName  string = "prometheus:v2.42.0"
 	OauthProxyImageRegistry    string = "quay.io/openshift"