rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-12 13:18:47 +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

18
cluster/defaults.go
View File

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