rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-03 07:54:14 +00:00
Code Issues Releases Wiki Activity

bump the API used for api-server from v1alpha1 to v1

Browse Source
This commit is contained in:
Jiaqi Luo
2022-10-27 15:58:10 -07:00
parent 1857a48d4e
commit c4a521de08
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/cluster.go
View File

@@ -32,7 +32,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/runtime/serializer"
apiserverv1alpha1 "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1" apiserverv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
auditv1 "k8s.io/apiserver/pkg/apis/audit/v1" auditv1 "k8s.io/apiserver/pkg/apis/audit/v1"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
@@ -431,21 +431,21 @@ func parseAdmissionConfig(clusterFile string, rkeConfig *v3.RancherKubernetesEng
return fmt.Errorf("error marshalling admission configuration: %v", err) return fmt.Errorf("error marshalling admission configuration: %v", err)
} }
scheme := runtime.NewScheme() scheme := runtime.NewScheme()
err = apiserverv1alpha1.AddToScheme(scheme) err = apiserverv1.AddToScheme(scheme)
if err != nil { if err != nil {
return fmt.Errorf("error adding to scheme: %v", err) return fmt.Errorf("error adding to scheme: %v", err)
} }
err = scheme.SetVersionPriority(apiserverv1alpha1.SchemeGroupVersion) err = scheme.SetVersionPriority(apiserverv1.SchemeGroupVersion)
if err != nil { if err != nil {
return fmt.Errorf("error setting version priority: %v", err) return fmt.Errorf("error setting version priority: %v", err)
} }
codecs := serializer.NewCodecFactory(scheme) codecs := serializer.NewCodecFactory(scheme)
decoder := codecs.UniversalDecoder(apiserverv1alpha1.SchemeGroupVersion) decoder := codecs.UniversalDecoder(apiserverv1.SchemeGroupVersion)
decodedObj, err := runtime.Decode(decoder, data) decodedObj, err := runtime.Decode(decoder, data)
if err != nil { if err != nil {
return fmt.Errorf("error decoding data: %v", err) return fmt.Errorf("error decoding data: %v", err)
} }
decodedConfig, ok := decodedObj.(*apiserverv1alpha1.AdmissionConfiguration) decodedConfig, ok := decodedObj.(*apiserverv1.AdmissionConfiguration)
if !ok { if !ok {
return fmt.Errorf("unexpected type: %T", decodedObj) return fmt.Errorf("unexpected type: %T", decodedObj)
} }

18
cluster/defaults.go
View File

