Align latest k8s modules

DockerfileAPIServer

@@ -2,7 +2,7 @@
 # Licensed under the Apache License 2.0
 # SPDX-License-Identifier: Apache-2.0
 #
-FROM golang:1.24 AS builder
+FROM golang:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 

DockerfileController

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Build the manager binary
-FROM golang:1.24 AS builder
+FROM golang:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 

Makefile

@@ -63,17 +63,27 @@ genclients:
 		-g openapi-gen \
 		-g defaulter-gen \
 		-g conversion-gen \
-		--module $(REPO) \
+		-g applyconfiguration-gen \
+		--module $(REPO)
+	$(MAKE) fix-openapi-gvk
 
 .PHONY: genproto
 genproto:
 	go run ./tools/apiserver-runtime-gen \
 		-g go-to-protobuf \
 		--module $(REPO) \
 
+.PHONY: fix-openapi-gvk
+fix-openapi-gvk:
+	go run ./tools/fix-openapi-gvk/main.go \
+  --file pkg/generated/openapi/zz_generated.openapi.go \
+	--group config.sdcio.dev \
+	--prefix config_server_apis_config_v1alpha1
+
 .PHONY: generate
 generate: controller-gen 
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./apis/inv/..."
+	$(MAKE) genclients
 
 .PHONY: manifests
 manifests: controller-gen crds artifacts ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
@@ -102,7 +112,7 @@ tidy:
 	go mod tidy
 
 .PHONY: lint
-lint:
+lint: golangci-lint
 	$(GOLANGCILINT) run ./...
 
 .PHONY: test
@@ -133,7 +143,7 @@ $(KFORM): $(LOCALBIN)
 	test -s $(LOCALBIN)/kform || GOBIN=$(LOCALBIN) go install github.com/kform-dev/kform/cmd/kform@$(KFORM_VERSION)
 
 .PHONY: golangci-lint
-golangci-lint: $(GOLANGCILINT) ## Download kform locally if necessary.
+golangci-lint: $(GOLANGCILINT) ## Download golangci locally if necessary.
 $(GOLANGCILINT): $(LOCALBIN)
 	test -s $(LOCALBIN)/golangci-lint || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCILINT_VERSION)
 

PROTO.md

@@ -1,3 +1,8 @@
 protoc -I . -I ./vendor --gogo_opt=paths=source_relative --gogo_out=. apis/condition/v1alpha1/generated.proto
 
-protoc -I . -I ./vendor -I ./apis/condition/v1alpha1 --gogo_opt=paths=source_relative --gogo_out=. apis/config/v1alpha1/generated.proto
+protoc -I . -I ./vendor -I ./apis/condition/v1alpha1 --gogo_opt=paths=source_relative --gogo_out=. apis/config/v1alpha1/generated.proto
+
+
+go run ./tools/apiserver-runtime-gen \
+    -g applyconfiguration-gen \
+    --module github.com/sdcio/config-server

apis/condition/condition.go

@@ -84,6 +84,11 @@ func NewConditionedStatus(c ...Condition) *ConditionedStatus {
 	return r
 }
 
+// HasCondition returns if the condition is set
+func (r *ConditionedStatus) GetConditions() []Condition {
+	return r.Conditions
+}
+
 // HasCondition returns if the condition is set
 func (r *ConditionedStatus) HasCondition(t ConditionType) bool {
 	for _, c := range r.Conditions {

apis/condition/doc.go

@@ -17,4 +17,4 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 
 // condition defines the condition api
-package condition 
+package condition

apis/config/condition.go

@@ -27,20 +27,15 @@ const (
 )
 
 const (
+	// Target relation conditions
 	// ConditionTypeDiscoveryReady represents the resource discovery ready condition
-	ConditionTypeDiscoveryReady cond.ConditionType = "DiscoveryReady"
+	ConditionTypeTargetDiscoveryReady cond.ConditionType = "TargetDiscoveryReady"
 	// ConditionTypeDatastoreReady represents the resource datastore ready condition
-	ConditionTypeDatastoreReady cond.ConditionType = "DatastoreReady"
+	ConditionTypeTargetDatastoreReady cond.ConditionType = "TargetDatastoreReady"
 	// ConditionTypeConfigRecoveryReady represents the resource config recovery ready condition
-	ConditionTypeConfigRecoveryReady cond.ConditionType = "ConfigRecoveryReady"
+	ConditionTypeTargetConfigRecoveryReady cond.ConditionType = "TargetConfigRecoveryReady"
 	// ConditionTypeTargetConnectionReady represents the resource target ready condition
 	ConditionTypeTargetConnectionReady cond.ConditionType = "TargetConnectionReady"
-
-	ConditionTypeConfigApply   cond.ConditionType = "ConfigApply"
-	ConditionTypeConfigConfirm cond.ConditionType = "ConfigConfirm"
-	ConditionTypeConfigCancel  cond.ConditionType = "ConfigCancel"
-
-	ConditionTypeSchemaServerReady cond.ConditionType = "SchemaServerReady"
 )
 
 // A ConditionReason represents the reason a resource is in a condition.

apis/config/config_resource.go

@@ -262,26 +262,17 @@ type ConfigFilter struct {
 }
 
 func (r *ConfigFilter) Filter(ctx context.Context, obj runtime.Object) bool {
-	f := false // result of the previous filter
 	o, ok := obj.(*Config)
 	if !ok {
-		return f
+		return true
 	}
-	if r.Name != "" {
-		if o.GetName() == r.Name {
-			f = false
-		} else {
-			f = true
-		}
+	if r.Name != "" && o.GetName() != r.Name {
+		return true
 	}
-	if r.Namespace != "" {
-		if o.GetNamespace() == r.Namespace {
-			f = false
-		} else {
-			f = true
-		}
+	if r.Namespace != "" && o.GetNamespace() != r.Namespace {
+		return true
 	}
-	return f
+	return false
 }
 
 func (r *Config) PrepareForCreate(ctx context.Context, obj runtime.Object) {

apis/config/config_types.go

@@ -19,9 +19,9 @@ package config
 import (
 	"reflect"
 
+	"github.com/sdcio/config-server/apis/condition"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"github.com/sdcio/config-server/apis/condition"
 )
 
 // ConfigSpec defines the desired state of Config
@@ -67,14 +67,13 @@ type ConfigStatusLastKnownGoodSchema struct {
 	Version string `json:"version,omitempty" protobuf:"bytes,3,opt,name=version"`
 }
 
-// +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:object:root=true
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:categories={sdc}
 
-//	Config defines the Schema for the Config API
+// Config defines the Schema for the Config API
 type Config struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

apis/config/configblame_helpers.go

@@ -23,7 +23,7 @@ func BuildConfigBlame(meta metav1.ObjectMeta, spec ConfigBlameSpec, status Confi
 	return &ConfigBlame{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: SchemeGroupVersion.Identifier(),
-			Kind: ConfigBlameKind,
+			Kind:       ConfigBlameKind,
 		},
 		ObjectMeta: meta,
 		Spec:       spec,
@@ -38,4 +38,4 @@ func BuildEmptyConfigBlame() *ConfigBlame {
 			Kind:       ConfigBlameKind,
 		},
 	}
-}
+}