Merge pull request #545 from oracle/crd-update

rjeberhard · web-flow · commit 682f5da83f8d · 2018-11-30T19:36:09.000-05:00
Correct CRD update
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/CRDHelper.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/CRDHelper.java
@@ -152,9 +152,10 @@ private boolean isOutdatedCRD(V1beta1CustomResourceDefinition existingCRD) {
     }
 
     Step updateCRD(Step next, V1beta1CustomResourceDefinition existingCRD) {
+      model.getMetadata().setResourceVersion(existingCRD.getMetadata().getResourceVersion());
       return new CallBuilder()
           .replaceCustomResourceDefinitionAsync(
-              model.getMetadata().getName(), createModel(), createReplaceResponseStep(next));
+              model.getMetadata().getName(), model, createReplaceResponseStep(next));
     }
 
     ResponseStep<V1beta1CustomResourceDefinition> createReplaceResponseStep(Step next) {

Original file line number	Diff line number	Diff line change
`@@ -152,9 +152,10 @@ private boolean isOutdatedCRD(V1beta1CustomResourceDefinition existingCRD) {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`Step updateCRD(Step next, V1beta1CustomResourceDefinition existingCRD) {`
	`155`	`+ model.getMetadata().setResourceVersion(existingCRD.getMetadata().getResourceVersion());`
`155`	`156`	`return new CallBuilder()`
`156`	`157`	`.replaceCustomResourceDefinitionAsync(`
`157`		`- model.getMetadata().getName(), createModel(), createReplaceResponseStep(next));`
	`158`	`+ model.getMetadata().getName(), model, createReplaceResponseStep(next));`
`158`	`159`	`}`
`159`	`160`
`160`	`161`	`ResponseStep<V1beta1CustomResourceDefinition> createReplaceResponseStep(Step next) {`