Skip to content

Commit abe6321

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#87952 from mikedanese/opts
add *Options to Create, Update, and Patch in generated clientsets
2 parents 86fcb30 + bfc75d9 commit abe6321

File tree

650 files changed

+3678
-3228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

650 files changed

+3678
-3228
lines changed

‎cmd/kubeadm/app/phases/addons/dns/dns.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,15 +347,15 @@ func createDNSService(dnsService *v1.Service, serviceBytes []byte, client client
347347
}
348348

349349
// Can't use a generic apiclient helper func here as we have to tolerate more than AlreadyExists.
350-
if _, err := client.CoreV1().Services(metav1.NamespaceSystem).Create(context.TODO(), dnsService); err != nil {
350+
if _, err := client.CoreV1().Services(metav1.NamespaceSystem).Create(context.TODO(), dnsService, metav1.CreateOptions{}); err != nil {
351351
// Ignore if the Service is invalid with this error message:
352352
// Service "kube-dns" is invalid: spec.clusterIP: Invalid value: "10.96.0.10": provided IP is already allocated
353353

354354
if !apierrors.IsAlreadyExists(err) && !apierrors.IsInvalid(err) {
355355
return errors.Wrap(err, "unable to create a new DNS service")
356356
}
357357

358-
if _, err := client.CoreV1().Services(metav1.NamespaceSystem).Update(context.TODO(), dnsService); err != nil {
358+
if _, err := client.CoreV1().Services(metav1.NamespaceSystem).Update(context.TODO(), dnsService, metav1.UpdateOptions{}); err != nil {
359359
return errors.Wrap(err, "unable to create/update the DNS service")
360360
}
361361
}
@@ -383,7 +383,7 @@ func migrateCoreDNSCorefile(client clientset.Interface, cm *v1.ConfigMap, corefi
383383
"Corefile": corefile,
384384
"Corefile-backup": corefile,
385385
},
386-
}); err != nil {
386+
}, metav1.UpdateOptions{}); err != nil {
387387
return errors.Wrap(err, "unable to update the CoreDNS ConfigMap with backup Corefile")
388388
}
389389
if err := patchCoreDNSDeployment(client, "Corefile-backup"); err != nil {
@@ -405,7 +405,7 @@ func migrateCoreDNSCorefile(client clientset.Interface, cm *v1.ConfigMap, corefi
405405
"Corefile": updatedCorefile,
406406
"Corefile-backup": corefile,
407407
},
408-
}); err != nil {
408+
}, metav1.UpdateOptions{}); err != nil {
409409
return errors.Wrap(err, "unable to update the CoreDNS ConfigMap")
410410
}
411411
fmt.Println("[addons]: Migrating CoreDNS Corefile")
@@ -452,7 +452,7 @@ func patchCoreDNSDeployment(client clientset.Interface, coreDNSCorefileName stri
452452
}
453453
patch := fmt.Sprintf(`{"spec":{"template":{"spec":{"volumes":[{"name": "config-volume", "configMap":{"name": "coredns", "items":[{"key": "%s", "path": "%s"}]}}]}}}}`, coreDNSCorefileName, coreDNSCorefileName)
454454

455-
if _, err := client.AppsV1().Deployments(dnsDeployment.ObjectMeta.Namespace).Patch(context.TODO(), dnsDeployment.Name, types.StrategicMergePatchType, []byte(patch)); err != nil {
455+
if _, err := client.AppsV1().Deployments(dnsDeployment.ObjectMeta.Namespace).Patch(context.TODO(), dnsDeployment.Name, types.StrategicMergePatchType, []byte(patch), metav1.PatchOptions{}); err != nil {
456456
return errors.Wrap(err, "unable to patch the CoreDNS deployment")
457457
}
458458
return nil

‎cmd/kubeadm/app/phases/addons/dns/dns_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ func createClientAndCoreDNSManifest(t *testing.T, corefile, coreDNSVersion strin
741741
Data: map[string]string{
742742
"Corefile": corefile,
743743
},
744-
})
744+
}, metav1.CreateOptions{})
745745
if err != nil {
746746
t.Fatalf("error creating ConfigMap: %v", err)
747747
}
@@ -768,7 +768,7 @@ func createClientAndCoreDNSManifest(t *testing.T, corefile, coreDNSVersion strin
768768
},
769769
},
770770
},
771-
})
771+
}, metav1.CreateOptions{})
772772
if err != nil {
773773
t.Fatalf("error creating deployment: %v", err)
774774
}

