diff --git a/examples/dynamic-create-update-delete-deployment/main.go b/examples/dynamic-create-update-delete-deployment/main.go index 1784c5f4..b7439e48 100644 --- a/examples/dynamic-create-update-delete-deployment/main.go +++ b/examples/dynamic-create-update-delete-deployment/main.go @@ -53,8 +53,6 @@ func main() { } flag.Parse() - namespace := "default" - config, err := clientcmd.BuildConfigFromFlags("", *kubeconfig) if err != nil { panic(err) @@ -109,7 +107,7 @@ func main() { // Create Deployment fmt.Println("Creating deployment...") - result, err := client.Resource(deploymentRes).Namespace(namespace).Create(context.TODO(), deployment, metav1.CreateOptions{}) + result, err := client.Resource(deploymentRes).Namespace(apiv1.NamespaceDefault).Create(context.TODO(), deployment, metav1.CreateOptions{}) if err != nil { panic(err) } @@ -134,7 +132,7 @@ func main() { retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error { // Retrieve the latest version of Deployment before attempting update // RetryOnConflict uses exponential backoff to avoid exhausting the apiserver - result, getErr := client.Resource(deploymentRes).Namespace(namespace).Get(context.TODO(), "demo-deployment", metav1.GetOptions{}) + result, getErr := client.Resource(deploymentRes).Namespace(apiv1.NamespaceDefault).Get(context.TODO(), "demo-deployment", metav1.GetOptions{}) if getErr != nil { panic(fmt.Errorf("failed to get latest version of Deployment: %v", getErr)) } @@ -158,7 +156,7 @@ func main() { panic(err) } - _, updateErr := client.Resource(deploymentRes).Namespace(namespace).Update(context.TODO(), result, metav1.UpdateOptions{}) + _, updateErr := client.Resource(deploymentRes).Namespace(apiv1.NamespaceDefault).Update(context.TODO(), result, metav1.UpdateOptions{}) return updateErr }) if retryErr != nil { @@ -169,7 +167,7 @@ func main() { // List Deployments prompt() fmt.Printf("Listing deployments in namespace %q:\n", apiv1.NamespaceDefault) - list, err := client.Resource(deploymentRes).Namespace(namespace).List(context.TODO(), metav1.ListOptions{}) + list, err := client.Resource(deploymentRes).Namespace(apiv1.NamespaceDefault).List(context.TODO(), metav1.ListOptions{}) if err != nil { panic(err) } @@ -189,7 +187,7 @@ func main() { deleteOptions := metav1.DeleteOptions{ PropagationPolicy: &deletePolicy, } - if err := client.Resource(deploymentRes).Namespace(namespace).Delete(context.TODO(), "demo-deployment", deleteOptions); err != nil { + if err := client.Resource(deploymentRes).Namespace(apiv1.NamespaceDefault).Delete(context.TODO(), "demo-deployment", deleteOptions); err != nil { panic(err) } diff --git a/go.mod b/go.mod index 3d3dcc3e..76ab8ebc 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 google.golang.org/protobuf v1.28.0 - k8s.io/api v0.0.0-20220809235342-2e7b66171c20 + k8s.io/api v0.0.0-20220824023210-64f80bd511ba k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3 k8s.io/klog/v2 v2.70.1 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 @@ -70,6 +70,6 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20220809235342-2e7b66171c20 + k8s.io/api => k8s.io/api v0.0.0-20220824023210-64f80bd511ba k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3 ) diff --git a/go.sum b/go.sum index 44ccf615..31005a82 100644 --- a/go.sum +++ b/go.sum @@ -665,8 +665,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.0.0-20220809235342-2e7b66171c20 h1:+1HZkTrpGkV9qYo5f80o5y+Jj7Czh6KcXW8ZjV4Did0= -k8s.io/api v0.0.0-20220809235342-2e7b66171c20/go.mod h1:cuE2+aKfcxEMeHx/NuUKIL3aRJhth7/K9wlCf+3Q3+s= +k8s.io/api v0.0.0-20220824023210-64f80bd511ba h1:aTNI+/FBnYaKBP5X6joGb/l0aZEcI7dv7G4d0sDHZWQ= +k8s.io/api v0.0.0-20220824023210-64f80bd511ba/go.mod h1:cuE2+aKfcxEMeHx/NuUKIL3aRJhth7/K9wlCf+3Q3+s= k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3 h1:Ru2oqar5qMV68dM0G6OEZs2C7qtydpReZ2dHsXpu/Kw= k8s.io/apimachinery v0.0.0-20220805001719-117bd9b56ec3/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=