Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
k8s.io/kubectl v0.30.2
kmodules.xyz/client-go v0.34.3
kmodules.xyz/custom-resources v0.34.0
kubevault.dev/apimachinery v0.25.0-rc.2
kubevault.dev/apimachinery v0.25.0
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/secrets-store-csi-driver v1.5.1
sigs.k8s.io/yaml v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -793,8 +793,8 @@ kmodules.xyz/monitoring-agent-api v0.34.0 h1:SNgKvC1j8oYWQcdClyV2T5GsOQoG40c3pK9
kmodules.xyz/monitoring-agent-api v0.34.0/go.mod h1:XFDfMHDZQeNEPdTDeDr4M0dT4UCWs+4IYzgHw7JDlms=
kmodules.xyz/offshoot-api v0.34.0 h1:HnOOp8FrCjTWjtNApRDo6Ahe79tOlLrJmyye4xxO4Kk=
kmodules.xyz/offshoot-api v0.34.0/go.mod h1:F+B59yYw4CZJ4uD4xu6C+mMLzIXUtuH7E+SbDICl9jE=
kubevault.dev/apimachinery v0.25.0-rc.2 h1:jAYSPFI6aMaYzRFQJke69P5eFS0GspO/CUZWVoNnxRM=
kubevault.dev/apimachinery v0.25.0-rc.2/go.mod h1:HFAtCQvDnTfDV0zsk/Q6NclQH5jE9dhfIpGKJ/Q/7oQ=
kubevault.dev/apimachinery v0.25.0 h1:Av3MnOKtBTzfNhz8L+Pc5DnRPiPEHytpdHTEP91aUmM=
kubevault.dev/apimachinery v0.25.0/go.mod h1:V3GSCph8tFtjEWlJmHL/pKn2A6iH8PDTtKkHD6TbqtU=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Copyright AppsCode Inc. and Contributors

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package v1alpha2

import (
"kubevault.dev/apimachinery/crds"

"kmodules.xyz/client-go/apiextensions"
)

func (ns NamespaceSlice) CustomResourceDefinition() *apiextensions.CustomResourceDefinition {
return crds.MustCustomResourceDefinition(SchemeGroupVersion.WithResource(ResourceNamespaceSlices))
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,6 @@ func (vr VaultRelay) GetGRPCPort() int32 {
return vr.Spec.HubVaultRef.GRPCPort
}

// GetImage returns the spoke-relay image with default value
func (vr VaultRelay) GetImage() string {
if vr.Spec.Image == "" {
return "ghcr.io/kubevault/spoke-relay:latest"
}
return vr.Spec.Image
}

// SetDefaults sets default values for VaultRelay
func (vr *VaultRelay) SetDefaults() {
if vr.Spec.HubVaultRef.GRPCPort == 0 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,6 @@ type VaultRelaySpec struct {
// +optional
TokenSecretRef *core.LocalObjectReference `json:"tokenSecretRef,omitempty"`

// Image is the spoke-relay container image
// +optional
Image string `json:"image,omitempty"`

// TLS configuration for gRPC connection
// +optional
TLS *VaultRelayTLSConfig `json:"tls,omitempty"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,6 @@ type VaultRelayTemplate struct {
// +optional
Namespace string `json:"namespace,omitempty"`

// Image overrides the spoke-relay container image.
// +optional
Image string `json:"image,omitempty"`

// PodTemplate is an optional configuration for the spoke-relay pods.
// +optional
PodTemplate ofst.PodTemplateSpec `json:"podTemplate,omitempty"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ spec:
enum:
- Vault
- OpenBao
- Sigilr
type: string
exporter:
description: Exporter Image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ spec:
- name
- namespace
type: object
image:
description: Image is the spoke-relay container image
type: string
isolateTenants:
description: |-
IsolateTenants opts this spoke into per-tenant OpenBao namespace isolation against
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21252,9 +21252,6 @@ spec:
BootstrapTokenTTL controls the TTL of hub bootstrap tokens minted per spoke
(and therefore their rotation period). Default 24h, minimum 1h.
type: string
image:
description: Image overrides the spoke-relay container image.
type: string
namespace:
description: |-
Namespace on the managed cluster where the VaultRelay and its companion
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1439,7 +1439,7 @@ kmodules.xyz/monitoring-agent-api/api/v1
# kmodules.xyz/offshoot-api v0.34.0
## explicit; go 1.24.0
kmodules.xyz/offshoot-api/api/v1
# kubevault.dev/apimachinery v0.25.0-rc.2
# kubevault.dev/apimachinery v0.25.0
## explicit; go 1.25.0
kubevault.dev/apimachinery/apis
kubevault.dev/apimachinery/apis/engine
Expand Down
Loading