operator 0.8.1-rc1 reviews

Author: mangelajo

controller/api/v1alpha1/exporter_types.go

@@ -55,7 +55,7 @@ type Exporter struct {
 	// Exporters represent the services that connect to the physical or virtual
 	// devices. They are responsible for providing the access to the devices and
 	// for the communication with the devices. A jumpstarter exporter service
-	// should be ran on a linux machine, or a pod, with the exporter credentials
+	// should be run on a linux machine, or a pod, with the exporter credentials
 	// and the right configuration for this resource to become online. For
 	// more information see the Jumpstarter documentation:
 	// https://jumpstarter.dev/main/introduction/exporters.html#exporters

controller/deploy/operator/Makefile

@@ -3,7 +3,10 @@
 # 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 ?= 0.7.5
+VERSION ?= 0.8.1-rc1
+
+# OPENSHIFT_VERSIONS defines the Red Hat OpenShift version range injected into bundle metadata.
+OPENSHIFT_VERSIONS ?= v4.18-v4.21
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -307,7 +310,7 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
 	$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
 	@# Inject Red Hat OpenShift version range into bundle metadata (not handled by operator-sdk)
 	@if ! grep -q 'com.redhat.openshift.versions' bundle/metadata/annotations.yaml; then \
-		echo '  com.redhat.openshift.versions: v4.18-v4.21' >> bundle/metadata/annotations.yaml; \
+		echo '  com.redhat.openshift.versions: $(OPENSHIFT_VERSIONS)' >> bundle/metadata/annotations.yaml; \
 	fi
 	$(OPERATOR_SDK) bundle validate ./bundle
 

controller/deploy/operator/config/manifests/bases/jumpstarter-operator.clusterserviceversion.yaml

@@ -50,7 +50,7 @@ metadata:
           },
           "spec": {
             "exporterSelector": {},
-            "clientSelector": {}
+            "policies": [{"from": [{"clientSelector": {}}]}]
           }
         }
       ]
@@ -70,6 +70,7 @@ metadata:
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
+  replaces: jumpstarter-operator.v0.8.0
   customresourcedefinitions:
     owned:
     - description: Client represents a user identity for accessing the Jumpstarter

controller/deploy/operator/config/samples/jumpstarter_v1alpha1_client.yaml

@@ -5,4 +5,4 @@ metadata:
   labels:
     type: developer
 spec:
-  username: "keycloak:user-name-in-keycloak"
+  username: "kc:user-name-in-keycloak"

controller/deploy/operator/contribute/update-contributions.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -euo pipefail
 
 # Target repos: "clone-url local-directory"
 # Add or remove entries here to sync to more/fewer upstreams.
@@ -22,8 +23,43 @@ if [ ! -f "$CSV_PATH" ]; then
 fi
 
 VERSION=$(grep "^  version:" "$CSV_PATH" | awk '{print $2}')
+if [ -z "$VERSION" ]; then
+  echo "Error: failed to extract VERSION from $CSV_PATH" >&2
+  echo "Expected a line matching '^  version:' in $CSV_PATH but got nothing." >&2
+  exit 1
+fi
 echo "Bundle version: ${VERSION}"
 
