Skip to content

Commit a96e064

Browse files
committed
KEP 1645: fix ServiceExport conditions example
Add missing reason in the ServiceExport conditions example and adjust the KEP to the reasons defined in the mcs-api repo. Signed-off-by: Arthur Outhenin-Chalandre <[email protected]>
1 parent 63d4f6f commit a96e064

File tree

1 file changed

+9
-20
lines changed
  • keps/sig-multicluster/1645-multi-cluster-services-api

1 file changed

+9
-20
lines changed

keps/sig-multicluster/1645-multi-cluster-services-api/README.md

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -437,22 +437,8 @@ type ServiceExportStatus struct {
437437
// +listMapKey=type
438438
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
439439
}
440-
441-
const (
442-
// ServiceExportValid means that the service referenced by this
443-
// service export has been recognized as valid by an mcs-controller.
444-
// This will be false if the service is found to be unexportable
445-
// (ExternalName, not found).
446-
ServiceExportValid = "Valid"
447-
// ServiceExportConflict means that there is a conflict between two
448-
// exports for the same Service. When "True", the condition message
449-
// should contain enough information to diagnose the conflict:
450-
// field(s) under contention, which cluster won, and why.
451-
// Users should not expect detailed per-cluster information in the
452-
// conflict message.
453-
ServiceExportConflict = "Conflict"
454-
)
455440
```
441+
456442
```yaml
457443
apiVersion: multicluster.k8s.io/v1alpha1
458444
kind: ServiceExport
@@ -461,17 +447,20 @@ metadata:
461447
namespace: my-ns
462448
status:
463449
conditions:
464-
- type: Ready
450+
- type: Accepted
465451
status: "True"
466-
message: "Service export is ready"
467452
lastTransitionTime: "2020-03-30T01:33:51Z"
468-
- type: Valid
453+
reason: Accepted
454+
message: "The ServiceExport and its Service is exportable."
455+
- type: Exported
469456
status: "True"
470-
message: "Service export is valid"
471457
lastTransitionTime: "2020-03-30T01:33:55Z"
472-
- type: Conflict
458+
reason: Exported
459+
message: "The service has been exported"
460+
- type: Conflicted
473461
status: "True"
474462
lastTransitionTime: "2020-03-30T01:33:55Z"
463+
reason: TypeConflict
475464
message: "Conflicting type. Using \"ClusterSetIP\" from oldest service export in \"cluster-1\". 2/5 clusters disagree."
476465
```
477466

0 commit comments

Comments
 (0)