Show DefaultStrategy as a new printer column for CredentialIssuer

apis/concierge/config/v1alpha1/types_credentialissuer.go.tmpl

@@ -216,6 +216,7 @@ type ImpersonationProxyInfo struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=pinniped,scope=Cluster
 // +kubebuilder:printcolumn:name="ProxyMode",type=string,JSONPath=`.spec.impersonationProxy.mode`
+// +kubebuilder:printcolumn:name="DefaultStrategy",type=string,JSONPath=`.status.strategies[?(@.status == "Success")].type`
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:subresource:status
 type CredentialIssuer struct {

deploy/concierge/config.concierge.pinniped.dev_credentialissuers.yaml

@@ -22,6 +22,9 @@ spec:
     - jsonPath: .spec.impersonationProxy.mode
       name: ProxyMode
       type: string
+    - jsonPath: .status.strategies[?(@.status == "Success")].type
+      name: DefaultStrategy
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date

generated/1.17/apis/concierge/config/v1alpha1/types_credentialissuer.go

@@ -216,6 +216,7 @@ type ImpersonationProxyInfo struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=pinniped,scope=Cluster
 // +kubebuilder:printcolumn:name="ProxyMode",type=string,JSONPath=`.spec.impersonationProxy.mode`
+// +kubebuilder:printcolumn:name="DefaultStrategy",type=string,JSONPath=`.status.strategies[?(@.status == "Success")].type`
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:subresource:status
 type CredentialIssuer struct {

generated/1.17/crds/config.concierge.pinniped.dev_credentialissuers.yaml

@@ -22,6 +22,9 @@ spec:
     - jsonPath: .spec.impersonationProxy.mode
       name: ProxyMode
       type: string
+    - jsonPath: .status.strategies[?(@.status == "Success")].type
+      name: DefaultStrategy
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date

generated/1.18/apis/concierge/config/v1alpha1/types_credentialissuer.go

@@ -216,6 +216,7 @@ type ImpersonationProxyInfo struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=pinniped,scope=Cluster
 // +kubebuilder:printcolumn:name="ProxyMode",type=string,JSONPath=`.spec.impersonationProxy.mode`
+// +kubebuilder:printcolumn:name="DefaultStrategy",type=string,JSONPath=`.status.strategies[?(@.status == "Success")].type`
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:subresource:status
 type CredentialIssuer struct {

generated/1.18/crds/config.concierge.pinniped.dev_credentialissuers.yaml

@@ -22,6 +22,9 @@ spec:
     - jsonPath: .spec.impersonationProxy.mode
       name: ProxyMode
       type: string
+    - jsonPath: .status.strategies[?(@.status == "Success")].type
+      name: DefaultStrategy
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date

generated/1.19/apis/concierge/config/v1alpha1/types_credentialissuer.go

@@ -216,6 +216,7 @@ type ImpersonationProxyInfo struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=pinniped,scope=Cluster
 // +kubebuilder:printcolumn:name="ProxyMode",type=string,JSONPath=`.spec.impersonationProxy.mode`
+// +kubebuilder:printcolumn:name="DefaultStrategy",type=string,JSONPath=`.status.strategies[?(@.status == "Success")].type`
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:subresource:status
 type CredentialIssuer struct {

generated/1.19/crds/config.concierge.pinniped.dev_credentialissuers.yaml

@@ -22,6 +22,9 @@ spec:
     - jsonPath: .spec.impersonationProxy.mode
       name: ProxyMode
       type: string
+    - jsonPath: .status.strategies[?(@.status == "Success")].type
+      name: DefaultStrategy
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date

generated/1.20/apis/concierge/config/v1alpha1/types_credentialissuer.go

@@ -216,6 +216,7 @@ type ImpersonationProxyInfo struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=pinniped,scope=Cluster
 // +kubebuilder:printcolumn:name="ProxyMode",type=string,JSONPath=`.spec.impersonationProxy.mode`
+// +kubebuilder:printcolumn:name="DefaultStrategy",type=string,JSONPath=`.status.strategies[?(@.status == "Success")].type`
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:subresource:status
 type CredentialIssuer struct {

generated/1.20/crds/config.concierge.pinniped.dev_credentialissuers.yaml

@@ -22,6 +22,9 @@ spec:
     - jsonPath: .spec.impersonationProxy.mode
       name: ProxyMode
       type: string
+    - jsonPath: .status.strategies[?(@.status == "Success")].type
+      name: DefaultStrategy
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date

generated/latest/apis/concierge/config/v1alpha1/types_credentialissuer.go

@@ -216,6 +216,7 @@ type ImpersonationProxyInfo struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=pinniped,scope=Cluster
 // +kubebuilder:printcolumn:name="ProxyMode",type=string,JSONPath=`.spec.impersonationProxy.mode`
+// +kubebuilder:printcolumn:name="DefaultStrategy",type=string,JSONPath=`.status.strategies[?(@.status == "Success")].type`
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 // +kubebuilder:subresource:status
 type CredentialIssuer struct {

test/integration/kube_api_discovery_test.go

@@ -430,10 +430,14 @@ func TestCRDAdditionalPrinterColumns_Parallel(t *testing.T) {
 		addSuffix("credentialissuers.config.concierge"): {
 			"v1alpha1": []apiextensionsv1.CustomResourceColumnDefinition{
 				{Name: "ProxyMode", Type: "string", JSONPath: ".spec.impersonationProxy.mode"},
-				// CredentialIssuers status is a list of strategies, each with its own status. Unfortunately,
+				// CredentialIssuer status is a list of strategies, each with its own status. Unfortunately,
 				// AdditionalPrinterColumns cannot show multiple results, e.g. a list of strategy types where
 				// the status is equal to Successful. See https://github.com/kubernetes/kubernetes/issues/67268.
-				// So we don't show any status as a AdditionalPrinterColumn at the moment.
+				// Although this selector can evaluate to multiple results, the kubectl implementation of JSONPath
+				// will always only show the first result. Thus, this column will show the first successful strategy
+				// type, which is the same thing that `pinniped get kubeconfig` looks for, so the value of this
+				// column represents the current default strategy that will be used by `pinniped get kubeconfig`.
+				{Name: "DefaultStrategy", Type: "string", JSONPath: `.status.strategies[?(@.status == "Success")].type`},
 				{Name: "Age", Type: "date", JSONPath: ".metadata.creationTimestamp"},
 			},
 		},