github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use apps/v1 API in kubeadm.

Browse Source
This commit is contained in:
xiangpengzhao 2017-12-15 16:34:14 +08:00
parent f99485c9f5
commit 7d919fbd0c
11 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/phases/addons/dns/dns.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"runtime" "runtime"
apps "k8s.io/api/apps/v1beta2" apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
rbac "k8s.io/api/rbac/v1" rbac "k8s.io/api/rbac/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"

4
cmd/kubeadm/app/phases/addons/dns/manifests.go
View File

@ -19,7 +19,7 @@ package dns
const ( const (
// v180AndAboveKubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+ // v180AndAboveKubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+
v180AndAboveKubeDNSDeployment = ` v180AndAboveKubeDNSDeployment = `
apiVersion: apps/v1beta2 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: kube-dns name: kube-dns
@ -216,7 +216,7 @@ spec:
// CoreDNSDeployment is the CoreDNS Deployment manifest // CoreDNSDeployment is the CoreDNS Deployment manifest
CoreDNSDeployment = ` CoreDNSDeployment = `
apiVersion: apps/v1beta2 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: coredns name: coredns

2
cmd/kubeadm/app/phases/addons/proxy/manifests.go
View File

@ -52,7 +52,7 @@ data:
// KubeProxyDaemonSet19 is the proxy DaemonSet manifest for Kubernetes 1.9 and above // KubeProxyDaemonSet19 is the proxy DaemonSet manifest for Kubernetes 1.9 and above
KubeProxyDaemonSet19 = ` KubeProxyDaemonSet19 = `
apiVersion: apps/v1beta2 apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
labels: labels:

2
cmd/kubeadm/app/phases/addons/proxy/proxy.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"runtime" "runtime"
apps "k8s.io/api/apps/v1beta2" apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
rbac "k8s.io/api/rbac/v1" rbac "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
cmd/kubeadm/app/phases/selfhosting/selfhosting.go
View File

@ -21,7 +21,7 @@ import (
"os" "os"
"time" "time"
apps "k8s.io/api/apps/v1beta2" apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"

8
cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go
View File

@ -23,7 +23,7 @@ import (
"os" "os"
"testing" "testing"
apps "k8s.io/api/apps/v1beta2" apps "k8s.io/api/apps/v1"
"k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/kubernetes/cmd/kubeadm/app/util" "k8s.io/kubernetes/cmd/kubeadm/app/util"
volumeutil "k8s.io/kubernetes/pkg/volume/util" volumeutil "k8s.io/kubernetes/pkg/volume/util"
@ -104,7 +104,7 @@ spec:
status: {} status: {}
` `
testAPIServerDaemonSet = `apiVersion: apps/v1beta2 testAPIServerDaemonSet = `apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
creationTimestamp: null creationTimestamp: null
@ -265,7 +265,7 @@ spec:
status: {} status: {}
` `
testControllerManagerDaemonSet = `apiVersion: apps/v1beta2 testControllerManagerDaemonSet = `apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
creationTimestamp: null creationTimestamp: null
@ -395,7 +395,7 @@ spec:
status: {} status: {}
` `
testSchedulerDaemonSet = `apiVersion: apps/v1beta2 testSchedulerDaemonSet = `apiVersion: apps/v1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
creationTimestamp: null creationTimestamp: null

4
cmd/kubeadm/app/phases/upgrade/health.go
View File

@ -21,7 +21,7 @@ import (
"net/http" "net/http"
"os" "os"
apps "k8s.io/api/apps/v1beta2" apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
@ -174,7 +174,7 @@ func getNotReadyDaemonSets(client clientset.Interface) ([]error, error) {
notReadyDaemonSets := []error{} notReadyDaemonSets := []error{}
for _, component := range constants.MasterComponents { for _, component := range constants.MasterComponents {
dsName := constants.AddSelfHostedPrefix(component) dsName := constants.AddSelfHostedPrefix(component)
ds, err := client.AppsV1beta2().DaemonSets(metav1.NamespaceSystem).Get(dsName, metav1.GetOptions{}) ds, err := client.AppsV1().DaemonSets(metav1.NamespaceSystem).Get(dsName, metav1.GetOptions{})
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't get daemonset %q in the %s namespace", dsName, metav1.NamespaceSystem) return nil, fmt.Errorf("couldn't get daemonset %q in the %s namespace", dsName, metav1.NamespaceSystem)
} }

2
cmd/kubeadm/app/phases/upgrade/postupgrade.go
View File

@ -117,7 +117,7 @@ func PerformPostUpgradeTasks(client clientset.Interface, cfg *kubeadmapi.MasterC
func removeOldKubeDNSDeploymentIfCoreDNSIsUsed(cfg *kubeadmapi.MasterConfiguration, client clientset.Interface) error { func removeOldKubeDNSDeploymentIfCoreDNSIsUsed(cfg *kubeadmapi.MasterConfiguration, client clientset.Interface) error {
if features.Enabled(cfg.FeatureGates, features.CoreDNS) { if features.Enabled(cfg.FeatureGates, features.CoreDNS) {
return apiclient.TryRunCommand(func() error { return apiclient.TryRunCommand(func() error {
coreDNSDeployment, err := client.AppsV1beta2().Deployments(metav1.NamespaceSystem).Get(kubeadmconstants.CoreDNS, metav1.GetOptions{}) coreDNSDeployment, err := client.AppsV1().Deployments(metav1.NamespaceSystem).Get(kubeadmconstants.CoreDNS, metav1.GetOptions{})
if err != nil { if err != nil {
return err return err
} }

2
cmd/kubeadm/app/phases/upgrade/prepull.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"time" "time"
apps "k8s.io/api/apps/v1beta2" apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"

6
cmd/kubeadm/app/phases/upgrade/selfhosted.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"time" "time"
apps "k8s.io/api/apps/v1beta2" apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
@ -119,7 +119,7 @@ func SelfHostedControlPlane(client clientset.Interface, waiter apiclient.Waiter,
// During this upgrade; the temporary/backup component will take over // During this upgrade; the temporary/backup component will take over
if err := apiclient.TryRunCommand(func() error { if err := apiclient.TryRunCommand(func() error {
if _, err := client.AppsV1beta2().DaemonSets(newDS.ObjectMeta.Namespace).Update(newDS); err != nil { if _, err := client.AppsV1().DaemonSets(newDS.ObjectMeta.Namespace).Update(newDS); err != nil {
return fmt.Errorf("couldn't update self-hosted component's DaemonSet: %v", err) return fmt.Errorf("couldn't update self-hosted component's DaemonSet: %v", err)
} }
return nil return nil
@ -256,7 +256,7 @@ func getCurrentControlPlaneComponentResources(client clientset.Interface) (map[s
if err := apiclient.TryRunCommand(func() error { if err := apiclient.TryRunCommand(func() error {
var tryrunerr error var tryrunerr error
// Try to get the current self-hosted component // Try to get the current self-hosted component
currentDS, tryrunerr = client.AppsV1beta2().DaemonSets(metav1.NamespaceSystem).Get(dsName, metav1.GetOptions{}) currentDS, tryrunerr = client.AppsV1().DaemonSets(metav1.NamespaceSystem).Get(dsName, metav1.GetOptions{})
return tryrunerr // note that tryrunerr is most likely nil here (in successful cases) return tryrunerr // note that tryrunerr is most likely nil here (in successful cases)
}, selfHostingFailureThreshold); err != nil { }, selfHostingFailureThreshold); err != nil {
return nil, err return nil, err

14
cmd/kubeadm/app/util/apiclient/idempotency.go
View File

@ -19,7 +19,7 @@ package apiclient
import ( import (
"fmt" "fmt"
apps "k8s.io/api/apps/v1beta2" apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
rbac "k8s.io/api/rbac/v1" rbac "k8s.io/api/rbac/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
@ -72,12 +72,12 @@ func CreateOrUpdateServiceAccount(client clientset.Interface, sa *v1.ServiceAcco
// CreateOrUpdateDeployment creates a Deployment if the target resource doesn't exist. If the resource exists already, this function will update the resource instead. // CreateOrUpdateDeployment creates a Deployment if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
func CreateOrUpdateDeployment(client clientset.Interface, deploy *apps.Deployment) error { func CreateOrUpdateDeployment(client clientset.Interface, deploy *apps.Deployment) error {
if _, err := client.AppsV1beta2().Deployments(deploy.ObjectMeta.Namespace).Create(deploy); err != nil { if _, err := client.AppsV1().Deployments(deploy.ObjectMeta.Namespace).Create(deploy); err != nil {
if !apierrors.IsAlreadyExists(err) { if !apierrors.IsAlreadyExists(err) {
return fmt.Errorf("unable to create deployment: %v", err) return fmt.Errorf("unable to create deployment: %v", err)
} }
if _, err := client.AppsV1beta2().Deployments(deploy.ObjectMeta.Namespace).Update(deploy); err != nil { if _, err := client.AppsV1().Deployments(deploy.ObjectMeta.Namespace).Update(deploy); err != nil {
return fmt.Errorf("unable to update deployment: %v", err) return fmt.Errorf("unable to update deployment: %v", err)
} }
} }
@ -86,12 +86,12 @@ func CreateOrUpdateDeployment(client clientset.Interface, deploy *apps.Deploymen
// CreateOrUpdateDaemonSet creates a DaemonSet if the target resource doesn't exist. If the resource exists already, this function will update the resource instead. // CreateOrUpdateDaemonSet creates a DaemonSet if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
func CreateOrUpdateDaemonSet(client clientset.Interface, ds *apps.DaemonSet) error { func CreateOrUpdateDaemonSet(client clientset.Interface, ds *apps.DaemonSet) error {
if _, err := client.AppsV1beta2().DaemonSets(ds.ObjectMeta.Namespace).Create(ds); err != nil { if _, err := client.AppsV1().DaemonSets(ds.ObjectMeta.Namespace).Create(ds); err != nil {
if !apierrors.IsAlreadyExists(err) { if !apierrors.IsAlreadyExists(err) {
return fmt.Errorf("unable to create daemonset: %v", err) return fmt.Errorf("unable to create daemonset: %v", err)
} }
if _, err := client.AppsV1beta2().DaemonSets(ds.ObjectMeta.Namespace).Update(ds); err != nil { if _, err := client.AppsV1().DaemonSets(ds.ObjectMeta.Namespace).Update(ds); err != nil {
return fmt.Errorf("unable to update daemonset: %v", err) return fmt.Errorf("unable to update daemonset: %v", err)
} }
} }
@ -104,7 +104,7 @@ func DeleteDaemonSetForeground(client clientset.Interface, namespace, name strin
deleteOptions := &metav1.DeleteOptions{ deleteOptions := &metav1.DeleteOptions{
PropagationPolicy: &foregroundDelete, PropagationPolicy: &foregroundDelete,
} }
return client.AppsV1beta2().DaemonSets(namespace).Delete(name, deleteOptions) return client.AppsV1().DaemonSets(namespace).Delete(name, deleteOptions)
} }
// DeleteDeploymentForeground deletes the specified Deployment in foreground mode; i.e. it blocks until/makes sure all the managed Pods are deleted // DeleteDeploymentForeground deletes the specified Deployment in foreground mode; i.e. it blocks until/makes sure all the managed Pods are deleted
@ -113,7 +113,7 @@ func DeleteDeploymentForeground(client clientset.Interface, namespace, name stri
deleteOptions := &metav1.DeleteOptions{ deleteOptions := &metav1.DeleteOptions{
PropagationPolicy: &foregroundDelete, PropagationPolicy: &foregroundDelete,
} }
return client.AppsV1beta2().Deployments(namespace).Delete(name, deleteOptions) return client.AppsV1().Deployments(namespace).Delete(name, deleteOptions)
} }
// CreateOrUpdateRole creates a Role if the target resource doesn't exist. If the resource exists already, this function will update the resource instead. // CreateOrUpdateRole creates a Role if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.