Merge pull request #10953 from medyagh/lint_master

lint master
pull/10954/head
Medya Ghazizadeh 2021-03-29 13:59:50 -07:00 committed by GitHub
commit 7ceedb6b1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions

View File

@ -17,6 +17,7 @@ limitations under the License.
package main package main
import ( import (
"context"
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"fmt" "fmt"
@ -52,7 +53,7 @@ func client() *kubernetes.Clientset {
// Retrieve the CA cert that will signed the cert used by the // Retrieve the CA cert that will signed the cert used by the
// "GenericAdmissionWebhook" plugin admission controller. // "GenericAdmissionWebhook" plugin admission controller.
func apiServerCert(clientset *kubernetes.Clientset) []byte { func apiServerCert(clientset *kubernetes.Clientset) []byte {
c, err := clientset.CoreV1().ConfigMaps("kube-system").Get("extension-apiserver-authentication", metav1.GetOptions{}) c, err := clientset.CoreV1().ConfigMaps("kube-system").Get(context.TODO(), "extension-apiserver-authentication", metav1.GetOptions{})
if err != nil { if err != nil {
glog.Fatal(err) glog.Fatal(err)
} }
@ -85,9 +86,9 @@ func configTLS(clientset *kubernetes.Clientset, serverCert []byte, serverKey []b
// by creating externalAdmissionHookConfigurations. // by creating externalAdmissionHookConfigurations.
func selfRegistration(clientset *kubernetes.Clientset, caCert []byte) { func selfRegistration(clientset *kubernetes.Clientset, caCert []byte) {
client := clientset.AdmissionregistrationV1().MutatingWebhookConfigurations() client := clientset.AdmissionregistrationV1().MutatingWebhookConfigurations()
_, err := client.Get(webhookName, metav1.GetOptions{}) _, err := client.Get(context.TODO(), webhookName, metav1.GetOptions{})
if err == nil { if err == nil {
if err2 := client.Delete(webhookName, &metav1.DeleteOptions{}); err2 != nil { if err2 := client.Delete(context.TODO(), webhookName, metav1.DeleteOptions{}); err2 != nil {
glog.Fatal(err2) glog.Fatal(err2)
} }
} }
@ -140,7 +141,7 @@ func selfRegistration(clientset *kubernetes.Clientset, caCert []byte) {
}, },
}, },
} }
if _, err := client.Create(webhookConfig); err != nil { if _, err := client.Create(context.TODO(), webhookConfig, metav1.CreateOptions{}); err != nil {
glog.Fatalf("Client creation failed with %s", err) glog.Fatalf("Client creation failed with %s", err)
} }
log.Println("CLIENT CREATED") log.Println("CLIENT CREATED")