diff --git a/CHANGELOG.md b/CHANGELOG.md index c0a31e67b39..d0815096797 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### 6.2-SNAPSHOT #### Bugs +* Fix #4312: fix timestamp can't be deserialized for IstioCondition * Fix #4369: Informers will retry with a backoff on list/watch failure as they did in 5.12 and prior. * Fix #4350: SchemaSwap annotation is now repeatable and is applied multiple times if classes are used more than once in the class hierarchy. * Fix #3733: The authentication command from the .kube/config won't be discarded if no arguments are specified diff --git a/extensions/istio/generator-v1alpha3/cmd/generate/generate.go b/extensions/istio/generator-v1alpha3/cmd/generate/generate.go index 9079829468c..7abdc6899ca 100644 --- a/extensions/istio/generator-v1alpha3/cmd/generate/generate.go +++ b/extensions/istio/generator-v1alpha3/cmd/generate/generate.go @@ -85,7 +85,7 @@ func main() { reflect.TypeOf(types.BoolValue{}): "java.lang.Boolean", reflect.TypeOf(types.DoubleValue{}): "java.lang.Double", reflect.TypeOf(types.Duration{}): "java.lang.String", - reflect.TypeOf(types.Timestamp{}): "java.lang.Long", + reflect.TypeOf(types.Timestamp{}): "java.lang.String", reflect.TypeOf(types.Int32Value{}): "java.lang.Integer", reflect.TypeOf(types.UInt32Value{}): "java.lang.Integer", reflect.TypeOf(types.Struct{}): "java.util.Map", diff --git a/extensions/istio/generator-v1beta1/cmd/generate/generate.go b/extensions/istio/generator-v1beta1/cmd/generate/generate.go index 9f32b4a85a1..28b97e393c0 100644 --- a/extensions/istio/generator-v1beta1/cmd/generate/generate.go +++ b/extensions/istio/generator-v1beta1/cmd/generate/generate.go @@ -91,7 +91,7 @@ func main() { reflect.TypeOf(types.BoolValue{}): "java.lang.Boolean", reflect.TypeOf(types.DoubleValue{}): "java.lang.Double", reflect.TypeOf(types.Duration{}): "java.lang.String", - reflect.TypeOf(types.Timestamp{}): "java.lang.Long", + reflect.TypeOf(types.Timestamp{}): "java.lang.String", reflect.TypeOf(types.Int32Value{}): "java.lang.Integer", reflect.TypeOf(types.UInt32Value{}): "java.lang.Integer", } diff --git a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java index 8121b3a7c8f..114d3e4f27f 100644 --- a/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java +++ b/extensions/istio/model-v1alpha3/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java @@ -70,9 +70,9 @@ public class IstioCondition implements KubernetesResource { @JsonProperty("lastProbeTime") - private Long lastProbeTime; + private String lastProbeTime; @JsonProperty("lastTransitionTime") - private Long lastTransitionTime; + private String lastTransitionTime; @JsonProperty("message") private String message; @JsonProperty("reason") @@ -100,7 +100,7 @@ public IstioCondition() { * @param lastProbeTime * @param status */ - public IstioCondition(Long lastProbeTime, Long lastTransitionTime, String message, String reason, String status, String type) { + public IstioCondition(String lastProbeTime, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastProbeTime = lastProbeTime; this.lastTransitionTime = lastTransitionTime; @@ -111,22 +111,22 @@ public IstioCondition(Long lastProbeTime, Long lastTransitionTime, String messag } @JsonProperty("lastProbeTime") - public Long getLastProbeTime() { + public String getLastProbeTime() { return lastProbeTime; } @JsonProperty("lastProbeTime") - public void setLastProbeTime(Long lastProbeTime) { + public void setLastProbeTime(String lastProbeTime) { this.lastProbeTime = lastProbeTime; } @JsonProperty("lastTransitionTime") - public Long getLastTransitionTime() { + public String getLastTransitionTime() { return lastTransitionTime; } @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(Long lastTransitionTime) { + public void setLastTransitionTime(String lastTransitionTime) { this.lastTransitionTime = lastTransitionTime; } diff --git a/extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json b/extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json index 46751d82599..172d4ddee73 100644 --- a/extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json +++ b/extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json @@ -193,10 +193,10 @@ "type": "object", "properties": { "lastProbeTime": { - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.String" }, "lastTransitionTime": { - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.String" }, "message": { "type": "string" diff --git a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java index 8121b3a7c8f..114d3e4f27f 100644 --- a/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java +++ b/extensions/istio/model-v1beta1/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java @@ -70,9 +70,9 @@ public class IstioCondition implements KubernetesResource { @JsonProperty("lastProbeTime") - private Long lastProbeTime; + private String lastProbeTime; @JsonProperty("lastTransitionTime") - private Long lastTransitionTime; + private String lastTransitionTime; @JsonProperty("message") private String message; @JsonProperty("reason") @@ -100,7 +100,7 @@ public IstioCondition() { * @param lastProbeTime * @param status */ - public IstioCondition(Long lastProbeTime, Long lastTransitionTime, String message, String reason, String status, String type) { + public IstioCondition(String lastProbeTime, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastProbeTime = lastProbeTime; this.lastTransitionTime = lastTransitionTime; @@ -111,22 +111,22 @@ public IstioCondition(Long lastProbeTime, Long lastTransitionTime, String messag } @JsonProperty("lastProbeTime") - public Long getLastProbeTime() { + public String getLastProbeTime() { return lastProbeTime; } @JsonProperty("lastProbeTime") - public void setLastProbeTime(Long lastProbeTime) { + public void setLastProbeTime(String lastProbeTime) { this.lastProbeTime = lastProbeTime; } @JsonProperty("lastTransitionTime") - public Long getLastTransitionTime() { + public String getLastTransitionTime() { return lastTransitionTime; } @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(Long lastTransitionTime) { + public void setLastTransitionTime(String lastTransitionTime) { this.lastTransitionTime = lastTransitionTime; } diff --git a/extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json b/extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json index b9ae2075f10..f4e22cce42f 100644 --- a/extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json +++ b/extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json @@ -65,10 +65,10 @@ "type": "object", "properties": { "lastProbeTime": { - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.String" }, "lastTransitionTime": { - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.String" }, "message": { "type": "string"