Skip to content

Fix missed garage crd version #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 1 commit into from
May 7, 2026
Merged

Fix missed garage crd version #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions apis/garage/gvk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package garage

import "k8s.io/apimachinery/pkg/runtime/schema"

const (
Group = "garage.rajsingh.info"
Version = "v1beta1"
)

var (
GroupVersion = schema.GroupVersion{Group: Group, Version: Version}

GarageBucketGVK = GroupVersion.WithKind("GarageBucket")
GarageKeyGVK = GroupVersion.WithKind("GarageKey")
GarageClusterGVK = GroupVersion.WithKind("GarageCluster")
)
5 changes: 3 additions & 2 deletions pkg/comp-functions/functions/vshngarage/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"

xfnproto "github.com/crossplane/function-sdk-go/proto/v1"
"github.com/vshn/appcat/v4/apis/garage"
"github.com/vshn/appcat/v4/apis/helm/release/v1beta1"
vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
"github.com/vshn/appcat/v4/pkg/common/utils"
Expand Down Expand Up @@ -73,8 +74,8 @@ func DeployGarage(ctx context.Context, comp *vshnv1.VSHNGarage, svc *runtime.Ser
connectionDetails := []v1beta1.ConnectionDetail{
{
ObjectReference: corev1.ObjectReference{
APIVersion: "garage.rajsingh.info/v1beta1",
Kind: "GarageCluster",
APIVersion: garage.GroupVersion.String(),
Kind: garage.GarageClusterGVK.Kind,
Name: "garage",
Namespace: comp.GetInstanceNamespace(),
FieldPath: "status.endpoints.s3",
Expand Down
8 changes: 2 additions & 6 deletions pkg/controller/garagebucket/cleanup_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/go-logr/logr"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/vshn/appcat/v4/apis/garage"
vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -27,11 +27,7 @@ import (

const adminCredentialsSecret = "admin-s3-credentials"

var garageBucketGVK = schema.GroupVersionKind{
Group: "garage.rajsingh.info",
Version: "v1alpha1",
Kind: "GarageBucket",
}
var garageBucketGVK = garage.GarageBucketGVK

// CleanupReconciler watches GarageBucket resources and empties the underlying
// S3 bucket when deletion is requested, using dedicated admin credentials.
Expand Down
17 changes: 5 additions & 12 deletions pkg/sliexporter/vshngarage_controller/vshngarage_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
"github.com/vshn/appcat/v4/apis/garage"
vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
"github.com/vshn/appcat/v4/pkg/common/utils"
"github.com/vshn/appcat/v4/pkg/sliexporter/probes"
Expand All @@ -17,7 +18,6 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"

ctrl "sigs.k8s.io/controller-runtime"
Expand All @@ -30,17 +30,10 @@ const (
adminTokenSecret = "garage-admin-token"
)

var garageBucketGVK = schema.GroupVersionKind{
Group: "garage.rajsingh.info",
Version: "v1beta1",
Kind: "GarageBucket",
}

var garageKeyGVK = schema.GroupVersionKind{
Group: "garage.rajsingh.info",
Version: "v1beta1",
Kind: "GarageKey",
}
var (
garageBucketGVK = garage.GarageBucketGVK
garageKeyGVK = garage.GarageKeyGVK
)

type VSHNGarageReconciler struct {
client.Client
Expand Down
Loading