Add make bin command

.dockerignore

@@ -1,4 +1,5 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
 # Ignore build and test binaries.
 bin/
+!bin/manager
 testbin/

.github/dependabot.yml

@@ -0,0 +1,15 @@
+version: 2
+updates:
+- package-ecosystem: "gomod"
+  directory: "/"
+  open-pull-requests-limit: 10
+  schedule:
+    interval: "weekly"
+  groups:
+    k8s.io:
+      patterns:
+        - "k8s.io/*"
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "weekly"

.github/workflows/ci.yaml

@@ -27,7 +27,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: perses/github-actions@v0.7.1
+      - uses: perses/github-actions@v0.9.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
           enable_go: true

.github/workflows/go.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: perses/github-actions@v0.7.1
+      - uses: perses/github-actions@v0.9.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
           enable_go: true
@@ -34,7 +34,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: perses/github-actions@v0.7.1
+      - uses: perses/github-actions@v0.9.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
           enable_go: true
@@ -46,7 +46,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: perses/github-actions@v0.7.1
+      - uses: perses/github-actions@v0.9.0
       - uses: ./.github/perses-ci/actions/setup_environment
         with:
           enable_go: true
@@ -55,7 +55,7 @@ jobs:
       - name: generate files
         run: make generate
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6.1.0
+        uses: golangci/golangci-lint-action@v6.5.0
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: v1.61.0

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# Perses Community Code of Conduct
+
+Perses follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md).

Dockerfile

@@ -5,11 +5,11 @@ FROM gcr.io/distroless/static-debian12
 
 LABEL maintainer="The Perses Authors <perses-team@googlegroups.com>"
 
-USER nobody
+USER 65532:65532
 
-COPY --chown=nobody:nobody operator                      /bin/operator
-COPY --chown=nobody:nobody LICENSE                       /LICENSE
-COPY --from=build-env --chown=nobody:nobody              /etc/mime.types /etc/mime.types
+COPY --chown=65532:65532 bin/manager                   /bin/manager
+COPY --chown=65532:65532 LICENSE                       /LICENSE
+COPY --from=build-env --chown=65532:65532              /etc/mime.types /etc/mime.types
 
 EXPOSE     8080
-ENTRYPOINT [ "/bin/operator" ]
+ENTRYPOINT [ "/bin/manager" ]

Dockerfile.dev

@@ -0,0 +1,21 @@
+FROM golang:1.23-alpine AS build-env
+
+RUN apk add --update --no-cache make bash mailcap
+
+WORKDIR /app
+COPY . .
+
+RUN make build
+
+FROM gcr.io/distroless/static-debian12
+
+LABEL maintainer="The Perses Authors <perses-team@googlegroups.com>"
+
+USER 65532:65532
+
+COPY --from=build-env --chown=65532:65532 /app/bin/manager  /bin/manager
+COPY --chown=65532:65532 LICENSE                            /LICENSE
+COPY --from=build-env --chown=65532:65532                   /etc/mime.types /etc/mime.types
+
+EXPOSE     8080
+ENTRYPOINT [ "/bin/manager" ]

Makefile

@@ -3,14 +3,35 @@
 # 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.1.0
+VERSION ?= 0.1.1
 
 # DATE defines the building date. It is used mainly for goreleaser when generating the GitHub release.
 DATE := $(shell date +%Y-%m-%d)
 export DATE
 
+
+.PHONY: check-container-runtime
+check-container-runtime:
+	@if podman ps >/dev/null 2>&1; then \
+		echo ""; \
+		echo "============================================"; \
+		echo " ✅ Using Podman the container runtime"; \
+		echo "============================================"; \
+	elif docker ps >/dev/null 2>&1; then \
+		echo ""; \
+		echo "============================================"; \
+		echo " ✅ Using Docker the container runtime"; \
+		echo "============================================"; \
+	else \
+		echo ""; \
+		echo "============================================"; \
+		echo " ❌ Neither Podman nor Docker daemon is running"; \
+		echo "============================================"; \
+		exit 1; \
+	fi
+
 # CONTAINER_RUNTIME defines the container runtime to use for building the bundle image.
-CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
+CONTAINER_RUNTIME := $(shell if podman ps >/dev/null 2>&1; then echo podman; elif docker ps >/dev/null 2>&1; then echo docker; fi)
 
 # 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")
@@ -150,8 +171,12 @@ run: manifests generate fmt vet ## Run a controller from your host.
 # (i.e. docker build --platform linux/arm64 ). However, you must enable docker buildKit for it.
 # More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 .PHONY: image-build
-image-build: test ## Build docker image with the manager.
-	${CONTAINER_RUNTIME} build -t ${IMG} .
+image-build: check-container-runtime build test ## Build docker image with the manager.
+	${CONTAINER_RUNTIME} build -f Dockerfile -t ${IMG} .
+
+.PHONY: test-image-build
+test-image-build: check-container-runtime test ## Build a testing docker image with the manager.
+	${CONTAINER_RUNTIME} build -f Dockerfile.dev -t ${IMG} .
 
 .PHONY: image-push
 image-push: ## Push docker image with the manager.
