Skip to content

Name: turn into string alias #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sttts wants to merge 42 commits into
base: kcp-feature-logical-clusters-1.24-v3
Choose a base branch
from
Open

Name: turn into string alias #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
43874be
REVERT: hack apiextentions-apiserver/hack/update-codegen.sh
p0lyn0mial Dec 4, 2022
374bb85
REVERT: fake go mod tidy
p0lyn0mial Dec 4, 2022
0fb1f3e
UPSTREAM: <carry>: generate cluster-aware clients for apiextensions
p0lyn0mial Dec 4, 2022
ce32033
apiextensions-apiserver/pkg/controller: switch to v3
p0lyn0mial Dec 5, 2022
45e2b99
REVERT: go mod changes
p0lyn0mial Dec 5, 2022
da67544
UPSTREAM: <carry>: generate cluster-aware clients for apiexte
p0lyn0mial Dec 5, 2022
55c411d
apiextensions-apiserver/pkg: switch to v3
p0lyn0mial Dec 5, 2022
75b38ee
staging/src/k8s.io/apiserver/pkg: switch to v3
p0lyn0mial Dec 5, 2022
82c1c62
pkg/controller: switch to v3
p0lyn0mial Dec 5, 2022
711667a
cluster: switch to v3
p0lyn0mial Dec 5, 2022
452f9ef
cmd: switch to v3
p0lyn0mial Dec 5, 2022
ea7d81a
plugin/pkg/admission: switch to v3
p0lyn0mial Dec 5, 2022
b54ec7c
REVERT: pin github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-2022120511…
p0lyn0mial Dec 5, 2022
560822b
REVERT: vendor github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-2022120…
p0lyn0mial Dec 5, 2022
cc5b462
context_cluster: rename Cluster.Name to Cluster.Path and switch to lo…
p0lyn0mial Dec 5, 2022
0382b27
pin github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084c…
p0lyn0mial Dec 5, 2022
2ec841b
pin github.com/p0lyn0mial/client-go v0.0.0-20221205103028-e6b916c38744
p0lyn0mial Dec 5, 2022
0cce47f
vendor github.com/p0lyn0mial/client-go v0.0.0-20221205103028-e6b916c3…
p0lyn0mial Dec 5, 2022
6741222
kube-aggregator: ./hack/update-codegen.sh
p0lyn0mial Dec 5, 2022
d1afdd6
metrics: ./hack/update-codegen.sh
p0lyn0mial Dec 5, 2022
5397170
apiextensions-apiserver/pkg/controller: use logicalcluster.Path
p0lyn0mial Dec 5, 2022
13feaae
context_cluster: bring back Cluster.Name
p0lyn0mial Dec 5, 2022
91ba653
pin github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205133720-98a…
p0lyn0mial Dec 5, 2022
ecd2906
vendor github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205133720-…
p0lyn0mial Dec 5, 2022
2a8aebe
SQUASH: /apiextensions-apiserver
p0lyn0mial Dec 5, 2022
54ae042
pin github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21…
p0lyn0mial Dec 5, 2022
8257051
pin github.com/p0lyn0mial/client-go v0.0.0-20221205142109-65bc4b8b4841
p0lyn0mial Dec 5, 2022
b2c9c8f
SQUASH: UPSTREAM: <carry>: generate cluster-aware clients for apiexte…
p0lyn0mial Dec 5, 2022
f8e03ce
SQUASH: staging/src/k8s.io/apiserver/pkg: switch to v3
p0lyn0mial Dec 5, 2022
01cde58
SQUASH: apiextensions-apiserver/pkg: switch to v3
p0lyn0mial Dec 5, 2022
2979013
SQUASH: staging/src/k8s.io/apiserver/pkg: switch to v3
p0lyn0mial Dec 5, 2022
16a50ff
apiserver/pkg/admission: switch to v3
p0lyn0mial Dec 5, 2022
09b8ede
SQUASH: pkg/controller: switch to v3
p0lyn0mial Dec 5, 2022
05a5352
SQUASH: staging/src/k8s.io/apiserver/pkg: switch to v3
p0lyn0mial Dec 5, 2022
97a23b5
SQUASH: plugin/pkg/admission: switch to v3
p0lyn0mial Dec 5, 2022
7773c95
SQUASH: apiextensions-apiserver/pkg: switch to v3
p0lyn0mial Dec 5, 2022
8518f61
kube-aggregator/pkg: switch to v3
p0lyn0mial Dec 5, 2022
d5af162
pin github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb
p0lyn0mial Dec 5, 2022
a0f613d
SQUASH: pkg/controller: switch to v3
p0lyn0mial Dec 5, 2022
0f8d39e
SQUASH: cmd: switch to v3
p0lyn0mial Dec 5, 2022
dd96cb1
pkg/genericcontrolplane: switch to v3
p0lyn0mial Dec 6, 2022
c15c437
Name: turn into string alias
sttts Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
206 changes: 206 additions & 0 deletions LICENSES/vendor/github.com/kcp-dev/logicalcluster/v3/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion cluster/gce/gci/audit_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"path/filepath"
"testing"

