Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #4312: fix timestamp can't be deserialized for IstioCondition #4474

Merged
merged 3 commits into from
Oct 17, 2022
Merged

Fix #4312: fix timestamp can't be deserialized for IstioCondition #4474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42042c2
fix timestamp can't be deserialized for IstioCondition
yimoucao Oct 3, 2022
a48bb01
add generated Istio files
yimoucao Oct 10, 2022
d2cc9e8
update CHANGELOG
yimoucao Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
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
Open in desktop
Original file line number Diff line number Diff line change
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
Open in desktop
Original file line number Diff line number Diff line change
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
Open in desktop
Original file line number Diff line number Diff line change
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
Open in desktop
Original file line number Diff line number Diff line change
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
Open in desktop
Original file line number Diff line number Diff line change
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
Open in desktop
Original file line number Diff line number Diff line change
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