Skip to content
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.

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

Introduce versioning options to all extensions #1075

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

TristonianJones
Copy link
Collaborator

Whether extensions support versioning or not, all extensions now support a version option
in order to remain insulated from versioned features added at a later date.

@jpbetz
Copy link
Collaborator

jpbetz commented Dec 4, 2024

LGTM. Thanks for doing this!

@TristonianJones TristonianJones merged commit 000958d into google:master Dec 5, 2024
2 checks passed
@TristonianJones TristonianJones deleted the all-ext-versions branch December 5, 2024 02:53
seirl pushed a commit to seirl/cel-go that referenced this pull request Dec 5, 2024
matthchr added a commit to Azure/azure-service-operator that referenced this pull request Feb 3, 2025
It caused the following test failure:
[controller:test-cover] /go/pkg/mod/k8s.io/apiserver@v0.32.0/pkg/cel/environment/base.go:176:19:
cannot use ext.TwoVarComprehensions (value of type func(options ...ext.TwoVarComprehensionsOption)
"github.com/google/cel-go/cel".EnvOption) as func() "github.com/google/cel-go/cel".EnvOption value
in argument to UnversionedLib

This stems from this change in CEL: google/cel-go#1075

It is due to:
https://github.com/kubernetes/apiserver/blob/master/pkg/cel/environment/base.go#L268
where kube-apiserver purposefully breaks their complication if CEL starts supporting variadic
versioning args (which it just did in 0.23.0).
matthchr added a commit to Azure/azure-service-operator that referenced this pull request Feb 5, 2025
It caused the following test failure:
[controller:test-cover] /go/pkg/mod/k8s.io/apiserver@v0.32.0/pkg/cel/environment/base.go:176:19:
cannot use ext.TwoVarComprehensions (value of type func(options ...ext.TwoVarComprehensionsOption)
"github.com/google/cel-go/cel".EnvOption) as func() "github.com/google/cel-go/cel".EnvOption value
in argument to UnversionedLib

This stems from this change in CEL: google/cel-go#1075

It is due to:
https://github.com/kubernetes/apiserver/blob/master/pkg/cel/environment/base.go#L268
where kube-apiserver purposefully breaks their complication if CEL starts supporting variadic
versioning args (which it just did in 0.23.0).
github-merge-queue bot pushed a commit to Azure/azure-service-operator that referenced this pull request Feb 5, 2025
* Bump the go-deps group across 2 directories with 2 updates

Bumps the go-deps group with 2 updates in the /v2 directory: [github.com/google/cel-go](https://github.com/google/cel-go) and [github.com/samber/lo](https://github.com/samber/lo).
Bumps the go-deps group with 2 updates in the /v2/cmd/asoctl directory: [github.com/google/cel-go](https://github.com/google/cel-go) and [github.com/samber/lo](https://github.com/samber/lo).


Updates `github.com/google/cel-go` from 0.22.1 to 0.23.2
- [Release notes](https://github.com/google/cel-go/releases)
- [Commits](google/cel-go@v0.22.1...v0.23.2)

Updates `github.com/samber/lo` from 1.47.0 to 1.49.1
- [Release notes](https://github.com/samber/lo/releases)
- [Commits](samber/lo@v1.47.0...v1.49.1)

Updates `github.com/google/cel-go` from 0.22.1 to 0.23.2
- [Release notes](https://github.com/google/cel-go/releases)
- [Commits](google/cel-go@v0.22.1...v0.23.2)

Updates `github.com/samber/lo` from 1.47.0 to 1.49.1
- [Release notes](https://github.com/samber/lo/releases)
- [Commits](samber/lo@v1.47.0...v1.49.1)

---
updated-dependencies:
- dependency-name: github.com/google/cel-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-deps
- dependency-name: github.com/samber/lo
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go-deps
- dependency-name: github.com/google/cel-go
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: go-deps
- dependency-name: github.com/samber/lo
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: go-deps
...

Signed-off-by: dependabot[bot] <support@github.com>

* Back out CEL update for now

It caused the following test failure:
[controller:test-cover] /go/pkg/mod/k8s.io/apiserver@v0.32.0/pkg/cel/environment/base.go:176:19:
cannot use ext.TwoVarComprehensions (value of type func(options ...ext.TwoVarComprehensionsOption)
"github.com/google/cel-go/cel".EnvOption) as func() "github.com/google/cel-go/cel".EnvOption value
in argument to UnversionedLib

This stems from this change in CEL: google/cel-go#1075

It is due to:
https://github.com/kubernetes/apiserver/blob/master/pkg/cel/environment/base.go#L268
where kube-apiserver purposefully breaks their complication if CEL starts supporting variadic
versioning args (which it just did in 0.23.0).

* More CEL fixes

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Christopher <matthchr@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants