Merge pull request #1867 from cdoern/build

fix MachineOSBuild printer columns
openshift · Apr 23, 2024 · bec9f0f · bec9f0f
2 parents 2cb60a1 + 4056497
commit bec9f0f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 27 deletions.
diff --git a/machineconfiguration/v1alpha1/types_machineosbuild.go b/machineconfiguration/v1alpha1/types_machineosbuild.go
@@ -16,9 +16,8 @@ import (
 // +kubebuilder:metadata:labels=openshift.io/operator-managed=
 // +kubebuilder:printcolumn:name="Prepared",type="string",JSONPath=.status.conditions[?(@.type=="Prepared")].status
 // +kubebuilder:printcolumn:name="Building",type="string",JSONPath=.status.conditions[?(@.type=="Building")].status
-// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=.status.conditions[?(@.type=="Ready")].status
+// +kubebuilder:printcolumn:name="Succeeded",type="string",JSONPath=.status.conditions[?(@.type=="Succeeded")].status
 // +kubebuilder:printcolumn:name="Interrupted",type="string",JSONPath=.status.conditions[?(@.type=="Interrupted")].status
-// +kubebuilder:printcolumn:name="Restarted",type="string",JSONPath=.status.conditions[?(@.type=="Restarted")].status
 // +kubebuilder:printcolumn:name="Failed",type="string",JSONPath=.status.conditions[?(@.type=="Failed")].status
 
 // MachineOSBuild describes a build process managed and deployed by the MCO

diff --git a/...enerated.crd-manifests/0000_80_machine-config_01_machineosbuilds-CustomNoUpgrade.crd.yaml b/...enerated.crd-manifests/0000_80_machine-config_01_machineosbuilds-CustomNoUpgrade.crd.yaml
@@ -26,15 +26,12 @@ spec:
     - jsonPath: .status.conditions[?(@.type=="Building")].status
       name: Building
       type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].status
-      name: Ready
+    - jsonPath: .status.conditions[?(@.type=="Succeeded")].status
+      name: Succeeded
       type: string
     - jsonPath: .status.conditions[?(@.type=="Interrupted")].status
       name: Interrupted
       type: string
-    - jsonPath: .status.conditions[?(@.type=="Restarted")].status
-      name: Restarted
-      type: string
     - jsonPath: .status.conditions[?(@.type=="Failed")].status
       name: Failed
       type: string

diff --git a/...ated.crd-manifests/0000_80_machine-config_01_machineosbuilds-DevPreviewNoUpgrade.crd.yaml b/...ated.crd-manifests/0000_80_machine-config_01_machineosbuilds-DevPreviewNoUpgrade.crd.yaml
@@ -26,15 +26,12 @@ spec:
     - jsonPath: .status.conditions[?(@.type=="Building")].status
       name: Building
       type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].status
-      name: Ready
+    - jsonPath: .status.conditions[?(@.type=="Succeeded")].status
+      name: Succeeded
       type: string
     - jsonPath: .status.conditions[?(@.type=="Interrupted")].status
       name: Interrupted
       type: string
-    - jsonPath: .status.conditions[?(@.type=="Restarted")].status
-      name: Restarted
-      type: string
     - jsonPath: .status.conditions[?(@.type=="Failed")].status
       name: Failed
       type: string

diff --git a/...ted.crd-manifests/0000_80_machine-config_01_machineosbuilds-TechPreviewNoUpgrade.crd.yaml b/...ted.crd-manifests/0000_80_machine-config_01_machineosbuilds-TechPreviewNoUpgrade.crd.yaml
@@ -26,15 +26,12 @@ spec:
     - jsonPath: .status.conditions[?(@.type=="Building")].status
       name: Building
       type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].status
-      name: Ready
+    - jsonPath: .status.conditions[?(@.type=="Succeeded")].status
+      name: Succeeded
       type: string
     - jsonPath: .status.conditions[?(@.type=="Interrupted")].status
       name: Interrupted
       type: string
-    - jsonPath: .status.conditions[?(@.type=="Restarted")].status
-      name: Restarted
-      type: string
     - jsonPath: .status.conditions[?(@.type=="Failed")].status
       name: Failed
       type: string

diff --git a/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests.yaml b/machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
@@ -92,15 +92,12 @@ machineosbuilds.machineconfiguration.openshift.io:
   - jsonPath: .status.conditions[?(@.type=="Building")].status
     name: Building
     type: string
-  - jsonPath: .status.conditions[?(@.type=="Ready")].status
-    name: Ready
+  - jsonPath: .status.conditions[?(@.type=="Succeeded")].status
+    name: Succeeded
     type: string
   - jsonPath: .status.conditions[?(@.type=="Interrupted")].status
     name: Interrupted
     type: string
-  - jsonPath: .status.conditions[?(@.type=="Restarted")].status
-    name: Restarted
-    type: string
   - jsonPath: .status.conditions[?(@.type=="Failed")].status
     name: Failed
     type: string

diff --git a/...gated-crd-manifests/machineosbuilds.machineconfiguration.openshift.io/OnClusterBuild.yaml b/...gated-crd-manifests/machineosbuilds.machineconfiguration.openshift.io/OnClusterBuild.yaml
@@ -26,15 +26,12 @@ spec:
     - jsonPath: .status.conditions[?(@.type=="Building")].status
       name: Building
       type: string
-    - jsonPath: .status.conditions[?(@.type=="Ready")].status
-      name: Ready
+    - jsonPath: .status.conditions[?(@.type=="Succeeded")].status
+      name: Succeeded
       type: string
     - jsonPath: .status.conditions[?(@.type=="Interrupted")].status
       name: Interrupted
       type: string
-    - jsonPath: .status.conditions[?(@.type=="Restarted")].status
-      name: Restarted
-      type: string
     - jsonPath: .status.conditions[?(@.type=="Failed")].status
       name: Failed
       type: string