replace v2 latest references (#1888)

skupperproject · Jan 15, 2025 · 2126e1a · 2126e1a
1 parent 5c2da4a
commit 2126e1a
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -62,7 +62,7 @@ yaml-templates:
     filters:
       branches:
         ignore: /.*/
-        only: /v2/
+        only: /main/
 
   release_filters: &run_for_numeric_tags
     filters:
@@ -144,20 +144,20 @@ workflows:
       - test:
           <<: *run_for_all_branches
       - build-oci-images:
-          image_tag: v2-latest
+          image_tag: v2-dev
           <<: *run_for_all_branches
       - publish-oci-images:
           <<: *run_for_v2_branch
           <<: *v2_release_requires
-          image_tag: v2-latest
+          image_tag: v2-dev
           context:
             - skupper-org
       - generate-manifest:
           requires:
             - publish-oci-images
       - publish-github-prerelease-artifacts:
           <<: *run_for_v2_branch
-          version: v2-release
+          version: v2-dev-release
           requires:
             - publish-oci-images
             - generate-manifest

diff --git a/Dockerfile.network-observer b/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/v2.tar.gz .
-RUN tar -zxf v2.tar.gz
-WORKDIR ./skupper-console-2
+ADD https://github.com/skupperproject/skupper-console/archive/main.tar.gz .
+RUN tar -zxf main.tar.gz
+WORKDIR ./skupper-console-main
 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/build/ console
+COPY --from=console-builder /skupper-console/skupper-console-main/build/ console
 ENTRYPOINT ["/app/network-observer"]
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ GOOS ?= linux
 GOARCH ?= amd64
 
 REGISTRY := quay.io/skupper
-IMAGE_TAG := v2-latest
+IMAGE_TAG := v2-dev
 PLATFORMS ?= linux/amd64,linux/arm64
 CONTAINERFILES := Dockerfile.cli Dockerfile.kube-adaptor Dockerfile.controller Dockerfile.network-observer
 SHARED_IMAGE_LABELS = \

diff --git a/charts/skupper-setup/Chart.yaml b/charts/skupper-setup/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: skupper-setup
 description:  Helm chart for setting up Skupper.
 version: 0.1.0-devel
-appVersion: v2-latest
+appVersion: v2-dev
diff --git a/charts/skupper-setup/values.yaml b/charts/skupper-setup/values.yaml
@@ -1,6 +1,6 @@
 images:
-  controller: "quay.io/skupper/controller:v2-latest"
-  adaptor: "quay.io/skupper/kube-adaptor:v2-latest"
+  controller: "quay.io/skupper/controller:v2-dev"
+  adaptor: "quay.io/skupper/kube-adaptor:v2-dev"
 
 # available options: cluster, namespace
 scope: cluster
diff --git a/cmd/bootstrap/README.md b/cmd/bootstrap/README.md
@@ -1,7 +1,7 @@
 # Bootstrapping non-kubernetes sites
 
 In this current phase of the Skupper V2 implementation, non-kubernetes sites
-can be bootstrapped using the Skupper CLI, using the quay.io/skupper/skupper-cli:v2-latest
+can be bootstrapped using the Skupper CLI, using the quay.io/skupper/skupper-cli:v2-dev
 container image by calling `./cmd/bootstrap/bootstrap.sh` with the appropriate
 flags.
 

diff --git a/cmd/bootstrap/bootstrap.sh b/cmd/bootstrap/bootstrap.sh
@@ -2,7 +2,7 @@
 
 set -Ceu
 
-IMAGE="quay.io/skupper/cli:v2-latest"
+IMAGE="quay.io/skupper/cli:v2-dev"
 export INPUT_PATH=""
 export NAMESPACE=""
 export FORCE_FLAG=""

diff --git a/cmd/network-observer/resources/developer/native-complete.yaml b/cmd/network-observer/resources/developer/native-complete.yaml
@@ -242,7 +242,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/skupper/network-observer:v2-latest
+      - image: quay.io/skupper/network-observer:v2-dev
         imagePullPolicy: Always
         name: network-observer
         args:

diff --git a/cmd/network-observer/resources/developer/native-insecure-complete.yaml b/cmd/network-observer/resources/developer/native-insecure-complete.yaml
@@ -214,7 +214,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/skupper/network-observer:v2-latest
+      - image: quay.io/skupper/network-observer:v2-dev
         imagePullPolicy: Always
         name: network-observer
         args:

diff --git a/cmd/network-observer/resources/developer/openshift-complete.yaml b/cmd/network-observer/resources/developer/openshift-complete.yaml
@@ -238,7 +238,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/skupper/network-observer:v2-latest
+      - image: quay.io/skupper/network-observer:v2-dev
         imagePullPolicy: Always
         name: network-observer
         args:

diff --git a/cmd/network-observer/resources/native/deployment.yaml b/cmd/network-observer/resources/native/deployment.yaml
@@ -58,7 +58,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/skupper/network-observer:v2-latest
+      - image: quay.io/skupper/network-observer:v2-dev
         imagePullPolicy: Always
         name: network-observer
         args:

diff --git a/cmd/network-observer/resources/openshift/deployment.yaml b/cmd/network-observer/resources/openshift/deployment.yaml
@@ -43,7 +43,7 @@ spec:
       serviceAccountName: network-observer
       containers:
       - name: network-observer
-        image: quay.io/skupper/network-observer:v2-latest
+        image: quay.io/skupper/network-observer:v2-dev
         imagePullPolicy: Always
         args:
           - -listen=127.0.0.1:8080

diff --git a/internal/nonkube/client/compat/container_test.go b/internal/nonkube/client/compat/container_test.go
@@ -208,7 +208,7 @@ func TestContainer(t *testing.T) {
 	})
 
 	// Updating container image
