From 76502a91a8fc4ee6dc7a3ada9f4f61de35f7aedb Mon Sep 17 00:00:00 2001 From: Kinara Shah Date: Mon, 14 Oct 2024 18:57:34 -0700 Subject: [PATCH] update rke to v1.5.14-rc.3 --- go.mod | 2 +- go.sum | 4 ++-- pkg/apis/go.mod | 2 +- pkg/apis/go.sum | 4 ++-- .../management/v3/zz_generated_aci_network_provider.go | 4 ++++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 34c05839e3..69a0f1767a 100644 --- a/go.mod +++ b/go.mod @@ -126,7 +126,7 @@ require ( github.com/rancher/norman v0.0.0-20240206180703-6eda4bc94b4c github.com/rancher/rancher/pkg/client v0.0.0 github.com/rancher/remotedialer v0.4.0 - github.com/rancher/rke v1.5.14-rc.2 + github.com/rancher/rke v1.5.14-rc.3 github.com/rancher/steve v0.0.0-20241004194751-1d54556fdd0b github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20240301001845-4eacc2dabbde github.com/rancher/wrangler/v2 v2.1.4 diff --git a/go.sum b/go.sum index 5c8198c5fd..59d0eeb7f6 100644 --- a/go.sum +++ b/go.sum @@ -1545,8 +1545,8 @@ github.com/rancher/qase-go/client v0.0.0-20240308221502-c3b2635212be h1:+m6Jv5sA github.com/rancher/qase-go/client v0.0.0-20240308221502-c3b2635212be/go.mod h1:NP3xboG+t2p+XMnrcrJ/L384Ki0Cp3Pww/X+vm5Jcy0= github.com/rancher/remotedialer v0.4.0 h1:T9yC5bFMsZFVQ6rK0dNrRg6rRb6Zr/4vsig8S0IJ7ak= github.com/rancher/remotedialer v0.4.0/go.mod h1:Ys004RpJuTLSm+k4aYUCoFiOOad37ubYev3TkOFg/5w= -github.com/rancher/rke v1.5.14-rc.2 h1:fPahxavkGSSqPGnf8aViLVlb/IEaZIA2Lz/v8/nZVPw= -github.com/rancher/rke v1.5.14-rc.2/go.mod h1:/z9oyKqYpFwgRBV9rfLxqUdjydz/VMCTcjld4uUt7uM= +github.com/rancher/rke v1.5.14-rc.3 h1:YvXWlMmm2hTWgZpLt9qJJLssJWxakAP8N1w6hgPtoB4= +github.com/rancher/rke v1.5.14-rc.3/go.mod h1:/z9oyKqYpFwgRBV9rfLxqUdjydz/VMCTcjld4uUt7uM= github.com/rancher/shepherd v0.0.0-20241010215751-3a3ced82b562 h1:8nldDM7rYb7trx/hAVqLmFGDVBaaWLmExGffmihhruo= github.com/rancher/shepherd v0.0.0-20241010215751-3a3ced82b562/go.mod h1:1TXkmbjCxMEp8Rzzw+ToyrhJYUGDC0lw6uXLe3Ie+M4= github.com/rancher/steve v0.0.0-20241004194751-1d54556fdd0b h1:KEKYG23BZ3NdtpCB5R2xtm+B9zAn2yd8gQlbqqxy404= diff --git a/pkg/apis/go.mod b/pkg/apis/go.mod index 2feef0642d..8fd76c96cc 100644 --- a/pkg/apis/go.mod +++ b/pkg/apis/go.mod @@ -35,7 +35,7 @@ require ( github.com/rancher/fleet/pkg/apis v0.9.6 github.com/rancher/gke-operator v1.2.5 github.com/rancher/norman v0.0.0-20240206180703-6eda4bc94b4c - github.com/rancher/rke v1.5.14-rc.2 + github.com/rancher/rke v1.5.14-rc.3 github.com/rancher/wrangler/v2 v2.1.4 github.com/sirupsen/logrus v1.9.3 k8s.io/api v0.28.9 diff --git a/pkg/apis/go.sum b/pkg/apis/go.sum index 47e2c143a5..68c4831519 100644 --- a/pkg/apis/go.sum +++ b/pkg/apis/go.sum @@ -114,8 +114,8 @@ github.com/rancher/lasso v0.0.0-20240123150939-7055397d6dfa h1:eRhvQJjIpPxJunlS3 github.com/rancher/lasso v0.0.0-20240123150939-7055397d6dfa/go.mod h1:utdskbIL7kdVvPCUFPEJQDWJwPHGFpUCRfVkX2G2Xxg= github.com/rancher/norman v0.0.0-20240206180703-6eda4bc94b4c h1:ayqZqJ4AYYVaZGlBztLBij81z/QRsSFbQfxs9bzA+Tg= github.com/rancher/norman v0.0.0-20240206180703-6eda4bc94b4c/go.mod h1:WbNpu/HwChwKk54W0rWBdioxYVVZwVVz//UX84m/NvY= -github.com/rancher/rke v1.5.14-rc.2 h1:fPahxavkGSSqPGnf8aViLVlb/IEaZIA2Lz/v8/nZVPw= -github.com/rancher/rke v1.5.14-rc.2/go.mod h1:/z9oyKqYpFwgRBV9rfLxqUdjydz/VMCTcjld4uUt7uM= +github.com/rancher/rke v1.5.14-rc.3 h1:YvXWlMmm2hTWgZpLt9qJJLssJWxakAP8N1w6hgPtoB4= +github.com/rancher/rke v1.5.14-rc.3/go.mod h1:/z9oyKqYpFwgRBV9rfLxqUdjydz/VMCTcjld4uUt7uM= github.com/rancher/wrangler/v2 v2.1.4 h1:ohov0i6A9dJHHO6sjfsH4Dqv93ZTdm5lIJVJdPzVdQc= github.com/rancher/wrangler/v2 v2.1.4/go.mod h1:af5OaGU/COgreQh1mRbKiUI64draT2NN34uk+PALFY8= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= diff --git a/pkg/client/generated/management/v3/zz_generated_aci_network_provider.go b/pkg/client/generated/management/v3/zz_generated_aci_network_provider.go index 33deaa5c19..ef0d41dee8 100644 --- a/pkg/client/generated/management/v3/zz_generated_aci_network_provider.go +++ b/pkg/client/generated/management/v3/zz_generated_aci_network_provider.go @@ -33,6 +33,7 @@ const ( AciNetworkProviderFieldDurationWaitForNetwork = "durationWaitForNetwork" AciNetworkProviderFieldDynamicExternalSubnet = "externDynamic" AciNetworkProviderFieldEnableEndpointSlice = "enableEndpointSlice" + AciNetworkProviderFieldEnableHppDirect = "enableHppDirect" AciNetworkProviderFieldEnableOpflexAgentReconnect = "enableOpflexAgentReconnect" AciNetworkProviderFieldEncapType = "encapType" AciNetworkProviderFieldEpRegistry = "epRegistry" @@ -70,6 +71,7 @@ const ( AciNetworkProviderFieldOpflexAgentOpflexAsyncjsonEnabled = "opflexAgentOpflexAsyncjsonEnabled" AciNetworkProviderFieldOpflexAgentOvsAsyncjsonEnabled = "opflexAgentOvsAsyncjsonEnabled" AciNetworkProviderFieldOpflexAgentPolicyRetryDelayTimer = "opflexAgentPolicyRetryDelayTimer" + AciNetworkProviderFieldOpflexAgentResetWaitDelay = "opflexAgentResetWaitDelay" AciNetworkProviderFieldOpflexAgentStatistics = "opflexAgentStatistics" AciNetworkProviderFieldOpflexClientSSL = "opflexClientSsl" AciNetworkProviderFieldOpflexDeviceDeleteTimeout = "opflexDeviceDeleteTimeout" @@ -152,6 +154,7 @@ type AciNetworkProvider struct { DurationWaitForNetwork string `json:"durationWaitForNetwork,omitempty" yaml:"durationWaitForNetwork,omitempty"` DynamicExternalSubnet string `json:"externDynamic,omitempty" yaml:"externDynamic,omitempty"` EnableEndpointSlice string `json:"enableEndpointSlice,omitempty" yaml:"enableEndpointSlice,omitempty"` + EnableHppDirect string `json:"enableHppDirect,omitempty" yaml:"enableHppDirect,omitempty"` EnableOpflexAgentReconnect string `json:"enableOpflexAgentReconnect,omitempty" yaml:"enableOpflexAgentReconnect,omitempty"` EncapType string `json:"encapType,omitempty" yaml:"encapType,omitempty"` EpRegistry string `json:"epRegistry,omitempty" yaml:"epRegistry,omitempty"` @@ -189,6 +192,7 @@ type AciNetworkProvider struct { OpflexAgentOpflexAsyncjsonEnabled string `json:"opflexAgentOpflexAsyncjsonEnabled,omitempty" yaml:"opflexAgentOpflexAsyncjsonEnabled,omitempty"` OpflexAgentOvsAsyncjsonEnabled string `json:"opflexAgentOvsAsyncjsonEnabled,omitempty" yaml:"opflexAgentOvsAsyncjsonEnabled,omitempty"` OpflexAgentPolicyRetryDelayTimer string `json:"opflexAgentPolicyRetryDelayTimer,omitempty" yaml:"opflexAgentPolicyRetryDelayTimer,omitempty"` + OpflexAgentResetWaitDelay string `json:"opflexAgentResetWaitDelay,omitempty" yaml:"opflexAgentResetWaitDelay,omitempty"` OpflexAgentStatistics string `json:"opflexAgentStatistics,omitempty" yaml:"opflexAgentStatistics,omitempty"` OpflexClientSSL string `json:"opflexClientSsl,omitempty" yaml:"opflexClientSsl,omitempty"` OpflexDeviceDeleteTimeout string `json:"opflexDeviceDeleteTimeout,omitempty" yaml:"opflexDeviceDeleteTimeout,omitempty"`