From aa5cfaa17f4ecbd668342d325a9d90f8fc6fed66 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Sat, 3 Jan 2026 22:22:57 +0600 Subject: [PATCH] Update deps Signed-off-by: Tamal Saha --- ...y.catalog.appscode.com_gatewayconfigs.yaml | 54 +++++++++++++++-- go.mod | 4 +- go.sum | 8 +-- vendor/modules.txt | 6 +- .../v1alpha1/gateway_converter_types.go | 3 + .../v1alpha1/voyager_gateway_types.go | 26 ++++++++- .../apis/installer/v1alpha1/voyager_types.go | 3 + .../v1alpha1/zz_generated.deepcopy.go | 58 +++++++++++++++++++ 8 files changed, 147 insertions(+), 15 deletions(-) diff --git a/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml b/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml index f2de9602..637f1015 100644 --- a/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml +++ b/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml @@ -1519,6 +1519,17 @@ spec: additionalProperties: type: string type: object + pod: + properties: + annotations: + additionalProperties: + type: string + type: object + labels: + additionalProperties: + type: string + type: object + type: object resources: description: ResourceRequirements describes the compute resource requirements. @@ -1826,9 +1837,6 @@ spec: additionalProperties: type: string type: object - required: - - annotations - - labels type: object required: - job @@ -1861,6 +1869,13 @@ spec: type: object provider: properties: + kubernetes: + properties: + cleanupOffshootResources: + type: boolean + required: + - cleanupOffshootResources + type: object type: type: string required: @@ -1876,6 +1891,10 @@ spec: type: boolean deployment: properties: + annotations: + additionalProperties: + type: string + type: object envoyGateway: properties: image: @@ -4296,6 +4315,20 @@ spec: type: object criticalAddon: type: boolean + distro: + properties: + openshift: + type: boolean + ubi: + enum: + - all + - catalog + - operator + type: string + required: + - openshift + - ubi + type: object enabled: type: boolean fullnameOverride: @@ -4903,6 +4936,20 @@ spec: type: object global: properties: + distro: + properties: + openshift: + type: boolean + ubi: + enum: + - all + - catalog + - operator + type: string + required: + - openshift + - ubi + type: object imagePullSecrets: items: type: string @@ -5642,7 +5689,6 @@ spec: enabled: type: boolean required: - - annotations - enabled type: object required: diff --git a/go.mod b/go.mod index a91c78b9..75a39a5f 100644 --- a/go.mod +++ b/go.mod @@ -11,13 +11,13 @@ require ( kmodules.xyz/client-go v0.34.2 kmodules.xyz/offshoot-api v0.34.0 kmodules.xyz/resource-metadata v0.40.2 - kubeops.dev/external-dns-operator v0.2.1-0.20251228040338-45d730f27b11 + kubeops.dev/external-dns-operator v0.3.0 kubevault.dev/apimachinery v0.22.0 sigs.k8s.io/controller-runtime v0.22.4 sigs.k8s.io/gateway-api v1.4.0 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/yaml v1.6.0 - voyagermesh.dev/installer v0.0.0-20250831101200-3368908a554f + voyagermesh.dev/installer v0.0.0-20251230080904-cdc0a2148b57 ) require ( diff --git a/go.sum b/go.sum index 91722c12..e0afd5e4 100644 --- a/go.sum +++ b/go.sum @@ -300,8 +300,8 @@ kmodules.xyz/resource-metadata v0.40.2 h1:2J+UvAaHXfqDStO2SKqeVkER4z/kSOqpj8Iyrc kmodules.xyz/resource-metadata v0.40.2/go.mod h1:38+41aUSrWqrQDeaSITKoxAiGT0ysQk5yjRODqBadpw= kmodules.xyz/schema-checker v0.4.2 h1:tAbxEtM759GxDM/3sQi/+OKKwUsEF+Ih4KReV3Eb/Xw= kmodules.xyz/schema-checker v0.4.2/go.mod h1:N7ETPwfY4LbTHbydC9jjssPmYKKgZ8DC0IuLCU55wwc= -kubeops.dev/external-dns-operator v0.2.1-0.20251228040338-45d730f27b11 h1:21JnTETaspCtQa/tDXOaQ4AjpTglmxTctSrHDGsUKh0= -kubeops.dev/external-dns-operator v0.2.1-0.20251228040338-45d730f27b11/go.mod h1:lbb7HiWX3O+pXlrC59lD5EtnDTx+3Agw6ADEF2vkeNk= +kubeops.dev/external-dns-operator v0.3.0 h1:KIWX0C+5en8levhkdlM9htZ+EsowIWm9mgLTdsJYUzo= +kubeops.dev/external-dns-operator v0.3.0/go.mod h1:hJgsshVGN68A4eXPjGYCuKaWLgYbaYFCD9E+vydYJoE= kubevault.dev/apimachinery v0.22.0 h1:6ysCHgKe0Sw2z35UkpiA8xfWwsGMmzpLEw6RDp5HF/k= kubevault.dev/apimachinery v0.22.0/go.mod h1:QArlKB79Ho4PauRS2ioX4FEVjF79EbwAaomXhkLC/Hk= sigs.k8s.io/controller-runtime v0.22.4 h1:GEjV7KV3TY8e+tJ2LCTxUTanW4z/FmNB7l327UfMq9A= @@ -316,7 +316,7 @@ sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/ sigs.k8s.io/structured-merge-diff/v6 v6.3.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE= sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= -voyagermesh.dev/installer v0.0.0-20250831101200-3368908a554f h1:YuGidi0qisGt2fcb95yo25PLTIgEeNWtkKliH/LgOfk= -voyagermesh.dev/installer v0.0.0-20250831101200-3368908a554f/go.mod h1:nC3ieuMp1TJQPyFOMZAag00rxS04NF9Ci95LxTQvpaM= +voyagermesh.dev/installer v0.0.0-20251230080904-cdc0a2148b57 h1:qcVUlFsLB6qg6qq+Z1U6KtXlby+L5St3O9yFpcxt1m0= +voyagermesh.dev/installer v0.0.0-20251230080904-cdc0a2148b57/go.mod h1:e1DWSADBi9bkcJjH6AEJtDwfeRDli8u8f5aMOBCh47I= x-helm.dev/apimachinery v0.0.18 h1:UHrC0PGjeSRSRECXRaVUl4fIIwwyQSnNFCCAevSI14w= x-helm.dev/apimachinery v0.0.18/go.mod h1:C+M2A9cVmNhqP6ZGft4opUm1cPiWLHukKV5kWNkzXZs= diff --git a/vendor/modules.txt b/vendor/modules.txt index 0ef01a49..24d40a6c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -857,7 +857,7 @@ kmodules.xyz/resource-metadata/apis/shared kmodules.xyz/resource-metadata/apis/ui kmodules.xyz/resource-metadata/apis/ui/v1alpha1 kmodules.xyz/resource-metadata/crds -# kubeops.dev/external-dns-operator v0.2.1-0.20251228040338-45d730f27b11 +# kubeops.dev/external-dns-operator v0.3.0 ## explicit; go 1.25 kubeops.dev/external-dns-operator/apis/external kubeops.dev/external-dns-operator/apis/external/v1alpha1 @@ -931,8 +931,8 @@ sigs.k8s.io/structured-merge-diff/v6/value # sigs.k8s.io/yaml v1.6.0 ## explicit; go 1.22 sigs.k8s.io/yaml -# voyagermesh.dev/installer v0.0.0-20250831101200-3368908a554f -## explicit; go 1.23.0 +# voyagermesh.dev/installer v0.0.0-20251230080904-cdc0a2148b57 +## explicit; go 1.24.0 voyagermesh.dev/installer/apis/installer voyagermesh.dev/installer/apis/installer/v1alpha1 # x-helm.dev/apimachinery v0.0.18 diff --git a/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/gateway_converter_types.go b/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/gateway_converter_types.go index 2f595e3c..2ec8ea47 100644 --- a/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/gateway_converter_types.go +++ b/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/gateway_converter_types.go @@ -19,6 +19,7 @@ package v1alpha1 import ( core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kmodules.xyz/resource-metadata/apis/shared" ) const ( @@ -79,6 +80,8 @@ type GatewayConverterSpec struct { HostNetwork *bool `json:"hostNetwork,omitempty"` Apiserver *GatewayConverterApiserver `json:"apiserver,omitempty"` Monitoring *Monitoring `json:"monitoring,omitempty"` + // +optional + Distro shared.DistroSpec `json:"distro"` } type Container struct { diff --git a/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_gateway_types.go b/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_gateway_types.go index 1614ce0a..2c5c6f19 100644 --- a/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_gateway_types.go +++ b/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_gateway_types.go @@ -21,6 +21,7 @@ import ( core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "kmodules.xyz/resource-metadata/apis/shared" ) const ( @@ -62,6 +63,8 @@ type VoyagerGatewayGlobal struct { ImageRegistry string `json:"imageRegistry"` ImagePullSecrets []string `json:"imagePullSecrets"` Images Images `json:"images"` + // +optional + Distro shared.DistroSpec `json:"distro"` } type Images struct { @@ -80,6 +83,8 @@ type PodDisruptionBudgetSpec struct { } type DeploymentSpec struct { + // +optional + Annotations map[string]string `json:"annotations"` EnvoyGateway *EnvoyGatewayDeployment `json:"envoyGateway,omitempty"` Ports []Port `json:"ports,omitempty"` PriorityClassName *string `json:"priorityClassName"` @@ -150,6 +155,12 @@ type GatewayControllerSpec struct { type GatewayProviderSpec struct { Type string `json:"type"` + // +optional + Kubernetes GatewayProviderKubernetesSpec `json:"kubernetes"` +} + +type GatewayProviderKubernetesSpec struct { + CleanupOffshootResources bool `json:"cleanupOffshootResources"` } type LoggingSpec struct { @@ -182,15 +193,26 @@ type CertgenJobSpec struct { Tolerations []core.Toleration `json:"tolerations"` // +optional NodeSelector map[string]string `json:"nodeSelector"` + // +optional + Pod CertgenJobPodSpec `json:"pod"` } +type CertgenJobPodSpec struct { + // +optional + Annotations map[string]string `json:"annotations"` + // +optional + Labels map[string]string `json:"labels"` +} type CertgenRbacMetadata struct { + // +optional Annotations map[string]string `json:"annotations"` - Labels map[string]string `json:"labels"` + // +optional + Labels map[string]string `json:"labels"` } type TopologyInjectorSpec struct { - Enabled bool `json:"enabled"` + Enabled bool `json:"enabled"` + // +optional Annotations map[string]string `json:"annotations"` } diff --git a/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_types.go b/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_types.go index 53573ba2..640c9db9 100644 --- a/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_types.go +++ b/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_types.go @@ -19,6 +19,7 @@ package v1alpha1 import ( core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "kmodules.xyz/resource-metadata/apis/shared" ) const ( @@ -86,6 +87,8 @@ type VoyagerSpec struct { Templates Templates `json:"templates"` License string `json:"license"` RegistryFQDN string `json:"registryFQDN"` + // +optional + Distro shared.DistroSpec `json:"distro"` } type ImageRef struct { diff --git a/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/zz_generated.deepcopy.go b/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/zz_generated.deepcopy.go index 8976808b..fe12e926 100644 --- a/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/zz_generated.deepcopy.go @@ -27,6 +27,36 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" ) +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CertgenJobPodSpec) DeepCopyInto(out *CertgenJobPodSpec) { + *out = *in + if in.Annotations != nil { + in, out := &in.Annotations, &out.Annotations + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + if in.Labels != nil { + in, out := &in.Labels, &out.Labels + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CertgenJobPodSpec. +func (in *CertgenJobPodSpec) DeepCopy() *CertgenJobPodSpec { + if in == nil { + return nil + } + out := new(CertgenJobPodSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CertgenJobSpec) DeepCopyInto(out *CertgenJobSpec) { *out = *in @@ -67,6 +97,7 @@ func (in *CertgenJobSpec) DeepCopyInto(out *CertgenJobSpec) { (*out)[key] = val } } + in.Pod.DeepCopyInto(&out.Pod) return } @@ -210,6 +241,13 @@ func (in *ContianerRef) DeepCopy() *ContianerRef { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DeploymentSpec) DeepCopyInto(out *DeploymentSpec) { *out = *in + if in.Annotations != nil { + in, out := &in.Annotations, &out.Annotations + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } if in.EnvoyGateway != nil { in, out := &in.EnvoyGateway, &out.EnvoyGateway *out = new(EnvoyGatewayDeployment) @@ -535,6 +573,7 @@ func (in *GatewayConverterSpec) DeepCopyInto(out *GatewayConverterSpec) { *out = new(Monitoring) (*in).DeepCopyInto(*out) } + out.Distro = in.Distro return } @@ -548,9 +587,26 @@ func (in *GatewayConverterSpec) DeepCopy() *GatewayConverterSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *GatewayProviderKubernetesSpec) DeepCopyInto(out *GatewayProviderKubernetesSpec) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GatewayProviderKubernetesSpec. +func (in *GatewayProviderKubernetesSpec) DeepCopy() *GatewayProviderKubernetesSpec { + if in == nil { + return nil + } + out := new(GatewayProviderKubernetesSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *GatewayProviderSpec) DeepCopyInto(out *GatewayProviderSpec) { *out = *in + out.Kubernetes = in.Kubernetes return } @@ -1045,6 +1101,7 @@ func (in *VoyagerGatewayGlobal) DeepCopyInto(out *VoyagerGatewayGlobal) { copy(*out, *in) } in.Images.DeepCopyInto(&out.Images) + out.Distro = in.Distro return } @@ -1258,6 +1315,7 @@ func (in *VoyagerSpec) DeepCopyInto(out *VoyagerSpec) { } out.Apiserver = in.Apiserver in.Templates.DeepCopyInto(&out.Templates) + out.Distro = in.Distro return }