Align default tagging (#713)

Makefile

@@ -14,7 +14,7 @@ export GOOS=linux
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= latest
+VERSION ?= main
 BUILD_DATE := $(shell date +%Y-%m-%d\ %H:%M)
 TAG_COMMIT := $(shell git rev-list --abbrev-commit --tags --max-count=1)
 TAG := $(shell git describe --abbrev=0 --tags ${TAG_COMMIT} 2>/dev/null || true)

README.md

@@ -898,10 +898,10 @@ The `suppressGoMetrics` parameter may be set to `true` in order to suppress the
   # compile project
   make build
 
-  # build the default image (quay.io/netobserv/flowlogs-pipeline:latest):
+  # build the default image (quay.io/netobserv/flowlogs-pipeline:main):
   make image-build
 
-  # push the default image (quay.io/netobserv/flowlogs-pipeline:latest):
+  # push the default image (quay.io/netobserv/flowlogs-pipeline:main):
   make image-push
 
   # build and push on your own quay.io account (quay.io/myuser/flowlogs-pipeline:dev):

contrib/docker/Dockerfile

@@ -1,4 +1,3 @@
-# We do not use --platform feature to auto fill this ARG because of incompatibility between podman and docker
 ARG TARGETARCH
 FROM docker.io/library/golang:1.22 as builder
 
@@ -20,7 +19,7 @@ RUN git status --porcelain
 RUN GOARCH=$TARGETARCH make build_code
 
 # final stage
-FROM  --platform=linux/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal:9.4
+FROM --platform=linux/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal:9.4
 
 COPY --from=builder /app/flowlogs-pipeline /app/
 COPY --from=builder /app/confgenerator /app/

contrib/opentelemetry/flp.yml

@@ -68,7 +68,7 @@ spec:
       serviceAccountName: netobserv
       containers:
         - name: packet-counter
-          image: quay.io/netobserv/flowlogs-pipeline:latest
+          image: quay.io/netobserv/flowlogs-pipeline:main
           ports:
             - containerPort: 9999
               hostPort: 9999

docs/confGenerator.md

@@ -33,7 +33,7 @@ Flags:
 ```
 
 > Note: confgenerator is available also from `netobserv/flowlogs-pipeline` quay image. To use execute:  
-> `docker run --entrypoint /app/confgenerator quay.io/netobserv/flowlogs-pipeline:latest --help` 
+> `docker run --entrypoint /app/confgenerator quay.io/netobserv/flowlogs-pipeline:main --help` 
 
 > Note: The default location for network definitions in flowlogs-pipeline is `/network_definitions` folder