‎cmd/kubeadm/app/phases/certs/renewal/apirenewer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (r *APIRenewer) Renew(cfg *certutil.Config) (*x509.Certificate, crypto.Sign
9191
},
9292
}
9393

94-
req, err := r.client.CertificateSigningRequests().Create(context.TODO(), k8sCSR)
94+
req, err := r.client.CertificateSigningRequests().Create(context.TODO(), k8sCSR, metav1.CreateOptions{})
9595
if err != nil {
9696
return nil, nil, errors.Wrap(err, "couldn't create certificate signing request")
9797
}

‎cmd/kubeadm/app/phases/upgrade/health.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func createJob(client clientset.Interface, cfg *kubeadmapi.ClusterConfiguration)
157157
// Create the Job, but retry in case it is being currently deleted
158158
klog.V(2).Infof("Creating Job %q in the namespace %q", jobName, ns)
159159
err := wait.PollImmediate(time.Second*1, timeout, func() (bool, error) {
160-
if _, err := client.BatchV1().Jobs(ns).Create(context.TODO(), job); err != nil {
160+
if _, err := client.BatchV1().Jobs(ns).Create(context.TODO(), job, metav1.CreateOptions{}); err != nil {
161161
klog.V(2).Infof("Could not create Job %q in the namespace %q, retrying: %v", jobName, ns, err)
162162
lastError = err
163163
return false, nil

‎cmd/kubeadm/app/util/apiclient/idempotency.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ type ConfigMapMutator func(*v1.ConfigMap) error
4444

4545
// CreateOrUpdateConfigMap creates a ConfigMap if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
4646
func CreateOrUpdateConfigMap(client clientset.Interface, cm *v1.ConfigMap) error {
47-
if _, err := client.CoreV1().ConfigMaps(cm.ObjectMeta.Namespace).Create(context.TODO(), cm); err != nil {
47+
if _, err := client.CoreV1().ConfigMaps(cm.ObjectMeta.Namespace).Create(context.TODO(), cm, metav1.CreateOptions{}); err != nil {
4848
if !apierrors.IsAlreadyExists(err) {
4949
return errors.Wrap(err, "unable to create ConfigMap")
5050
}
5151

52-
if _, err := client.CoreV1().ConfigMaps(cm.ObjectMeta.Namespace).Update(context.TODO(), cm); err != nil {
52+
if _, err := client.CoreV1().ConfigMaps(cm.ObjectMeta.Namespace).Update(context.TODO(), cm, metav1.UpdateOptions{}); err != nil {
5353
return errors.Wrap(err, "unable to update ConfigMap")
5454
}
5555
}
@@ -68,7 +68,7 @@ func CreateOrMutateConfigMap(client clientset.Interface, cm *v1.ConfigMap, mutat
6868
Factor: 1.0,
6969
Jitter: 0.1,
7070
}, func() (bool, error) {
71-
if _, err := client.CoreV1().ConfigMaps(cm.ObjectMeta.Namespace).Create(context.TODO(), cm); err != nil {
71+
if _, err := client.CoreV1().ConfigMaps(cm.ObjectMeta.Namespace).Create(context.TODO(), cm, metav1.CreateOptions{}); err != nil {
7272
lastError = err
7373
if apierrors.IsAlreadyExists(err) {
7474
lastError = MutateConfigMap(client, metav1.ObjectMeta{Namespace: cm.ObjectMeta.Namespace, Name: cm.ObjectMeta.Name}, mutator)
@@ -102,7 +102,7 @@ func MutateConfigMap(client clientset.Interface, meta metav1.ObjectMeta, mutator
102102
if err = mutator(configMap); err != nil {
103103
return errors.Wrap(err, "unable to mutate ConfigMap")
104104
}
105-
_, err = client.CoreV1().ConfigMaps(configMap.ObjectMeta.Namespace).Update(context.TODO(), configMap)
105+
_, err = client.CoreV1().ConfigMaps(configMap.ObjectMeta.Namespace).Update(context.TODO(), configMap, metav1.UpdateOptions{})
106106
return err
107107
})
108108
}
@@ -113,7 +113,7 @@ func CreateOrRetainConfigMap(client clientset.Interface, cm *v1.ConfigMap, confi
113113
if !apierrors.IsNotFound(err) {
114114
return nil
115115
}
116-
if _, err := client.CoreV1().ConfigMaps(cm.ObjectMeta.Namespace).Create(context.TODO(), cm); err != nil {
116+
if _, err := client.CoreV1().ConfigMaps(cm.ObjectMeta.Namespace).Create(context.TODO(), cm, metav1.CreateOptions{}); err != nil {
117117
if !apierrors.IsAlreadyExists(err) {
118118
return errors.Wrap(err, "unable to create ConfigMap")
119119
}
@@ -124,12 +124,12 @@ func CreateOrRetainConfigMap(client clientset.Interface, cm *v1.ConfigMap, confi
124124

125125
// CreateOrUpdateSecret creates a Secret if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
126126
func CreateOrUpdateSecret(client clientset.Interface, secret *v1.Secret) error {
127-
if _, err := client.CoreV1().Secrets(secret.ObjectMeta.Namespace).Create(context.TODO(), secret); err != nil {
127+
if _, err := client.CoreV1().Secrets(secret.ObjectMeta.Namespace).Create(context.TODO(), secret, metav1.CreateOptions{}); err != nil {
128128
if !apierrors.IsAlreadyExists(err) {
129129
return errors.Wrap(err, "unable to create secret")
130130
}
131131

132-
if _, err := client.CoreV1().Secrets(secret.ObjectMeta.Namespace).Update(context.TODO(), secret); err != nil {
132+
if _, err := client.CoreV1().Secrets(secret.ObjectMeta.Namespace).Update(context.TODO(), secret, metav1.UpdateOptions{}); err != nil {
133133
return errors.Wrap(err, "unable to update secret")
134134
}
135135
}
@@ -138,7 +138,7 @@ func CreateOrUpdateSecret(client clientset.Interface, secret *v1.Secret) error {
138138

139139
// CreateOrUpdateServiceAccount creates a ServiceAccount if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
140140
func CreateOrUpdateServiceAccount(client clientset.Interface, sa *v1.ServiceAccount) error {
141-
if _, err := client.CoreV1().ServiceAccounts(sa.ObjectMeta.Namespace).Create(context.TODO(), sa); err != nil {
141+
if _, err := client.CoreV1().ServiceAccounts(sa.ObjectMeta.Namespace).Create(context.TODO(), sa, metav1.CreateOptions{}); err != nil {
142142
// Note: We don't run .Update here afterwards as that's probably not required
143143
// Only thing that could be updated is annotations/labels in .metadata, but we don't use that currently
144144
if !apierrors.IsAlreadyExists(err) {
@@ -150,12 +150,12 @@ func CreateOrUpdateServiceAccount(client clientset.Interface, sa *v1.ServiceAcco
150150

151151
// CreateOrUpdateDeployment creates a Deployment if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
152152
func CreateOrUpdateDeployment(client clientset.Interface, deploy *apps.Deployment) error {
153-
if _, err := client.AppsV1().Deployments(deploy.ObjectMeta.Namespace).Create(context.TODO(), deploy); err != nil {
153+
if _, err := client.AppsV1().Deployments(deploy.ObjectMeta.Namespace).Create(context.TODO(), deploy, metav1.CreateOptions{}); err != nil {
154154
if !apierrors.IsAlreadyExists(err) {
155155
return errors.Wrap(err, "unable to create deployment")
156156
}
157157

158-
if _, err := client.AppsV1().Deployments(deploy.ObjectMeta.Namespace).Update(context.TODO(), deploy); err != nil {
158+
if _, err := client.AppsV1().Deployments(deploy.ObjectMeta.Namespace).Update(context.TODO(), deploy, metav1.UpdateOptions{}); err != nil {
159159
return errors.Wrap(err, "unable to update deployment")
160160
}
161161
}
@@ -168,7 +168,7 @@ func CreateOrRetainDeployment(client clientset.Interface, deploy *apps.Deploymen
168168
if !apierrors.IsNotFound(err) {
169169
return nil
170170
}
171-
if _, err := client.AppsV1().Deployments(deploy.ObjectMeta.Namespace).Create(context.TODO(), deploy); err != nil {
171+
if _, err := client.AppsV1().Deployments(deploy.ObjectMeta.Namespace).Create(context.TODO(), deploy, metav1.CreateOptions{}); err != nil {
172172
if !apierrors.IsAlreadyExists(err) {
173173
return errors.Wrap(err, "unable to create deployment")
174174
}
@@ -179,12 +179,12 @@ func CreateOrRetainDeployment(client clientset.Interface, deploy *apps.Deploymen
179179

180180
// CreateOrUpdateDaemonSet creates a DaemonSet if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
181181
func CreateOrUpdateDaemonSet(client clientset.Interface, ds *apps.DaemonSet) error {
182-
if _, err := client.AppsV1().DaemonSets(ds.ObjectMeta.Namespace).Create(context.TODO(), ds); err != nil {
182+
if _, err := client.AppsV1().DaemonSets(ds.ObjectMeta.Namespace).Create(context.TODO(), ds, metav1.CreateOptions{}); err != nil {
183183
if !apierrors.IsAlreadyExists(err) {
184184
return errors.Wrap(err, "unable to create daemonset")
185185
}
186186

187-
if _, err := client.AppsV1().DaemonSets(ds.ObjectMeta.Namespace).Update(context.TODO(), ds); err != nil {
187+
if _, err := client.AppsV1().DaemonSets(ds.ObjectMeta.Namespace).Update(context.TODO(), ds, metav1.UpdateOptions{}); err != nil {
188188
return errors.Wrap(err, "unable to update daemonset")
189189
}
190190
}
@@ -211,12 +211,12 @@ func DeleteDeploymentForeground(client clientset.Interface, namespace, name stri
211211

212212
// CreateOrUpdateRole creates a Role if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
213213
func CreateOrUpdateRole(client clientset.Interface, role *rbac.Role) error {
214-
if _, err := client.RbacV1().Roles(role.ObjectMeta.Namespace).Create(context.TODO(), role); err != nil {
214+
if _, err := client.RbacV1().Roles(role.ObjectMeta.Namespace).Create(context.TODO(), role, metav1.CreateOptions{}); err != nil {
215215
if !apierrors.IsAlreadyExists(err) {
216216
return errors.Wrap(err, "unable to create RBAC role")
217217
}
218218

219-
if _, err := client.RbacV1().Roles(role.ObjectMeta.Namespace).Update(context.TODO(), role); err != nil {
219+
if _, err := client.RbacV1().Roles(role.ObjectMeta.Namespace).Update(context.TODO(), role, metav1.UpdateOptions{}); err != nil {
220220
return errors.Wrap(err, "unable to update RBAC role")
221221
}
222222
}
@@ -225,12 +225,12 @@ func CreateOrUpdateRole(client clientset.Interface, role *rbac.Role) error {
225225

226226
// CreateOrUpdateRoleBinding creates a RoleBinding if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
227227
func CreateOrUpdateRoleBinding(client clientset.Interface, roleBinding *rbac.RoleBinding) error {
228-
if _, err := client.RbacV1().RoleBindings(roleBinding.ObjectMeta.Namespace).Create(context.TODO(), roleBinding); err != nil {
228+
if _, err := client.RbacV1().RoleBindings(roleBinding.ObjectMeta.Namespace).Create(context.TODO(), roleBinding, metav1.CreateOptions{}); err != nil {
229229
if !apierrors.IsAlreadyExists(err) {
230230
return errors.Wrap(err, "unable to create RBAC rolebinding")
231231
}
232232

233-
if _, err := client.RbacV1().RoleBindings(roleBinding.ObjectMeta.Namespace).Update(context.TODO(), roleBinding); err != nil {
233+
if _, err := client.RbacV1().RoleBindings(roleBinding.ObjectMeta.Namespace).Update(context.TODO(), roleBinding, metav1.UpdateOptions{}); err != nil {
234234
return errors.Wrap(err, "unable to update RBAC rolebinding")
235235
}
236236
}
@@ -239,12 +239,12 @@ func CreateOrUpdateRoleBinding(client clientset.Interface, roleBinding *rbac.Rol
239239

240240
// CreateOrUpdateClusterRole creates a ClusterRole if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
241241
func CreateOrUpdateClusterRole(client clientset.Interface, clusterRole *rbac.ClusterRole) error {
242-
if _, err := client.RbacV1().ClusterRoles().Create(context.TODO(), clusterRole); err != nil {
242+
if _, err := client.RbacV1().ClusterRoles().Create(context.TODO(), clusterRole, metav1.CreateOptions{}); err != nil {
243243
if !apierrors.IsAlreadyExists(err) {
244244
return errors.Wrap(err, "unable to create RBAC clusterrole")
245245
}
246246

247-
if _, err := client.RbacV1().ClusterRoles().Update(context.TODO(), clusterRole); err != nil {
247+
if _, err := client.RbacV1().ClusterRoles().Update(context.TODO(), clusterRole, metav1.UpdateOptions{}); err != nil {
248248
return errors.Wrap(err, "unable to update RBAC clusterrole")
249249
}
250250
}
@@ -253,12 +253,12 @@ func CreateOrUpdateClusterRole(client clientset.Interface, clusterRole *rbac.Clu
253253

254254
// CreateOrUpdateClusterRoleBinding creates a ClusterRoleBinding if the target resource doesn't exist. If the resource exists already, this function will update the resource instead.
255255
func CreateOrUpdateClusterRoleBinding(client clientset.Interface, clusterRoleBinding *rbac.ClusterRoleBinding) error {
256-
if _, err := client.RbacV1().ClusterRoleBindings().Create(context.TODO(), clusterRoleBinding); err != nil {
256+
if _, err := client.RbacV1().ClusterRoleBindings().Create(context.TODO(), clusterRoleBinding, metav1.CreateOptions{}); err != nil {
257257
if !apierrors.IsAlreadyExists(err) {
258258
return errors.Wrap(err, "unable to create RBAC clusterrolebinding")
259259
}
260260

261-
if _, err := client.RbacV1().ClusterRoleBindings().Update(context.TODO(), clusterRoleBinding); err != nil {
261+
if _, err := client.RbacV1().ClusterRoleBindings().Update(context.TODO(), clusterRoleBinding, metav1.UpdateOptions{}); err != nil {
262262
return errors.Wrap(err, "unable to update RBAC clusterrolebinding")
263263
}
264264
}
@@ -302,7 +302,7 @@ func PatchNodeOnce(client clientset.Interface, nodeName string, patchFn func(*v1
302302
return false, errors.Wrap(err, "failed to create two way merge patch")
303303
}
304304

305-
if _, err := client.CoreV1().Nodes().Patch(context.TODO(), n.Name, types.StrategicMergePatchType, patchBytes); err != nil {
305+
if _, err := client.CoreV1().Nodes().Patch(context.TODO(), n.Name, types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}); err != nil {
306306
// TODO also check for timeouts
307307
if apierrors.IsConflict(err) {
308308
fmt.Println("Temporarily unable to update node metadata due to conflict (will retry)")

‎cmd/kubeadm/app/util/apiclient/idempotency_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestPatchNodeNonErrorCases(t *testing.T) {
6969
for _, tc := range testcases {
7070
t.Run(tc.name, func(t *testing.T) {
7171
client := fake.NewSimpleClientset()
72-
_, err := client.CoreV1().Nodes().Create(context.TODO(), &tc.node)
72+
_, err := client.CoreV1().Nodes().Create(context.TODO(), &tc.node, metav1.CreateOptions{})
7373
if err != nil {
7474
t.Fatalf("failed to create node to fake client: %v", err)
7575
}
@@ -122,7 +122,7 @@ func createClientAndConfigMap(t *testing.T) *fake.Clientset {
122122
Data: map[string]string{
123123
"key": "some-value",
124124
},
125-
})
125+
}, metav1.CreateOptions{})
126126
if err != nil {
127127
t.Fatalf("error creating ConfigMap: %v", err)
128128
}

‎cmd/kubeadm/app/util/config/cluster_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ func TestGetNodeRegistration(t *testing.T) {
343343
client := clientsetfake.NewSimpleClientset()
344344

345345
if rt.node != nil {
346-
_, err := client.CoreV1().Nodes().Create(context.TODO(), rt.node)
346+
_, err := client.CoreV1().Nodes().Create(context.TODO(), rt.node, metav1.CreateOptions{})
347347
if err != nil {
348348
t.Errorf("couldn't create Node")
349349
return
@@ -619,7 +619,7 @@ func TestGetInitConfigurationFromCluster(t *testing.T) {
619619
client := clientsetfake.NewSimpleClientset()
620620

621621
if rt.node != nil {
622-
_, err := client.CoreV1().Nodes().Create(context.TODO(), rt.node)
622+
_, err := client.CoreV1().Nodes().Create(context.TODO(), rt.node, metav1.CreateOptions{})
623623
if err != nil {
624624
t.Errorf("couldn't create Node")
625625
return

‎pkg/client/tests/fake_client_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func TestFakeClientsetInheritsNamespace(t *testing.T) {
103103
testPod("nsA", "pod-1"),
104104
)
105105

106-
_, err := tc.CoreV1().Namespaces().Create(context.TODO(), testNamespace("nsB"))
106+
_, err := tc.CoreV1().Namespaces().Create(context.TODO(), testNamespace("nsB"), metav1.CreateOptions{})
107107
if err != nil {
108108
t.Fatalf("Namespaces.Create: %s", err)
109109
}
@@ -116,7 +116,7 @@ func TestFakeClientsetInheritsNamespace(t *testing.T) {
116116
t.Fatalf("Expected %d namespaces to match, got %d", expected, actual)
117117
}
118118

119-
_, err = tc.CoreV1().Pods("nsB").Create(context.TODO(), testPod("", "pod-1"))
119+
_, err = tc.CoreV1().Pods("nsB").Create(context.TODO(), testPod("", "pod-1"), metav1.CreateOptions{})
120120
if err != nil {
121121
t.Fatalf("Pods.Create nsB/pod-1: %s", err)
122122
}
@@ -132,25 +132,25 @@ func TestFakeClientsetInheritsNamespace(t *testing.T) {
132132
t.Fatalf("Expected to find pod nsB/pod-1t, got %s/%s", podB1.Namespace, podB1.Name)
133133
}
134134

135-
_, err = tc.CoreV1().Pods("nsA").Create(context.TODO(), testPod("", "pod-1"))
135+
_, err = tc.CoreV1().Pods("nsA").Create(context.TODO(), testPod("", "pod-1"), metav1.CreateOptions{})
136136
if err == nil {
137137
t.Fatalf("Expected Pods.Create to fail with already exists error")
138138
}
139139

140-
_, err = tc.CoreV1().Pods("nsA").Update(context.TODO(), testPod("", "pod-1"))
140+
_, err = tc.CoreV1().Pods("nsA").Update(context.TODO(), testPod("", "pod-1"), metav1.UpdateOptions{})
141141
if err != nil {
142142
t.Fatalf("Pods.Update nsA/pod-1: %s", err)
143143
}
144144

145-
_, err = tc.CoreV1().Pods("nsA").Create(context.TODO(), testPod("nsB", "pod-2"))
145+
_, err = tc.CoreV1().Pods("nsA").Create(context.TODO(), testPod("nsB", "pod-2"), metav1.CreateOptions{})
146146
if err == nil {
147147
t.Fatalf("Expected Pods.Create to fail with bad request from namespace mismtach")
148148
}
149149
if err.Error() != `request namespace does not match object namespace, request: "nsA" object: "nsB"` {
150150
t.Fatalf("Expected Pods.Create error to provide object and request namespaces, got %q", err)
151151
}
152152

153-
_, err = tc.CoreV1().Pods("nsA").Update(context.TODO(), testPod("", "pod-3"))
153+
_, err = tc.CoreV1().Pods("nsA").Update(context.TODO(), testPod("", "pod-3"), metav1.UpdateOptions{})
154154
if err == nil {
155155
t.Fatalf("Expected Pods.Update nsA/pod-3 to fail with not found error")
156156
}

‎pkg/controller/bootstrap/bootstrapsigner.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727

2828
v1 "k8s.io/api/core/v1"
2929
apierrors "k8s.io/apimachinery/pkg/api/errors"
30+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3031
"k8s.io/apimachinery/pkg/labels"
3132
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3233
"k8s.io/apimachinery/pkg/util/wait"
@@ -243,7 +244,7 @@ func (e *Signer) signConfigMap() {
243244
}
244245

245246
func (e *Signer) updateConfigMap(cm *v1.ConfigMap) {
246-
_, err := e.client.CoreV1().ConfigMaps(cm.Namespace).Update(context.TODO(), cm)
247+
_, err := e.client.CoreV1().ConfigMaps(cm.Namespace).Update(context.TODO(), cm, metav1.UpdateOptions{})
247248
if err != nil && !apierrors.IsConflict(err) && !apierrors.IsNotFound(err) {
248249
klog.V(3).Infof("Error updating ConfigMap: %v", err)
249250
}

0 commit comments

Comments
 (0)