Skip to content

Commit

Permalink
Move network.config conditions to GA
Browse files Browse the repository at this point in the history
ca64d33 promoted live migration to GA but it missed
graduating the status.condtions in network.config.

Signed-off-by: Patryk Diak <pdiak@redhat.com>
  • Loading branch information
kyrtapz committed Feb 6, 2024
1 parent 7162acc commit 28ce3d8
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 3 deletions.
75 changes: 75 additions & 0 deletions config/v1/0000_10_config-operator_01_network-Default.crd.yaml
Expand Up @@ -147,6 +147,81 @@ spec:
clusterNetworkMTU:
description: ClusterNetworkMTU is the MTU for inter-pod networking.
type: integer
conditions:
description: 'conditions represents the observations of a network.config
current state. Known .status.conditions.type are: "NetworkTypeMigrationInProgress",
"NetworkTypeMigrationMTUReady", "NetworkTypeMigrationTargetCNIAvailable",
"NetworkTypeMigrationTargetCNIInUse" and "NetworkTypeMigrationOriginalCNIPurged"'
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
migration:
description: Migration contains the cluster network migration configuration.
properties:
Expand Down
10 changes: 8 additions & 2 deletions config/v1/stable.network.testsuite.yaml
Expand Up @@ -12,7 +12,7 @@ tests:
apiVersion: config.openshift.io/v1
kind: Network
spec: {}
- name: Should not be able to set status conditions
- name: Should be able to set status conditions
initial: |
apiVersion: config.openshift.io/v1
kind: Network
Expand All @@ -28,4 +28,10 @@ tests:
apiVersion: config.openshift.io/v1
kind: Network
spec: {}
status: {}
status:
conditions:
- type: NetworkTypeMigrationInProgress
status: "False"
reason: "Reason"
message: "Message"
lastTransitionTime: "2023-10-25T12:00:00Z"
1 change: 0 additions & 1 deletion config/v1/types_network.go
Expand Up @@ -95,7 +95,6 @@ type NetworkStatus struct {
// +patchStrategy=merge
// +listType=map
// +listMapKey=type
// +openshift:enable:FeatureSets=CustomNoUpgrade;TechPreviewNoUpgrade
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
}

Expand Down

0 comments on commit 28ce3d8

Please sign in to comment.