From 3fd1882e435a087a1234e3b0f011bebde265aea9 Mon Sep 17 00:00:00 2001 From: Dario Tranchitella Date: Fri, 27 Jun 2025 17:11:31 +0200 Subject: [PATCH] fix: wrong jsonpath for installed version (#857) Signed-off-by: Dario Tranchitella --- api/v1alpha1/tenantcontrolplane_types.go | 2 +- charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v1alpha1/tenantcontrolplane_types.go b/api/v1alpha1/tenantcontrolplane_types.go index 7155d3e..287c56f 100644 --- a/api/v1alpha1/tenantcontrolplane_types.go +++ b/api/v1alpha1/tenantcontrolplane_types.go @@ -305,7 +305,7 @@ type TenantControlPlaneSpec struct { //+kubebuilder:subresource:scale:specpath=.spec.controlPlane.deployment.replicas,statuspath=.status.kubernetesResources.deployment.replicas,selectorpath=.status.kubernetesResources.deployment.selector //+kubebuilder:resource:categories=kamaji,shortName=tcp //+kubebuilder:printcolumn:name="Version",type="string",JSONPath=".spec.kubernetes.version",description="Kubernetes version" -//+kubebuilder:printcolumn:name="Installed Version",type="string",JSONPath=".status.kubernetes.version",description="The actual installed Kubernetes version from status" +//+kubebuilder:printcolumn:name="Installed Version",type="string",JSONPath=".status.kubernetesResources.version.version",description="The actual installed Kubernetes version from status" //+kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.kubernetesResources.version.status",description="Status" //+kubebuilder:printcolumn:name="Control-Plane endpoint",type="string",JSONPath=".status.controlPlaneEndpoint",description="Tenant Control Plane Endpoint (API server)" //+kubebuilder:printcolumn:name="Kubeconfig",type="string",JSONPath=".status.kubeconfig.admin.secretName",description="Secret which contains admin kubeconfig" diff --git a/charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml b/charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml index f845daa..7daeb97 100644 --- a/charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml +++ b/charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml @@ -24,7 +24,7 @@ spec: name: Version type: string - description: The actual installed Kubernetes version from status - jsonPath: .status.kubernetes.version + jsonPath: .status.kubernetesResources.version.version name: Installed Version type: string - description: Status