rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-12 13:03:45 +00:00
Code Issues Releases Wiki Activity

Update k3s types to make version a string

Browse Source
This commit is contained in:
Dax McDonald
2020-02-28 17:55:48 -07:00
parent 12620b5bd7
commit 711984f3d8
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apis/management.cattle.io/v3/k3s_types.go
View File

@@ -1,12 +1,10 @@
package v3
import "k8s.io/apimachinery/pkg/version"
//K3sConfig provides desired configuration for k3s clusters
type K3sConfig struct {
// k3s Kubernetes version
Version *version.Info `yaml:"kubernetes_version" json:"kubernetesVersion,omitempty"`
K3sUpgradeStrategy
// k3s Kubernetes version, unset the value indicates an unmanaged cluster
Version string `yaml:"kubernetes_version" json:"kubernetesVersion,omitempty"`
K3sUpgradeStrategy `yaml:"k3s_upgrade_strategy,omitempty" json:"k3supgradeStrategy,omitempty"`
}
//K3sUpgradeStrategy provides configuration to the downstream system-upgrade-controller

7
apis/management.cattle.io/v3/zz_generated_deepcopy.go
View File

@@ -2227,7 +2227,7 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
if in.K3sConfig != nil {
in, out := &in.K3sConfig, &out.K3sConfig
*out = new(K3sConfig)
(*in).DeepCopyInto(*out)
**out = **in
}
if in.ImportedConfig != nil {
in, out := &in.ImportedConfig, &out.ImportedConfig
@@ -4524,11 +4524,6 @@ func (in *IngressConfig) DeepCopy() *IngressConfig {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *K3sConfig) DeepCopyInto(out *K3sConfig) {
*out = *in
if in.Version != nil {
in, out := &in.Version, &out.Version
*out = new(version.Info)
**out = **in
}
out.K3sUpgradeStrategy = in.K3sUpgradeStrategy
return
}