Merge pull request #258 from sttts/sttts-updated

openshift-merge-robot · web-flow · commit ee4cd7ea187d · 2020-02-05T19:15:29.000+01:00
Bug 1795412: Print whether CRDs are updated
diff --git a/lib/resourceapply/apiext.go b/lib/resourceapply/apiext.go
@@ -8,6 +8,7 @@ import (
 	apiextclientv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/klog"
 	"k8s.io/utils/pointer"
 )
 
@@ -31,6 +32,8 @@ func ApplyCustomResourceDefinitionV1beta1(client apiextclientv1beta1.CustomResou
 		return existing, false, nil
 	}
 
+	klog.V(2).Infof("Updating CRD %s", required.Name)
+
 	actual, err := client.CustomResourceDefinitions().Update(existing)
 	return actual, true, err
 }
@@ -55,6 +58,8 @@ func ApplyCustomResourceDefinitionV1(client apiextclientv1.CustomResourceDefinit
 		return existing, false, nil
 	}
 
+	klog.V(2).Infof("Updating CRD %s", required.Name)
+
 	actual, err := client.CustomResourceDefinitions().Update(existing)
 	return actual, true, err
 }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import (`
`8`	`8`	`apiextclientv1beta1 "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1"`
`9`	`9`	`apierrors "k8s.io/apimachinery/pkg/api/errors"`
`10`	`10`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
	`11`	`+ "k8s.io/klog"`
`11`	`12`	`"k8s.io/utils/pointer"`
`12`	`13`	`)`
`13`	`14`
`@@ -31,6 +32,8 @@ func ApplyCustomResourceDefinitionV1beta1(client apiextclientv1beta1.CustomResou`
`31`	`32`	`return existing, false, nil`
`32`	`33`	`}`
`33`	`34`
	`35`	`+ klog.V(2).Infof("Updating CRD %s", required.Name)`
	`36`	`+`
`34`	`37`	`actual, err := client.CustomResourceDefinitions().Update(existing)`
`35`	`38`	`return actual, true, err`
`36`	`39`	`}`
`@@ -55,6 +58,8 @@ func ApplyCustomResourceDefinitionV1(client apiextclientv1.CustomResourceDefinit`
`55`	`58`	`return existing, false, nil`
`56`	`59`	`}`
`57`	`60`
	`61`	`+ klog.V(2).Infof("Updating CRD %s", required.Name)`
	`62`	`+`
`58`	`63`	`actual, err := client.CustomResourceDefinitions().Update(existing)`
`59`	`64`	`return actual, true, err`
`60`	`65`	`}`