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.

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

Jump to bottom

SDN 4923: rebase k8s v1.30.2 #2423

Closed
wants to merge 4 commits into from
Closed

SDN 4923: rebase k8s v1.30.2 #2423

wants to merge 4 commits into from

Commits on Jul 3, 2024

  1. rebase to k8s 1.30.2 

    ❯ rg '0\.29|/openshift' go.mod | awk '{print "go get -u",$1}' | sort --uniq

go get -u github.com/openshift/api
go get -u github.com/openshift/build-machinery-go
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u github.com/openshift/machine-config-operator
go get -u k8s.io/api
go get -u k8s.io/apiextensions-apiserver
go get -u k8s.io/apimachinery
go get -u k8s.io/apiserver
go get -u k8s.io/client-go
go get -u k8s.io/code-generator
go get -u k8s.io/component-base
go get -u k8s.io/kms
go get -u k8s.io/kube-proxy
go get -u module

go mod tidy; go mod vendor

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
    @jluhrsen
    jluhrsen committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ec534d1 View commit details
    Browse the repository at this point in the history

  2. fix build issues caused by k8s rebase to 1.30.2 

    - implement GetOperatorStateWithQuorum() for v1helpers.OperatorClient
  interface which was added in openshift/library-go here [0]

- applyconfigv1.NetworkStatus().WithConditions() now requires
  metav1.ConditionApplyConfiguration instead of metav1.Condition,
  which came in with the client-go 1.30 rebase here [1]

- using new lib location for feature gates "openshift/api/features"

- refactor controller-runtime Watch() calls to handle new generics
  support [2]

- moved RotatedSigningCASecret.JiraComponent to
  RotatedSigningCASecret.AdditionalAnnotations.JiraComponent from here [3]

- added dummy path to apimachinery validation.IsValidIP() as it was
  added as an argument here [4]. not relevant to the the call in this
  case.

- bumped k8s.io/component-base to v0.31.0-alpha.2 to get past a
  breaking issue with prometheus using a breaking type from 0.30.2

- the version of googleapis/api/expr/v1alpha1 that is brought in with
  github.com/google/cel-go with anything newer than v0.17.8 no longer
  includes GetConstExpr() so pinning that lib to v0.17.8

[0] openshift/library-go@bd5e34c
[1] openshift/client-go@792100e#diff-233949a4a2a7ca43d091c935b04748464200784e5377366d574945d3fd06ed89R76
[2] kubernetes-sigs/controller-runtime#2783
[3] openshift/library-go@df7ff42
[4] openshift/kubernetes-apimachinery@89b9414

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
    @jluhrsen
    jluhrsen committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    eaee1c0 View commit details
    Browse the repository at this point in the history

  3. fix test issues after 1.30.2 k8s rebase 

    - component-base log types added a text option in
  FormatOptions [0] that was not there in 1.29 [1]

[0] https://github.com/kubernetes/component-base/blob/244709c58c3669b71514f38c03d08501c690423f/logs/api/v1/types.go#L99
[1] https://github.com/kubernetes/component-base/blob/3c9d29fd4504755d1a42e59053488081604186f4/logs/api/v1/types.go

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
    @jluhrsen
    jluhrsen committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    1377f3d View commit details
    Browse the repository at this point in the history

  4. use setStatus() instead of set() 

    there was an update [0] to the controller-runtime fake
client to zero out all fields when serializing a target

this was causing the UpdatedReplicas value to be
overwritten with 0 and causing the UT to fail. the
test case portion affected by this was only interested
in Status changes so updating to use setStatus() should
make sense here.

[0] kubernetes-sigs/controller-runtime@e368149

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
    @jluhrsen
    jluhrsen committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ab4e7d6 View commit details
    Browse the repository at this point in the history