diff --git a/api/v1/istio_types.go b/api/v1/istio_types.go index f22f88672..7398588a2 100644 --- a/api/v1/istio_types.go +++ b/api/v1/istio_types.go @@ -242,6 +242,7 @@ const ( // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,categories=istio-io // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="Namespace",type="string",JSONPath=".spec.namespace",description="The namespace for the control plane components." // +kubebuilder:printcolumn:name="Revisions",type="string",JSONPath=".status.revisions.total",description="Total number of IstioRevision objects currently associated with this object." // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.revisions.ready",description="Number of revisions that are ready." // +kubebuilder:printcolumn:name="In use",type="string",JSONPath=".status.revisions.inUse",description="Number of revisions that are currently being used by workloads." diff --git a/api/v1/istiocni_types.go b/api/v1/istiocni_types.go index 55e12e23d..16b73fa68 100644 --- a/api/v1/istiocni_types.go +++ b/api/v1/istiocni_types.go @@ -167,6 +167,7 @@ const ( // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,categories=istio-io // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="Namespace",type="string",JSONPath=".spec.namespace",description="The namespace of the istio-cni-node DaemonSet." // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description="Whether the Istio CNI installation is ready to handle requests." // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="The current state of this object." // +kubebuilder:printcolumn:name="Version",type="string",JSONPath=".spec.version",description="The version of the Istio CNI installation." diff --git a/api/v1/istiorevision_types.go b/api/v1/istiorevision_types.go index 713c9fce7..7b8a4d18d 100644 --- a/api/v1/istiorevision_types.go +++ b/api/v1/istiorevision_types.go @@ -176,6 +176,7 @@ const ( // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,shortName=istiorev,categories=istio-io // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="Namespace",type="string",JSONPath=".spec.namespace",description="The namespace for the control plane components." // +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type",description="Whether the control plane is installed locally or in a remote cluster." // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description="Whether the control plane installation is ready to handle requests." // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="The current state of this object." diff --git a/api/v1alpha1/ztunnel_types.go b/api/v1alpha1/ztunnel_types.go index c9857b5ed..b77665741 100644 --- a/api/v1alpha1/ztunnel_types.go +++ b/api/v1alpha1/ztunnel_types.go @@ -168,6 +168,7 @@ const ( // +kubebuilder:object:root=true // +kubebuilder:resource:scope=Cluster,categories=istio-io // +kubebuilder:subresource:status +// +kubebuilder:printcolumn:name="Namespace",type="string",JSONPath=".spec.namespace",description="The namespace for the ztunnel component." // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description="Whether the Istio ztunnel installation is ready to handle requests." // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state",description="The current state of this object." // +kubebuilder:printcolumn:name="Version",type="string",JSONPath=".spec.version",description="The version of the Istio ztunnel installation." diff --git a/bundle/manifests/sailoperator.io_istiocnis.yaml b/bundle/manifests/sailoperator.io_istiocnis.yaml index f34f6b156..6b3286d63 100644 --- a/bundle/manifests/sailoperator.io_istiocnis.yaml +++ b/bundle/manifests/sailoperator.io_istiocnis.yaml @@ -17,6 +17,10 @@ spec: scope: Cluster versions: - additionalPrinterColumns: + - description: The namespace of the istio-cni-node DaemonSet. + jsonPath: .spec.namespace + name: Namespace + type: string - description: Whether the Istio CNI installation is ready to handle requests. jsonPath: .status.conditions[?(@.type=="Ready")].status name: Ready diff --git a/bundle/manifests/sailoperator.io_istiorevisions.yaml b/bundle/manifests/sailoperator.io_istiorevisions.yaml index fcbed1cc9..f399252f6 100644 --- a/bundle/manifests/sailoperator.io_istiorevisions.yaml +++ b/bundle/manifests/sailoperator.io_istiorevisions.yaml @@ -19,6 +19,10 @@ spec: scope: Cluster versions: - additionalPrinterColumns: + - description: The namespace for the control plane components. + jsonPath: .spec.namespace + name: Namespace + type: string - description: Whether the control plane is installed locally or in a remote cluster. jsonPath: .spec.type name: Type diff --git a/bundle/manifests/sailoperator.io_istios.yaml b/bundle/manifests/sailoperator.io_istios.yaml index b0c298cc3..c407c4e44 100644 --- a/bundle/manifests/sailoperator.io_istios.yaml +++ b/bundle/manifests/sailoperator.io_istios.yaml @@ -17,6 +17,10 @@ spec: scope: Cluster versions: - additionalPrinterColumns: + - description: The namespace for the control plane components. + jsonPath: .spec.namespace + name: Namespace + type: string - description: Total number of IstioRevision objects currently associated with this object. jsonPath: .status.revisions.total diff --git a/bundle/manifests/sailoperator.io_ztunnels.yaml b/bundle/manifests/sailoperator.io_ztunnels.yaml index f9a625a37..4cb5ee7bf 100644 --- a/bundle/manifests/sailoperator.io_ztunnels.yaml +++ b/bundle/manifests/sailoperator.io_ztunnels.yaml @@ -17,6 +17,10 @@ spec: scope: Cluster versions: - additionalPrinterColumns: + - description: The namespace for the ztunnel component. + jsonPath: .spec.namespace + name: Namespace + type: string - description: Whether the Istio ztunnel installation is ready to handle requests. jsonPath: .status.conditions[?(@.type=="Ready")].status name: Ready diff --git a/chart/crds/sailoperator.io_istiocnis.yaml b/chart/crds/sailoperator.io_istiocnis.yaml index 9c3a799ec..24f737993 100644 --- a/chart/crds/sailoperator.io_istiocnis.yaml +++ b/chart/crds/sailoperator.io_istiocnis.yaml @@ -17,6 +17,10 @@ spec: scope: Cluster versions: - additionalPrinterColumns: + - description: The namespace of the istio-cni-node DaemonSet. + jsonPath: .spec.namespace + name: Namespace + type: string - description: Whether the Istio CNI installation is ready to handle requests. jsonPath: .status.conditions[?(@.type=="Ready")].status name: Ready diff --git a/chart/crds/sailoperator.io_istiorevisions.yaml b/chart/crds/sailoperator.io_istiorevisions.yaml index 58e061f40..29e9914f9 100644 --- a/chart/crds/sailoperator.io_istiorevisions.yaml +++ b/chart/crds/sailoperator.io_istiorevisions.yaml @@ -19,6 +19,10 @@ spec: scope: Cluster versions: - additionalPrinterColumns: + - description: The namespace for the control plane components. + jsonPath: .spec.namespace + name: Namespace + type: string - description: Whether the control plane is installed locally or in a remote cluster. jsonPath: .spec.type name: Type diff --git a/chart/crds/sailoperator.io_istios.yaml b/chart/crds/sailoperator.io_istios.yaml index 57565729c..a15a99286 100644 --- a/chart/crds/sailoperator.io_istios.yaml +++ b/chart/crds/sailoperator.io_istios.yaml @@ -17,6 +17,10 @@ spec: scope: Cluster versions: - additionalPrinterColumns: + - description: The namespace for the control plane components. + jsonPath: .spec.namespace + name: Namespace + type: string - description: Total number of IstioRevision objects currently associated with this object. jsonPath: .status.revisions.total diff --git a/chart/crds/sailoperator.io_ztunnels.yaml b/chart/crds/sailoperator.io_ztunnels.yaml index 48bca45eb..e5b1e8271 100644 --- a/chart/crds/sailoperator.io_ztunnels.yaml +++ b/chart/crds/sailoperator.io_ztunnels.yaml @@ -17,6 +17,10 @@ spec: scope: Cluster versions: - additionalPrinterColumns: + - description: The namespace for the ztunnel component. + jsonPath: .spec.namespace + name: Namespace + type: string - description: Whether the Istio ztunnel installation is ready to handle requests. jsonPath: .status.conditions[?(@.type=="Ready")].status name: Ready