Skip to content

Commit

Permalink
Merge pull request #1372 from vmware-tanzu/jtc/support-k8s-0.26-and-b…
Browse files Browse the repository at this point in the history
…ump-generated-code

bump k8s deps to 0.26 and bump generated code to include 1.26
  • Loading branch information
cfryanr authored Jan 19, 2023
2 parents 3b46547 + 23f6dd4 commit 0ffd01d
Show file tree
Hide file tree
Showing 226 changed files with 35,241 additions and 355 deletions.
9 changes: 4 additions & 5 deletions cmd/pinniped-server/main.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2021-2022 the Pinniped contributors. All Rights Reserved.
// Copyright 2021-2023 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

// Package main is the combined entrypoint for all Pinniped server components.
Expand All @@ -12,13 +12,12 @@ import (
"os"
"path/filepath"

"k8s.io/apimachinery/pkg/util/sets"

// this side effect import ensures that we use fipsonly crypto in fips_strict mode.
concierge "go.pinniped.dev/internal/concierge/server"
// this side effect import ensures that we use fipsonly crypto in fips_strict mode.
_ "go.pinniped.dev/internal/crypto/ptls"
lua "go.pinniped.dev/internal/localuserauthenticator"
"go.pinniped.dev/internal/plog"
"go.pinniped.dev/internal/psets"
supervisor "go.pinniped.dev/internal/supervisor/server"
)

Expand All @@ -38,7 +37,7 @@ func main() {
}
binary := filepath.Base(os.Args[0])
if subcommands[binary] == nil {
fail(fmt.Errorf("must be invoked as one of %v, not %q", sets.StringKeySet(subcommands).List(), binary))
fail(fmt.Errorf("must be invoked as one of %v, not %q", psets.StringKeySet(subcommands).List(), binary))
}
subcommands[binary]()
}
4 changes: 2 additions & 2 deletions generated/1.22/apis/go.mod

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

8 changes: 4 additions & 4 deletions generated/1.22/apis/go.sum

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

4 changes: 2 additions & 2 deletions generated/1.22/client/go.mod

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

12 changes: 6 additions & 6 deletions generated/1.22/client/go.sum

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

4 changes: 2 additions & 2 deletions generated/1.23/apis/go.mod

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

21 changes: 12 additions & 9 deletions generated/1.23/apis/go.sum

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

4 changes: 2 additions & 2 deletions generated/1.23/client/go.mod

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

25 changes: 14 additions & 11 deletions generated/1.23/client/go.sum

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

4 changes: 2 additions & 2 deletions generated/1.24/apis/go.mod

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

Loading

0 comments on commit 0ffd01d

Please sign in to comment.