github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #49778 from resouer/fix-nil 

Automatic merge from submit-queue

Fix crd delete nil pointer in example

**What this PR does / why we need it**:
When error is `IsAlreadyExists`, crd will be nil, then `defer` statement will `nil pointer`.

**Release note**:

```release-note
NONE
```
pull/6/head
Kubernetes Submit Queue 2017-07-28 11:50:13 -07:00 committed by GitHub
parent 3cd5beceb4 66a2ee5a61
commit 537ced9a1d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apiextensions-apiserver/examples/client-go/main.go
View File

@ -57,7 +57,10 @@ func main() {
if err != nil && !apierrors.IsAlreadyExists(err) {
panic(err)
}
defer apiextensionsclientset.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(crd.Name, nil)
if crd != nil {
defer apiextensionsclientset.ApiextensionsV1beta1().CustomResourceDefinitions().Delete(crd.Name, nil)
}
// make a new config for our extension's API group, using the first config as a baseline
exampleClient, exampleScheme, err := exampleclient.NewClient(config)