diff --git a/go.mod b/go.mod index 5fe78420..901bab0e 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index fcd6bf72..c48459f2 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/namespace_slice_helpers.go b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/namespace_slice_helpers.go new file mode 100644 index 00000000..749f70aa --- /dev/null +++ b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/namespace_slice_helpers.go @@ -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)) +} diff --git a/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/openapi_generated.go b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/openapi_generated.go index bd19bd7d..f317527b 100644 --- a/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/openapi_generated.go +++ b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/openapi_generated.go @@ -25749,13 +25749,6 @@ func schema_apimachinery_apis_kubevault_v1alpha2_VaultRelaySpec(ref common.Refer Ref: ref("k8s.io/api/core/v1.LocalObjectReference"), }, }, - "image": { - SchemaProps: spec.SchemaProps{ - Description: "Image is the spoke-relay container image", - Type: []string{"string"}, - Format: "", - }, - }, "tls": { SchemaProps: spec.SchemaProps{ Description: "TLS configuration for gRPC connection", @@ -25905,13 +25898,6 @@ func schema_apimachinery_apis_kubevault_v1alpha2_VaultRelayTemplate(ref common.R Format: "", }, }, - "image": { - SchemaProps: spec.SchemaProps{ - Description: "Image overrides the spoke-relay container image.", - Type: []string{"string"}, - Format: "", - }, - }, "podTemplate": { SchemaProps: spec.SchemaProps{ Description: "PodTemplate is an optional configuration for the spoke-relay pods.", diff --git a/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vault_relay_helpers.go b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vault_relay_helpers.go index b7432f8e..a56e6084 100644 --- a/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vault_relay_helpers.go +++ b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vault_relay_helpers.go @@ -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 { diff --git a/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vault_relay_types.go b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vault_relay_types.go index c7ad8ba8..dbfe7049 100644 --- a/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vault_relay_types.go +++ b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vault_relay_types.go @@ -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"` diff --git a/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vaultserver_types.go b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vaultserver_types.go index c2167a6d..4096f050 100644 --- a/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vaultserver_types.go +++ b/vendor/kubevault.dev/apimachinery/apis/kubevault/v1alpha2/vaultserver_types.go @@ -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"` diff --git a/vendor/kubevault.dev/apimachinery/crds/catalog.kubevault.com_vaultserverversions.yaml b/vendor/kubevault.dev/apimachinery/crds/catalog.kubevault.com_vaultserverversions.yaml index 5ad85d20..3c98faf9 100644 --- a/vendor/kubevault.dev/apimachinery/crds/catalog.kubevault.com_vaultserverversions.yaml +++ b/vendor/kubevault.dev/apimachinery/crds/catalog.kubevault.com_vaultserverversions.yaml @@ -65,6 +65,7 @@ spec: enum: - Vault - OpenBao + - Sigilr type: string exporter: description: Exporter Image diff --git a/vendor/kubevault.dev/apimachinery/crds/kubevault.com_vaultrelays.yaml b/vendor/kubevault.dev/apimachinery/crds/kubevault.com_vaultrelays.yaml index c0812662..4f288371 100644 --- a/vendor/kubevault.dev/apimachinery/crds/kubevault.com_vaultrelays.yaml +++ b/vendor/kubevault.dev/apimachinery/crds/kubevault.com_vaultrelays.yaml @@ -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 diff --git a/vendor/kubevault.dev/apimachinery/crds/kubevault.com_vaultservers.yaml b/vendor/kubevault.dev/apimachinery/crds/kubevault.com_vaultservers.yaml index f2fb2d4f..63a50e9b 100644 --- a/vendor/kubevault.dev/apimachinery/crds/kubevault.com_vaultservers.yaml +++ b/vendor/kubevault.dev/apimachinery/crds/kubevault.com_vaultservers.yaml @@ -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 diff --git a/vendor/modules.txt b/vendor/modules.txt index 65a4b0ee..25cd78f5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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