-	image = strings.ReplaceAll(image, ":main", ":latest")
+	image = strings.ReplaceAll(image, ":v2-latest", ":latest")
 	t.Run("container-update-image", func(t *testing.T) {
 		c, err := cli.ContainerUpdateImage(ctx, name, image)
 		assert.Assert(t, err)
@@ -328,7 +328,7 @@ func TestContainerUpdateMock(t *testing.T) {
 	assert.Assert(t, err)
 	assert.Equal(t, len(cl), 1)
 
-	newImage := strings.Replace(image, ":main", ":updated", -1)
+	newImage := strings.Replace(image, ":v2-latest", ":updated", -1)
 	_, err = cli.ContainerUpdateImage(context.Background(), "my-container", newImage)
 	assert.Assert(t, err)
 
@@ -346,7 +346,7 @@ func TestContainerUpdateMock(t *testing.T) {
 
 func TestContainerUpdateErrorMock(t *testing.T) {
 	image := images.GetRouterImageName()
-	newImage := strings.Replace(image, ":main", ":updated", -1)
+	newImage := strings.Replace(image, ":v2-latest", ":updated", -1)
 	cli := NewCompatClientMock(mockContainers(image))
 	mock := cli.RestClient.(*RestClientMock)
 

diff --git a/pkg/images/images.go b/pkg/images/images.go
@@ -3,10 +3,10 @@ package images
 const (
 	DefaultImageRegistry     string = "quay.io/skupper"
 	RouterImageName          string = "skupper-router:main"
-	ControllerImageName      string = "controller:v2-latest"
-	KubeAdaptorImageName     string = "kube-adaptor:v2-latest"
-	NetworkObserverImageName string = "network-observer:v2-latest"
-	CliImageName             string = "cli:v2-latest"
+	ControllerImageName      string = "controller:v2-dev"
+	KubeAdaptorImageName     string = "kube-adaptor:v2-dev"
+	NetworkObserverImageName string = "network-observer:v2-dev"
+	CliImageName             string = "cli:v2-dev"
 
 	PrometheusImageRegistry   string = "quay.io/prometheus"
 	PrometheusServerImageName string = "prometheus:v2.42.0"

diff --git a/scripts/oci-index-archive-info.sh b/scripts/oci-index-archive-info.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 REGISTRY=${REGISTRY:-quay.io/skupper}
-IMAGE_TAG=${IMAGE_TAG:-"v2-latest"}
+IMAGE_TAG=${IMAGE_TAG:-"v2-dev"}
 ARCHIVES_PATH=${ARCHIVES_PATH:-./oci-archives}
 
 skopeo::digest (){