Skip to content

Commit

Permalink
updated to k8s v1.27.11
Browse files Browse the repository at this point in the history
fix wait.Poll deprecation

skip PSP's as they are dropped in v1.25
  • Loading branch information
ibrokethecloud authored and bk201 committed Mar 7, 2024
1 parent a242356 commit f7a9866
Show file tree
Hide file tree
Showing 4,485 changed files with 597,760 additions and 574,063 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 1 addition & 2 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ RUN mkdir -p /go/src/github.com/kubernetes && \
cd /go/src/github.com/kubernetes && \
git clone https://github.com/kubernetes/kubernetes && \
cd kubernetes && \
git checkout v1.23.7 && \
make generated_files
git checkout v1.27.11

# -- for dapper
ENV DAPPER_RUN_ARGS --privileged --network host -v /run/containerd/containerd.sock:/run/containerd/containerd.sock
Expand Down
3 changes: 3 additions & 0 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ To ensure that the `creationTimestamp` is honored from the exported objects we h
* `k8s.io/apiserver/pkg/registry/rest/meta.go`
```go
// FillObjectMetaSystemFields populates fields that are managed by the system on ObjectMeta.
// we need to honor the creation timestamp in the bundle so we need to ensure
// the creation timestamp is only set if it is not already present on the object
func FillObjectMetaSystemFields(meta metav1.Object) {
if meta.GetCreationTimestamp().String() == "" {
meta.SetCreationTimestamp(metav1.Now())
Expand All @@ -42,6 +44,7 @@ func FillObjectMetaSystemFields(meta metav1.Object) {
The `support-bundle-kit simulator` runs a minimal virtual-kubelet to support log streaming from the support bundle.
The simulator listens on localhost, to ensure kubectl and other cli tooling works natively,
the routes in the apiserver have been patched to update NodeAddress to localhost.
The change needs to be performed in method `func LogLocation`

* `k8s.io/kubernetes/pkg/registry/core/pod/strategy.go`

Expand Down
267 changes: 130 additions & 137 deletions go.mod

Large diffs are not rendered by default.

747 changes: 365 additions & 382 deletions go.sum

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions pkg/simulator/objects/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ var (
}

skippedKinds = map[string]bool{
"ComponentStatus": true,
"ComponentStatus": true,
"PodSecurityPolicy": true,
}

cacheMap = make(map[schema.GroupVersionKind]*meta.RESTMapping)
Expand Down Expand Up @@ -361,8 +362,8 @@ func (o *ObjectManager) FetchObject(obj runtime.Object) (*unstructured.Unstructu

// WaitForNamespaces ensures apiserver is ready and namespaces can be listed before it times out
func (o *ObjectManager) WaitForNamespaces(timeout time.Duration) error {
err := wait.Poll(5*time.Second, timeout, func() (bool, error) {
ns, _ := o.kc.CoreV1().Namespaces().List(o.ctx, metav1.ListOptions{})
err := wait.PollUntilContextTimeout(o.ctx, 5*time.Second, timeout, true, func(ctx context.Context) (bool, error) {
ns, _ := o.kc.CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
if ns != nil && len(ns.Items) != 0 {
return true, nil
}
Expand Down
23 changes: 20 additions & 3 deletions vendor/cloud.google.com/go/compute/metadata/metadata.go

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

114 changes: 114 additions & 0 deletions vendor/cloud.google.com/go/compute/metadata/retry.go

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

26 changes: 26 additions & 0 deletions vendor/cloud.google.com/go/compute/metadata/retry_linux.go

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

8 changes: 5 additions & 3 deletions vendor/github.com/Azure/go-autorest/autorest/adal/README.md

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

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

21 changes: 13 additions & 8 deletions vendor/github.com/Azure/go-autorest/autorest/adal/sender.go

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

Loading

0 comments on commit f7a9866

Please sign in to comment.