@@ -174,7 +199,11 @@ docker-buildx: test ## Build and push docker image for the manager for cross-pla
 	- docker buildx rm project-v3-builder
 	rm Dockerfile.cross
 
-##@ Deployment
+.PHONY: podman-cross-build
+podman-cross-build: test
+	podman manifest create ${IMG}
+	podman build --platform $(PLATFORMS) --manifest ${IMG} -f Dockerfile.dev
+	podman manifest push ${IMG}
 
 ifndef ignore-not-found
   ignore-not-found = false
@@ -300,7 +329,7 @@ endif
 # This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see:
 # https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
 .PHONY: catalog-build
-catalog-build: opm ## Build a catalog image.
+catalog-build: check-container-runtime opm ## Build a catalog image.
 	$(OPM) index add --container-tool $(CONTAINER_RUNTIME) --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT)
 
 # Push the catalog image.
@@ -326,11 +355,15 @@ endef
 generate-goreleaser:
 	go run ./scripts/generate-goreleaser/generate-goreleaser.go
 
-## Cross build binaries for all platforms (Use "make build" in development)
+## Cross build binaries for all platforms (Use "make image-build" in development)
 .PHONY: cross-build
 cross-build: generate-goreleaser manifests generate fmt vet ## Cross build binaries for all platforms (Use "make build" in development)
 	goreleaser release --snapshot --clean
 
 .PHONY: cross-release
 cross-release: generate-goreleaser manifests generate fmt vet
 	goreleaser release --clean
+
+.PHONY: bin
+bin: 
+	go build -mod=readonly -o bin/manager main.go

README.md

@@ -4,8 +4,10 @@ An operator to install [Perses](https://github.com/perses/perses) in a k8s clust
 
 ## Getting Started
 
-You’ll need a Kubernetes cluster to run against. You can use [KIND](https://sigs.k8s.io/kind) to get a local cluster for testing, or run against a remote cluster.
+You’ll need: 
+- a Kubernetes cluster to run against. You can use [KIND](https://sigs.k8s.io/kind) to get a local cluster for testing, or run against a remote cluster.
 **Note:** Your controller will automatically use the current context in your kubeconfig file (i.e. whatever cluster `kubectl cluster-info` shows).
+- [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl) installed and configured to use your cluster.
 
 ### Running on the cluster
 
@@ -14,22 +16,30 @@ You’ll need a Kubernetes cluster to run against. You can use [KIND](https://si
 make install
 ```
 
-2. Install custom resources:
+2. Create a namespace for the resources:
+```sh
+kubectl create namespace perses-dev
+```
+
+3. Install custom resources:
 
 ```sh
 kubectl apply -k config/samples
 ```
 
-3. Build and push your image to the location specified by `IMG`:
+4. Using the the location specified by `IMG`, build a testing image and push it to the registry, then deploy the controller to the cluster:
+> **Note:** Make sure the image is accessible either publicly or from the cluster internal registry.
 
 ```sh
-make docker-build docker-push IMG=<some-registry>/perses-operator:tag
+IMG=<some-registry>/perses-operator:tag make test-image-build image-push deploy
 ```
 
-4. Deploy the controller to the cluster with the image specified by `IMG`:
+> **Note:** If you already have an image built, you can deploy it to the cluster using `IMG=<some-registry>/perses-operator:tag make deploy`.
+
+5. Port forward the service so you can access the Perses UI at `http://localhost:8080`:
 
 ```sh
-make deploy IMG=<some-registry>/perses-operator:tag
+kubectl -n perses-dev port-forward svc/perses-sample 8080:8080
 ```
 
 ### Uninstall CRDs
@@ -100,7 +110,7 @@ More information can be found via the [Kubebuilder Documentation](https://book.k
 
 ## License
 
-Copyright 2023 The Perses Authors.
+Copyright 2025 The Perses Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

api/v1alpha1/perses_types.go

@@ -17,15 +17,34 @@ limitations under the License.
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 // PersesSpec defines the desired state of Perses
 type PersesSpec struct {
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	Metadata *Metadata `json:"metadata,omitempty"`
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	Config PersesConfig `json:"config,omitempty"`
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	ContainerPort int32 `json:"containerPort,omitempty"`
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	Replicas *int32 `json:"replicas,omitempty"`
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	NodeSelector map[string]string `json:"nodeSelector,omitempty"`
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	Affinity *corev1.Affinity `json:"affinity,omitempty"`
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	Image *string `json:"image,omitempty"`
+}
+
+// Metadata to add to deployed pods
+type Metadata struct {
+	Labels      map[string]string `json:"labels,omitempty"`
+	Annotations map[string]string `json:"annotations,omitempty"`
 }
 
 // PersesStatus defines the observed state of Perses