@@ -22,7 +22,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
apiserverv1alpha1 "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1" apiserverv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
auditv1 "k8s.io/apiserver/pkg/apis/audit/v1" auditv1 "k8s.io/apiserver/pkg/apis/audit/v1"
) )
@@ -437,8 +437,8 @@ func newDefaultAuditLogConfig() *v3.AuditLogConfig {
return c return c
} }
func getEventRateLimitPluginFromConfig(c *v3.Configuration) (apiserverv1alpha1.AdmissionPluginConfiguration, error) { func getEventRateLimitPluginFromConfig(c *v3.Configuration) (apiserverv1.AdmissionPluginConfiguration, error) {
plugin := apiserverv1alpha1.AdmissionPluginConfiguration{ plugin := apiserverv1.AdmissionPluginConfiguration{
Name: EventRateLimitPluginName, Name: EventRateLimitPluginName,
Configuration: &runtime.Unknown{ Configuration: &runtime.Unknown{
ContentType: "application/json", ContentType: "application/json",
@@ -470,8 +470,8 @@ func newDefaultEventRateLimitConfig() *v3.Configuration {
} }
} }
func newDefaultEventRateLimitPlugin() (apiserverv1alpha1.AdmissionPluginConfiguration, error) { func newDefaultEventRateLimitPlugin() (apiserverv1.AdmissionPluginConfiguration, error) {
plugin := apiserverv1alpha1.AdmissionPluginConfiguration{ plugin := apiserverv1.AdmissionPluginConfiguration{
Name: EventRateLimitPluginName, Name: EventRateLimitPluginName,
Configuration: &runtime.Unknown{ Configuration: &runtime.Unknown{
ContentType: "application/json", ContentType: "application/json",
@@ -488,12 +488,12 @@ func newDefaultEventRateLimitPlugin() (apiserverv1alpha1.AdmissionPluginConfigur
return plugin, nil return plugin, nil
} }
func newDefaultAdmissionConfiguration() (*apiserverv1alpha1.AdmissionConfiguration, error) { func newDefaultAdmissionConfiguration() (*apiserverv1.AdmissionConfiguration, error) {
var admissionConfiguration *apiserverv1alpha1.AdmissionConfiguration var admissionConfiguration *apiserverv1.AdmissionConfiguration
admissionConfiguration = &apiserverv1alpha1.AdmissionConfiguration{ admissionConfiguration = &apiserverv1.AdmissionConfiguration{
TypeMeta: v1.TypeMeta{ TypeMeta: v1.TypeMeta{
Kind: "AdmissionConfiguration", Kind: "AdmissionConfiguration",
APIVersion: apiserverv1alpha1.SchemeGroupVersion.String(), APIVersion: apiserverv1.SchemeGroupVersion.String(),
}, },
} }
return admissionConfiguration, nil return admissionConfiguration, nil

6
cluster/hosts.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/rancher/rke/util" "github.com/rancher/rke/util"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"k8s.io/apiserver/pkg/apis/apiserver/v1alpha1" apiserverv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
) )
@@ -148,9 +148,9 @@ func (c *Cluster) CalculateMaxUnavailable() (int, int, error) {
return maxUnavailableWorker, maxUnavailableControl, nil return maxUnavailableWorker, maxUnavailableControl, nil
} }
func (c *Cluster) getConsolidatedAdmissionConfiguration() (*v1alpha1.AdmissionConfiguration, error) { func (c *Cluster) getConsolidatedAdmissionConfiguration() (*apiserverv1.AdmissionConfiguration, error) {
var err error var err error
var admissionConfig *v1alpha1.AdmissionConfiguration var admissionConfig *apiserverv1.AdmissionConfiguration
if c.Services.KubeAPI.EventRateLimit == nil || if c.Services.KubeAPI.EventRateLimit == nil ||
!c.Services.KubeAPI.EventRateLimit.Enabled { !c.Services.KubeAPI.EventRateLimit.Enabled {

4
types/rke_types.go
View File

@@ -3,7 +3,7 @@ package types
import ( import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apiserverv1alpha1 "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1" apiserverv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
auditv1 "k8s.io/apiserver/pkg/apis/audit/v1" auditv1 "k8s.io/apiserver/pkg/apis/audit/v1"
configv1 "k8s.io/apiserver/pkg/apis/config/v1" configv1 "k8s.io/apiserver/pkg/apis/config/v1"
) )
@@ -301,7 +301,7 @@ type KubeAPIService struct {
// Audit Log Configuration // Audit Log Configuration
AuditLog *AuditLog `yaml:"audit_log" json:"auditLog,omitempty"` AuditLog *AuditLog `yaml:"audit_log" json:"auditLog,omitempty"`
// AdmissionConfiguration // AdmissionConfiguration
AdmissionConfiguration *apiserverv1alpha1.AdmissionConfiguration `yaml:"admission_configuration" json:"admissionConfiguration,omitempty" norman:"type=map[json]"` AdmissionConfiguration *apiserverv1.AdmissionConfiguration `yaml:"admission_configuration" json:"admissionConfiguration,omitempty" norman:"type=map[json]"`
// Event Rate Limit configuration // Event Rate Limit configuration
EventRateLimit *EventRateLimit `yaml:"event_rate_limit" json:"eventRateLimit,omitempty"` EventRateLimit *EventRateLimit `yaml:"event_rate_limit" json:"eventRateLimit,omitempty"`
} }

4
types/zz_generated_deepcopy.go
View File

@@ -25,7 +25,7 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
v1alpha1 "k8s.io/apiserver/pkg/apis/apiserver/v1alpha1" apiserverv1 "k8s.io/apiserver/pkg/apis/apiserver/v1"
v1 "k8s.io/apiserver/pkg/apis/audit/v1" v1 "k8s.io/apiserver/pkg/apis/audit/v1"
configv1 "k8s.io/apiserver/pkg/apis/config/v1" configv1 "k8s.io/apiserver/pkg/apis/config/v1"
) )
@@ -988,7 +988,7 @@ func (in *KubeAPIService) DeepCopyInto(out *KubeAPIService) {
} }
if in.AdmissionConfiguration != nil { if in.AdmissionConfiguration != nil {
in, out := &in.AdmissionConfiguration, &out.AdmissionConfiguration in, out := &in.AdmissionConfiguration, &out.AdmissionConfiguration
*out = new(v1alpha1.AdmissionConfiguration) *out = new(apiserverv1.AdmissionConfiguration)
(*in).DeepCopyInto(*out) (*in).DeepCopyInto(*out)
} }
if in.EventRateLimit != nil { if in.EventRateLimit != nil {