Skip to content

Commit

Permalink
Fix #4312: fix timestamp can't be deserialized for IstioCondition (#4474
Browse files Browse the repository at this point in the history 
)

* fix timestamp can't be deserialized for IstioCondition

* add generated Istio files

* update CHANGELOG

Co-authored-by: yimcao <yimcao@ebay.com>
  • Loading branch information
@yimoucao
yimoucao and yimoucao committed Oct 17, 2022
1 parent 177de1c commit f243e69
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 20 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/generator-v1alpha3/cmd/generate/generate.go
View file
Expand Up @@ -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<String, Object>",
Expand Down
2 changes: 1 addition & 1 deletion extensions/istio/generator-v1beta1/cmd/generate/generate.go
View file
Expand Up @@ -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",
}
Expand Down
14 changes: 7 additions & 7 deletions .../model-v1alpha3/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java
View file
Expand Up @@ -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")
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json
View file
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions ...o/model-v1beta1/src/generated/java/io/fabric8/istio/api/meta/v1alpha1/IstioCondition.java
View file
Expand Up @@ -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")
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json
View file
Expand Up @@ -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"
Expand Down

0 comments on commit f243e69

Please sign in to comment.