"github.com/kcp-dev/logicalcluster/v2"
"k8s.io/apiserver/pkg/apis/audit"
auditinstall "k8s.io/apiserver/pkg/apis/audit/install"
auditpkg "k8s.io/apiserver/pkg/audit"
Expand Down
2 changes: 1 addition & 1 deletion cmd/kube-apiserver/app/aggregator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"strings"
"sync"

"github.com/kcp-dev/logicalcluster/v2"
"github.com/kcp-dev/logicalcluster/v3"
"k8s.io/klog/v2"

apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
Expand Down
2 changes: 0 additions & 2 deletions cmd/kube-controller-manager/app/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ limitations under the License.
// Package app implements a server that runs a set of active
// components. This includes replication controllers, service endpoints and
// nodes.
//
package app

import (
Expand All @@ -28,7 +27,6 @@ import (
"strings"
"time"

"github.com/kcp-dev/logicalcluster/v2"
"k8s.io/klog/v2"

v1 "k8s.io/api/core/v1"
Expand Down
11 changes: 7 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ require (
github.com/heketi/heketi v10.3.0+incompatible
github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect
github.com/ishidawataru/sctp v0.0.0-20190723014705-7c296d48a2b5
github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be
github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6
github.com/kcp-dev/apimachinery v0.0.0-20221205120156-b90e084cbd56
github.com/kcp-dev/client-go v0.0.0-20221205150201-dfa4fc4b06bb
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1
github.com/kcp-dev/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226
github.com/libopenstorage/openstorage v1.0.0
github.com/lithammer/dedent v1.1.0
github.com/lpabon/godbc v0.1.1 // indirect
Expand Down Expand Up @@ -302,9 +303,11 @@ replace (
github.com/julienschmidt/httprouter => github.com/julienschmidt/httprouter v1.3.0
github.com/jung-kurt/gofpdf => github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5
github.com/karrick/godirwalk => github.com/karrick/godirwalk v1.16.1
github.com/kcp-dev/apimachinery => github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be
github.com/kcp-dev/client-go => github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6

github.com/kcp-dev/apimachinery => github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56
github.com/kcp-dev/client-go => github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb
github.com/kcp-dev/logicalcluster/v2 => github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1
github.com/kcp-dev/logicalcluster/v3 => github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226
github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.5.0
github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0
github.com/konsorten/go-windows-terminal-sequences => github.com/konsorten/go-windows-terminal-sequences v1.0.2
Expand Down
10 changes: 6 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,6 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw=
github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be h1:2uDzJ896+ojtzgr9HJL8+tZEoqhq8blwymGinWFrQ6E=
github.com/kcp-dev/apimachinery v0.0.0-20221102195355-d65878bc16be/go.mod h1:qnvUHkdxOrNzX17yX+z8r81CZEBuFdveNzWqFlwZ55w=
github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6 h1:Dxst7pq601Y7zNhSAec7LoBySHFWvD+djLTqoTmHrL0=
github.com/kcp-dev/client-go v0.0.0-20221025140308-a18ccea074a6/go.mod h1:Qmq1OxUOSdVQ8YIGnjbya5Xt04KMJ5fN41QvErl/XnI=
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s=
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
Expand Down Expand Up @@ -356,6 +352,12 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.m
github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU=
github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56 h1:XxRBHVw8nfR2hS4PrwpfLmGTFHW4fpRmK2o6wtLY5k0=
github.com/p0lyn0mial/apimachinery v0.0.0-20221205120156-b90e084cbd56/go.mod h1:XEv+UQlH7NT41TOZYRK+LRo2URcwYjP8GQqOqtBk0RI=
github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb h1:hxhAOWnBMTkLdxIJbvKh0jUKkZp51t7/+bbdxYhb67g=
github.com/p0lyn0mial/client-go v0.0.0-20221205150201-dfa4fc4b06bb/go.mod h1:kLMJgfd5gpWZv2y42vrn1W7WgeFpBlDV3vcJCqx4qxk=
github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226 h1:zS7dh4JYSew1wAimDQjOQLndo/65hwXzeZHnt0Kl5IM=
github.com/p0lyn0mial/logicalcluster/v3 v3.0.0-20221205140724-b21d40759226/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/certificates/rootcacertpublisher/publisher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"time"

kcpcache "github.com/kcp-dev/apimachinery/pkg/cache"
kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes"
kcpcorev1informers "github.com/kcp-dev/client-go/informers/core/v1"
kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes"
kcpcorev1listers "github.com/kcp-dev/client-go/listers/core/v1"
"github.com/kcp-dev/logicalcluster/v2"
"github.com/kcp-dev/logicalcluster/v3"
v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -222,7 +222,7 @@ func (c *Publisher) syncNamespace(ctx context.Context, key string) (err error) {

switch {
case apierrors.IsNotFound(err):
_, err = c.client.Cluster(clusterName).CoreV1().ConfigMaps(name).Create(ctx, &v1.ConfigMap{
_, err = c.client.Cluster(clusterName.Path()).CoreV1().ConfigMaps(name).Create(ctx, &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Name: RootCACertConfigMapName,
Annotations: map[string]string{DescriptionAnnotation: Description},
Expand Down Expand Up @@ -257,7 +257,7 @@ func (c *Publisher) syncNamespace(ctx context.Context, key string) (err error) {
}
cm.Annotations[DescriptionAnnotation] = Description

_, err = c.client.Cluster(clusterName).CoreV1().ConfigMaps(name).Update(ctx, cm, metav1.UpdateOptions{})
_, err = c.client.Cluster(clusterName.Path()).CoreV1().ConfigMaps(name).Update(ctx, cm, metav1.UpdateOptions{})
return err
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"time"

kcpcache "github.com/kcp-dev/apimachinery/pkg/cache"
kcprbacclient "github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1"
kcprbacinformers "github.com/kcp-dev/client-go/informers/rbac/v1"
kcprbacclient "github.com/kcp-dev/client-go/kubernetes/typed/rbac/v1"
kcprbaclisters "github.com/kcp-dev/client-go/listers/rbac/v1"
"github.com/kcp-dev/logicalcluster/v2"
"github.com/kcp-dev/logicalcluster/v3"

rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/equality"
Expand Down Expand Up @@ -145,7 +145,7 @@ func (c *ClusterRoleAggregationController) applyClusterRoles(ctx context.Context
WithRules(toApplyPolicyRules(newPolicyRules)...)

opts := metav1.ApplyOptions{FieldManager: "clusterrole-aggregation-controller", Force: true}
_, err := c.clusterRoleClient.ClusterRoles().Cluster(logicalcluster.From(sharedClusterRole)).Apply(ctx, clusterRoleApply, opts)
_, err := c.clusterRoleClient.ClusterRoles().Cluster(logicalcluster.From(sharedClusterRole).Path()).Apply(ctx, clusterRoleApply, opts)
return err
}

Expand All @@ -155,7 +155,7 @@ func (c *ClusterRoleAggregationController) updateClusterRoles(ctx context.Contex
for _, rule := range newPolicyRules {
clusterRole.Rules = append(clusterRole.Rules, *rule.DeepCopy())
}
_, err := c.clusterRoleClient.ClusterRoles().Cluster(logicalcluster.From(sharedClusterRole)).Update(ctx, clusterRole, metav1.UpdateOptions{})
_, err := c.clusterRoleClient.ClusterRoles().Cluster(logicalcluster.From(sharedClusterRole).Path()).Update(ctx, clusterRole, metav1.UpdateOptions{})
return err
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/garbagecollector/garbagecollector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sync"
"time"

"github.com/kcp-dev/logicalcluster/v2"
"github.com/kcp-dev/logicalcluster/v3"

v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
Loading