+REPLACES=$(grep "^  replaces:" "$CSV_PATH" | awk '{print $2}')
+if [ -z "$REPLACES" ]; then
+  echo "Error: 'spec.replaces' is not set in $CSV_PATH" >&2
+  echo "Set 'replaces: jumpstarter-operator.vX.Y.Z' in the CSV base before contributing." >&2
+  exit 1
+fi
+
+REPLACES_VERSION="${REPLACES#jumpstarter-operator.v}"
+if [ "$REPLACES_VERSION" = "$VERSION" ]; then
+  echo "Error: 'spec.replaces' version ($REPLACES_VERSION) is the same as the bundle version ($VERSION)." >&2
+  echo "Update 'replaces' in the CSV base to point to the previous release." >&2
+  exit 1
+fi
+
+echo ""
+echo "============================================"
+echo "  Bundle version : ${VERSION}"
+echo "  Replaces       : ${REPLACES} (v${REPLACES_VERSION})"
+echo "============================================"
+echo ""
+read -r -p "Proceed with contribution? [y/N] " confirm
+if [[ ! "$confirm" =~ ^[Yy]$ ]]; then
+  echo ""
+  echo "Aborted. To update these values, edit:"
+  echo "  - VERSION in: ${OPERATOR_DIR}/Makefile"
+  echo "  - replaces in: ${OPERATOR_DIR}/config/manifests/bases/jumpstarter-operator.clusterserviceversion.yaml"
+  echo "Then re-run 'make bundle' followed by 'make contribute'."
+  exit 1
+fi
+
 # Clone any missing repos and ensure "user" remote points to the GITHUB_USER fork
 for entry in "${COMMUNITY_OPS[@]}"; do
   read -r url dir <<< "$entry"
@@ -40,7 +76,7 @@ for entry in "${COMMUNITY_OPS[@]}"; do
 
   # Add or update the "user" remote for the fork
   (
-    cd "$dir"
+    cd "$dir" || exit 1
     if git remote get-url user &>/dev/null; then
       git remote set-url user "$user_fork"
     else
@@ -55,7 +91,7 @@ BRANCH="jumpstarter-operator-release-${VERSION}"
 for entry in "${COMMUNITY_OPS[@]}"; do
   read -r url dir <<< "$entry"
   echo "--- $dir: switching to branch $BRANCH ---"
-  (cd "$dir" && git fetch --all && git checkout remotes/origin/main -B "$BRANCH")
+  (cd "$dir" || exit 1; git fetch --all && git checkout remotes/origin/main -B "$BRANCH")
 done
 
 # Copy bundle into each repo and commit
@@ -65,7 +101,7 @@ for entry in "${COMMUNITY_OPS[@]}"; do
   echo "Updating ${dir} to version ${VERSION}"
   mkdir -p "$dest"
   cp -v -r -f "${BUNDLE_DIR}"/* "$dest"
-  (cd "$dir" && git add -A && git commit -s -m "operator jumpstarter-operator (${VERSION})")
+  (cd "$dir" || exit 1; git add -A && git commit -s -m "operator jumpstarter-operator (${VERSION})")
 done
 
 echo ""

controller/deploy/operator/internal/controller/jumpstarter/jumpstarter_controller.go

@@ -751,7 +751,7 @@ func (r *JumpstarterReconciler) createControllerDeployment(jumpstarter *operator
 							Args: []string{
 								"--leader-elect",
 								"--health-probe-bind-address=:8081",
-								"--metrics-bind-address=:8080",
+								"-metrics-bind-address=:8080",
 							},
 							Env:          envVars,
 							VolumeMounts: volumeMounts,

controller/internal/service/login/service.go

@@ -21,6 +21,7 @@ import (
 	"embed"
 	"encoding/base64"
 	"html/template"
+	"net"
 	"net/http"
 	"os"
 	"time"
@@ -131,9 +132,16 @@ func (s *Service) Start(ctx context.Context) error {
 	})
 
 	port := getEnvOrDefault("LOGIN_SERVICE_PORT", defaultPort)
-	// Ensure port has the ":" prefix for net.Listen format
-	if port != "" && port[0] != ':' {
-		port = ":" + port
+	// Normalize into a valid net.Listen address.
+	// If it's already a host:port (or [IPv6]:port), keep it as-is.
+	// Otherwise treat it as a bare port and prepend ":".
+	if port != "" {
+		if _, _, err := net.SplitHostPort(port); err != nil {
+			// Not a valid host:port — assume bare port (e.g. "8086")
+			if port[0] != ':' {
+				port = ":" + port
+			}
+		}
 	}
 
 	server := &http.Server{