Skip to content

Commit c549035

Browse files
committed
add provisionedWorkspace field to kubeconfig status
On-behalf-of: @SAP [email protected]
1 parent 99f7ce4 commit c549035

File tree

9 files changed

+46
-12
lines changed

9 files changed

+46
-12
lines changed

config/crd/bases/operator.kcp.io_kubeconfigs.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,14 @@ spec:
358358
type: object
359359
status:
360360
description: KubeconfigStatus defines the observed state of Kubeconfig
361+
properties:
362+
authorization:
363+
properties:
364+
provisionedWorkspace:
365+
type: string
366+
required:
367+
- provisionedWorkspace
368+
type: object
361369
type: object
362370
type: object
363371
served: true

internal/resources/kubeconfig/certificate.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package kubeconfig
1919
import (
2020
certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
2121
certmanagermetav1 "github.com/cert-manager/cert-manager/pkg/apis/meta/v1"
22+
2223
"k8s.io/apimachinery/pkg/util/sets"
2324

2425
"github.com/kcp-dev/kcp-operator/internal/reconciling"

sdk/apis/operator/v1alpha1/kubeconfig_types.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@ type KubeconfigClusterRoleBindings struct {
6464

6565
// KubeconfigStatus defines the observed state of Kubeconfig
6666
type KubeconfigStatus struct {
67-
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
68-
// Important: Run "make" to regenerate code after modifying this file
67+
Authorization *KubeconfigAuthorizationStatus `json:"authorization,omitempty"`
68+
}
69+
70+
type KubeconfigAuthorizationStatus struct {
71+
ProvisionedWorkspace string `json:"provisionedWorkspace"`
6972
}
7073

7174
// +genclient

sdk/apis/operator/v1alpha1/zz_generated.deepcopy.go

Lines changed: 21 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/applyconfiguration/operator/v1alpha1/kubeconfig.go

Lines changed: 4 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/applyconfiguration/utils.go

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/e2e/frontproxies/frontproxies_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"time"
2626

2727
"github.com/go-logr/logr"
28+
"github.com/kcp-dev/logicalcluster/v3"
2829

2930
corev1 "k8s.io/api/core/v1"
3031
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,7 +34,6 @@ import (
3334

3435
operatorv1alpha1 "github.com/kcp-dev/kcp-operator/sdk/apis/operator/v1alpha1"
3536
"github.com/kcp-dev/kcp-operator/test/utils"
36-
"github.com/kcp-dev/logicalcluster/v3"
3737
)
3838

3939
func TestCreateFrontProxy(t *testing.T) {

test/e2e/kubeconfig-rbac/frontproxies_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"time"
2626

2727
"github.com/go-logr/logr"
28-
2928
kcptenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
3029
"github.com/kcp-dev/logicalcluster/v3"
30+
3131
corev1 "k8s.io/api/core/v1"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/types"

test/e2e/rootshards/rootshards_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"time"
2525

2626
"github.com/go-logr/logr"
27+
"github.com/kcp-dev/logicalcluster/v3"
2728

2829
corev1 "k8s.io/api/core/v1"
2930
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -32,7 +33,6 @@ import (
3233

3334
operatorv1alpha1 "github.com/kcp-dev/kcp-operator/sdk/apis/operator/v1alpha1"
3435
"github.com/kcp-dev/kcp-operator/test/utils"
35-
"github.com/kcp-dev/logicalcluster/v3"
3636
)
3737

3838
func TestCreateRootShard(t *testing.T) {

0 commit comments

Comments
 (0)