update for 2.0.0

Author: nluaces

Dockerfile.network-observer

@@ -16,9 +16,9 @@ RUN make GOARCH=$TARGETARCH build-network-observer
 FROM --platform=$BUILDPLATFORM node:20.9.0 AS console-builder
 
 WORKDIR /skupper-console/
-ADD https://github.com/skupperproject/skupper-console/archive/refs/tags/2.0.0-rc1.tar.gz .
-RUN tar -zxf 2.0.0-rc1.tar.gz
-WORKDIR ./skupper-console-2.0.0-rc1
+ADD https://github.com/skupperproject/skupper-console/archive/refs/tags/2.0.0.tar.gz .
+RUN tar -zxf 2.0.0.tar.gz
+WORKDIR ./skupper-console-2.0.0
 RUN yarn install && yarn build
 
 FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9-minimal
@@ -34,5 +34,5 @@ USER 10000
 
 WORKDIR /app
 COPY --from=builder /go/src/app/network-observer .
-COPY --from=console-builder /skupper-console/skupper-console-2.0.0-rc1/build/ console
+COPY --from=console-builder /skupper-console/skupper-console-2.0.0/build/ console
 ENTRYPOINT ["/app/network-observer"]

Makefile

@@ -8,7 +8,7 @@ GOOS ?= linux
 GOARCH ?= amd64
 
 REGISTRY := quay.io/skupper
-IMAGE_TAG := 2.0.0-rc1
+IMAGE_TAG := 2.0.0
 ROUTER_IMAGE_TAG := 3.2.0
 PLATFORMS ?= linux/amd64,linux/arm64
 CONTAINERFILES := Dockerfile.cli Dockerfile.kube-adaptor Dockerfile.controller Dockerfile.network-observer

charts/network-observer/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: network-observer
 description: A Helm chart for the Skupper Network Observer
 type: application
-version: 2.0.0-rc1
-appVersion: "2.0.0-rc1"
+version: 2.0.0
+appVersion: "2.0.0"

cmd/bootstrap/bootstrap.sh

@@ -2,7 +2,7 @@
 
 set -Ceu
 
-IMAGE="quay.io/skupper/cli:2.0.0-rc1"
+IMAGE="quay.io/skupper/cli:2.0.0"
 export INPUT_PATH=""
 export NAMESPACE=""
 export FORCE_FLAG=""

config/base/manager.yaml

@@ -30,13 +30,13 @@ spec:
           type: RuntimeDefault
       containers:
         - name: controller
-          image: quay.io/skupper/controller:2.0.0-rc1
+          image: quay.io/skupper/controller:2.0.0
           imagePullPolicy: Always
           command: ["/app/controller"]
           args: ["-enable-grants", "-grant-server-autoconfigure"]
           env:
             - name: SKUPPER_KUBE_ADAPTOR_IMAGE
-              value: quay.io/skupper/kube-adaptor:2.0.0-rc1
+              value: quay.io/skupper/kube-adaptor:2.0.0
             - name: SKUPPER_KUBE_ADAPTOR_IMAGE_PULL_POLICY
               value: Always
             - name: SKUPPER_ROUTER_IMAGE

config/manifests/patch-add-env-var-related-images.yaml

@@ -12,6 +12,6 @@ spec:
         - name: controller
           env:
             - name: RELATED_IMAGE_kube_adaptor
-              value: quay.io/skupper/kube-adaptor:2.0.0-rc1
+              value: quay.io/skupper/kube-adaptor:2.0.0
             - name: RELATED_IMAGE_skupper-router
               value: quay.io/skupper/skupper-router:3.2.0

internal/images/images.go

@@ -3,13 +3,13 @@ package images
 const (
 	DefaultImageRegistry     string = "quay.io/skupper"
 	RouterImageName          string = "skupper-router:3.2.0"
-	ControllerImageName      string = "controller:2.0.0-rc1"
-	KubeAdaptorImageName     string = "kube-adaptor:2.0.0-rc1"
-	NetworkObserverImageName string = "network-observer:2.0.0-rc1"
-	CliImageName             string = "cli:2.0.0-rc1"
+	ControllerImageName      string = "controller:2.0.0"
+	KubeAdaptorImageName     string = "kube-adaptor:2.0.0"
+	NetworkObserverImageName string = "network-observer:2.0.0"
+	CliImageName             string = "cli:2.0.0"
 
 	PrometheusImageRegistry   string = "quay.io/prometheus"
-	PrometheusServerImageName string = "prometheus:v3.0.1"
+	PrometheusServerImageName string = "prometheus:v3.1.0"
 	OauthProxyImageRegistry   string = "quay.io/openshift"
 	OauthProxyImageName       string = "origin-oauth-proxy:4.14.0"
 )

scripts/skupper-helm-chart-generator.sh

@@ -7,7 +7,7 @@ if [ "$#" -ne 2 ]; then
 fi
 
 
-VERSION="2.0.0-rc1"
+VERSION="2.0.0"
 APP_VERSION="$1"
 ROUTER_VERSION="$2"