merge main

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

.chloggen/monolithic_scheduler_rules.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Support scheduling rules (nodeSelector, tolerations and affinity) in TempoMonolithic CR
+
+# One or more tracking issues related to the change
+issues: [782]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.github/workflows/changelog.yaml

@@ -31,14 +31,15 @@ jobs:
       !contains(github.event.pull_request.title, 'Prepare release')
 
     steps:
-      - name: Checkout Repo
+      - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version-file: go.mod
 
       - name: Ensure no changes to the CHANGELOG
         run: |

.github/workflows/continuous-integration.yaml

@@ -15,16 +15,16 @@ jobs:
     name: Unit tests
     runs-on: ubuntu-22.04
     steps:
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.20"
-
-      - name: Check out code into the Go module directory
+      - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
       - name: "basic checks"
         run: make ci
 
@@ -41,7 +41,7 @@ jobs:
     name: Security
     runs-on: ubuntu-22.04
     steps:
-      - name: Check out code into the Go module directory
+      - name: Checkout
         uses: actions/checkout@v4
 
       - name: Initialize CodeQL
@@ -59,15 +59,16 @@ jobs:
     name: Code standards (linting)
     runs-on: ubuntu-22.04
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
+          go-version-file: go.mod
 
       - name: Lint
         uses: golangci/golangci-lint-action@v4
         with:
           args: -v
-          version: v1.52.2
+          version: v1.56.1

.github/workflows/e2e.yaml

@@ -24,16 +24,18 @@ jobs:
        - "1.28"
 
     steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.20"
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v4
+        go-version-file: go.mod
 
-    - name: "install chainsaw"
-      run: ./hack/install/install-chainsaw.sh
+    - name: Install chainsaw
+      run: |
+        set -e
+        make chainsaw
 
     - name: "run tests"
       env:
@@ -49,16 +51,16 @@ jobs:
           - "1.28"
 
     steps:
-    - name: Set up Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: "1.20"
-
-    - name: Check out code into the Go module directory
+    - name: Checkout
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: go.mod
+
     - name: Start kind
       run: kind create cluster --config kind-${{ matrix.kube-version }}.yaml --wait 5m
 
@@ -97,8 +99,8 @@ jobs:
 
     - name: Install chainsaw, OLM and minio
       run: |
-        ./hack/install/install-chainsaw.sh
-        make olm-install
+        set -e
+        make chainsaw olm-install
 
     - name: Build and push operator and bundle image to local container registry
       run: |

.github/workflows/prepare-release.yaml

@@ -10,12 +10,13 @@ jobs:
   prepare-release:
     runs-on: ubuntu-22.04
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
-
-      - uses: actions/checkout@v4
+          go-version-file: go.mod
 
       - name: Update makefile
         run: sed -i.bak "s/OPERATOR_VERSION ?= .*/OPERATOR_VERSION ?= $OPERATOR_VERSION/g" Makefile && rm Makefile.bak

.github/workflows/publish-test-utils-image.yaml

@@ -22,7 +22,8 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Docker meta
         id: meta

.github/workflows/release.yaml

@@ -21,14 +21,15 @@ jobs:
       env:
         BRANCH: ${{ github.event.pull_request.head.ref }}
 
-    - name: Set up Go
-      uses: actions/setup-go@v5
+    - name: Checkout
+      uses: actions/checkout@v4
       with:
-        go-version: "1.20"
+        ref: main
 
-    - uses: actions/checkout@v4
+    - name: Set up Go
+      uses: actions/setup-go@v5
       with:
-        ref: main
+        go-version-file: go.mod
 
     - name: "generate release resources"
       run: make release-artifacts

.github/workflows/reusable-publish-images.yaml

@@ -8,7 +8,8 @@ jobs:
     name: Publish container images
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
       - name: Unshallow
         run: git fetch --prune --unshallow

.github/workflows/scorecard.yaml

@@ -21,16 +21,18 @@ jobs:
           - "1.28"
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.20"
+          go-version-file: go.mod
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
-      - name: "install chainsaw"
-        run: ./hack/install/install-chainsaw.sh
+      - name: Install chainsaw
+        run: |
+          set -e
+          make chainsaw
 
       - name: "start kind"
         env:

Makefile

@@ -141,7 +141,7 @@ build: generate fmt ## Build manager binary.
 
 .PHONY: run
 run: manifests generate ## Run a controller from your host.
-	@echo -e "\033[33mRemoving tempo operator from the cluster. Use the normal deployment method to enable full operator functionality.\033[0m"
+	@echo -e "\033[33mRemoving tempo-operator from the cluster. Webhooks are disabled, use the normal deployment method to enable full operator functionality.\033[0m"
 	-kubectl delete ns $(OPERATOR_NAMESPACE)
 	-kubectl delete mutatingwebhookconfigurations.admissionregistration.k8s.io tempo-operator-mutating-webhook-configuration
 	-kubectl delete validatingwebhookconfigurations.admissionregistration.k8s.io tempo-operator-validating-webhook-configuration
@@ -203,10 +203,11 @@ $(LOCALBIN):
 KUSTOMIZE_VERSION ?= v4.5.5
 CONTROLLER_TOOLS_VERSION ?= v0.9.2
 GEN_CRD_VERSION ?= v0.0.5
-GEN_API_DOCS_VERSION ?= v0.0.4
+GEN_API_DOCS_VERSION ?= v0.4.0
 ENVTEST_VERSION ?= latest
 OPERATOR_SDK_VERSION ?= 1.27.0
 CERTMANAGER_VERSION ?= 1.9.1
+CHAINSAW_VERSION ?= v0.1.4
 
 ## Tool Binaries
 KUSTOMIZE ?= $(LOCALBIN)/kustomize-$(KUSTOMIZE_VERSION)
@@ -318,6 +319,10 @@ lint:
 	golangci-lint run
 
 
+.PHONY: chainsaw
+chainsaw: ## Download chainsaw locally if necessary.
+	test -s $(CHAINSAW) || $(call go-get-tool,$(CHAINSAW),github.com/kyverno/chainsaw,$(CHAINSAW_VERSION))
+
 .PHONY: gen-crd-api-reference-docs
 gen-crd-api-reference-docs: ## Download gen-crd-api-reference-docs locally if necessary.
 	test -s $(GEN_CRD) || $(call go-get-tool,$(GEN_CRD),github.com/ViaQ/gen-crd-api-reference-docs,$(GEN_CRD_VERSION))
@@ -410,10 +415,6 @@ rm -rf $$TMP_DIR ;\
 }
 endef
 
-.PHONY: chainsaw
-chainsaw:
-	./hack/install/install-chainsaw.sh
-
 .PHONY: generate-all
 generate-all: generate bundle api-docs ## Update all generated files
 

apis/tempo/v1alpha1/common_types.go

@@ -10,7 +10,7 @@ type TLSSpec struct {
 	// Enabled defines if TLS is enabled.
 	//
 	// +kubebuilder:validation:Optional
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Enabled",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
+	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Enabled",order=1,xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
 	Enabled bool `json:"enabled"`
 
 	// CA is the name of a ConfigMap containing a CA certificate (service-ca.crt).