Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# GOTOOLCHAIN pins the Go toolchain for all build/generate/test targets.
# The tooling module (tools/go.mod) requires Go >= 1.26, while the root module
# keeps its language level at `go 1.24` so the pinned golangci-lint (built with
# go1.24) still accepts go.mod. Forcing one toolchain here — rather than a
# go.mod `toolchain` directive — avoids GOTOOLCHAIN=auto switching mid-build,
# which breaks coverage ("go: no such tool covdata"). go1.26.5 is the first
# release carrying the fixes for CVE-2026-39822 and CVE-2026-42505.
export GOTOOLCHAIN ?= go1.26.5
Comment thread
tirthct marked this conversation as resolved.
Outdated

# VERSION defines the project version for the bundle.
# Update this value when you upgrade the version of your project.
# To re-generate a bundle for another specific version without changing the standard setup, you can:
Expand Down Expand Up @@ -131,7 +140,11 @@ KIND_CLUSTER ?= hyperfleet-operator-test-e2e

.PHONY: test
test: manifests generate fmt vet ## Run tests.
KUBEBUILDER_ASSETS="$(shell $(SETUP_ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out
# Resolve envtest assets in the recipe shell (via $$(...)) rather than make's
# $(shell ...): the latter runs at parse time and does not inherit the
# exported GOTOOLCHAIN, so setup-envtest (a tools/go.mod tool needing Go 1.26)
# would run under the wrong toolchain and yield an empty KUBEBUILDER_ASSETS.
KUBEBUILDER_ASSETS="$$($(SETUP_ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated

.PHONY: setup-test-e2e
setup-test-e2e: ## Set up a Kind cluster for e2e tests if it does not exist
Expand Down
6 changes: 3 additions & 3 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ repo: github.com/openshift-hyperfleet/hyperfleet-operator
resources:
- api:
crdVersion: v1
namespaced: true
namespaced: false
controller: true
domain: redhat.com
group: hyperfleet
kind: HyperFleetConfig
path: github.com/openshift-hyperfleet/hyperfleet-operator/api/v1alpha
version: v1alpha
path: github.com/openshift-hyperfleet/hyperfleet-operator/api/v1alpha1
version: v1alpha1
version: "3"
64 changes: 0 additions & 64 deletions api/v1alpha/hyperfleetconfig_types.go

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

// Package v1alpha contains API Schema definitions for the hyperfleet v1alpha API group.
// Package v1alpha1 contains API Schema definitions for the hyperfleet v1alpha1 API group.
// +kubebuilder:object:generate=true
// +groupName=hyperfleet.redhat.com
package v1alpha
package v1alpha1

import (
"k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -26,7 +26,7 @@ import (

var (
// GroupVersion is group version used to register these objects.
GroupVersion = schema.GroupVersion{Group: "hyperfleet.redhat.com", Version: "v1alpha"}
GroupVersion = schema.GroupVersion{Group: "hyperfleet.redhat.com", Version: "v1alpha1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
Expand Down
Loading
Loading