Address low-complexity issues

.github/workflows/ci.yaml

@@ -3,6 +3,7 @@ name: CI
 on:
   push:
     branches: [main]
+    tags: ["v*"]
   pull_request:
     branches: [main]
 
@@ -38,6 +39,11 @@ jobs:
   e2e:
     runs-on: ubuntu-latest
     timeout-minutes: 30
+    permissions:
+      contents: read
+      packages: write
+    env:
+      IMAGE: ghcr.io/${{ github.repository }}
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -81,3 +87,18 @@ jobs:
 
       - name: Run e2e tests
         run: make buildimg deploy-bink e2e V=1
+
+      - name: Push to GHCR
+        if: github.event_name == 'push'
+        run: |
+          podman login -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} ghcr.io
+          podman push bootc-operator:dev ${{ env.IMAGE }}:dev
+          podman push bootc-operator:dev ${{ env.IMAGE }}:${{ github.sha }}
+
+          if [[ "${{ github.ref }}" == refs/tags/v* ]]; then
+            podman push bootc-operator:dev ${{ env.IMAGE }}:${{ github.ref_name }}
+          fi
+
+          if [[ "${{ github.ref }}" == refs/heads/main ]]; then
+            podman push bootc-operator:dev ${{ env.IMAGE }}:latest
+          fi

Containerfile

@@ -15,7 +15,6 @@ RUN --mount=type=cache,id=gomod,target=/root/go/pkg/mod \
     go build -o daemon ./cmd/daemon/
 
 FROM quay.io/fedora/fedora-minimal:44
-WORKDIR /
-COPY --from=builder /workspace/manager /workspace/daemon .
+COPY --from=builder /workspace/manager /workspace/daemon /usr/local/bin/
 USER 65532:65532
-ENTRYPOINT ["/manager"]
+ENTRYPOINT ["manager"]

config/daemon/daemon.yaml

@@ -24,8 +24,8 @@ spec:
       containers:
       - name: daemon
         command:
-        - /daemon
-        image: controller:latest
+        - daemon
+        image: ghcr.io/jlebon/bootc-operator:latest
         env:
         - name: NODE_NAME
           valueFrom:

config/manager/manager.yaml

@@ -66,11 +66,11 @@ spec:
           type: RuntimeDefault
       containers:
       - command:
-        - /manager
+        - manager
         args:
           - --leader-elect
           - --health-probe-bind-address=:8081
-        image: controller:latest
+        image: ghcr.io/jlebon/bootc-operator:latest
         name: manager
         ports:
         - containerPort: 8081

config/samples/bootc_v1alpha1_bootcnodepool.yaml

@@ -1,9 +1,21 @@
+# This sample pool targets all worker nodes. All optional fields are shown
+# commented out with default or example values.
 apiVersion: node.bootc.dev/v1alpha1
 kind: BootcNodePool
 metadata:
-  labels:
-    app.kubernetes.io/name: bootc-operator
-    app.kubernetes.io/managed-by: kustomize
-  name: bootcnodepool-sample
+  name: workers
 spec:
-  # TODO(user): Add fields here
+  nodeSelector:
+    matchLabels:
+      node-role.kubernetes.io/worker: ""
+  image:
+    ref: ghcr.io/alicefr/bink/node:latest
+  # rollout:
+  #   maxUnavailable: 1                    # default
+  #   paused: false                        # default
+  #   drainTimeoutSeconds: 300             # example; default: no timeout
+  # disruption:
+  #   rebootPolicy: AllowSoftReboot        # example; default: RebootOnly
+  # pullSecretRef:                         # example; default: none
+  #   name: my-pull-secret
+  #   namespace: bootc-operator

config/samples/kustomization.yaml

@@ -1,5 +1,2 @@
-## Append samples of your project ##
 resources:
 - bootc_v1alpha1_bootcnodepool.yaml
-- bootc_v1alpha1_bootcnode.yaml
-# +kubebuilder:scaffold:manifestskustomizesamples

test/e2e/e2eutil/env.go

@@ -111,8 +111,8 @@ func WithLabel(key, value string) NodeOption {
 }
 
 // AddNode provisions a worker node via bink, waits for it to be Ready,
-// labels it with LabelE2ETest, and registers cleanup to remove it.
-// Returns the node name.
+// and returns the node name. The node is labeled with LabelE2ETest
+// (and any extra labels from WithLabel).
 func (e *Env) AddNode(t *testing.T, opts ...NodeOption) string {
 	t.Helper()
 
@@ -123,8 +123,12 @@ func (e *Env) AddNode(t *testing.T, opts ...NodeOption) string {
 
 	nodeName := e.generateNodeName(t)
 
-	// Provision the node.
+	// Provision the node with labels applied at join time.
 	args := []string{"node", "add", nodeName, "--cluster-name", e.clusterName, "--control-plane", "controller"}
+	args = append(args, "--label", LabelE2ETest+"="+e.testID)
+	for k, v := range cfg.labels {
+		args = append(args, "--label", k+"="+v)
+	}
 	if cfg.memory > 0 {
 		args = append(args, "--memory", fmt.Sprintf("%d", cfg.memory))
 	}
@@ -141,24 +145,6 @@ func (e *Env) AddNode(t *testing.T, opts ...NodeOption) string {
 	// Wait for Ready.
 	waitForNodeReady(t, e.Client, nodeName)
 
-	// Label with test ID (replace with --label` once available:
-	// https://github.com/alicefr/bink/issues/23).
-	var node corev1.Node
-	if err := e.Client.Get(context.Background(), client.ObjectKey{Name: nodeName}, &node); err != nil {
-		t.Fatalf("getting node %q for labeling: %v", nodeName, err)
-	}
-	patch := client.StrategicMergeFrom(node.DeepCopy())
-	if node.Labels == nil {
-		node.Labels = map[string]string{}
-	}
-	node.Labels[LabelE2ETest] = e.testID
-	for k, v := range cfg.labels {
-		node.Labels[k] = v
-	}
-	if err := e.Client.Patch(context.Background(), &node, patch); err != nil {
-		t.Fatalf("labeling node %q: %v", nodeName, err)
-	}
-
 	return nodeName
 }