Skip to content

Commit

Permalink
Bump to k8s v1.30 latest
Browse files Browse the repository at this point in the history 
go get k8s.io/api@v0.30.2
go get k8s.io/code-generator@v0.30.2
go get k8s.io/component-base@v0.30.2
go get k8s.io/kube-proxy@v0.30.2
go get k8s.io/apiextensions-apiserver@v0.30.2
go get github.com/openshift/build-machinery-go
go get github.com/openshift/api
go get github.com/openshift/client-go
go get github.com/openshift/library-go
go get k8s.io/kube-aggregator@v0.30.2
go get sigs.k8s.io/apiserver-network-proxy/konnectivity-client@v0.30.3
go get k8s.io/utils
go mod vendor
go mod tidy

Fix API changes

Signed-off-by: Jaime Caamaño Ruiz <jcaamano@redhat.com>
  • Loading branch information
@jcaamano
jcaamano committed Jul 4, 2024
1 parent 33070b5 commit fc02e0c
Show file tree
Hide file tree
Showing 543 changed files with 28,416 additions and 16,082 deletions.
37 changes: 18 additions & 19 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-bindata/go-bindata v3.1.2+incompatible
github.com/onsi/gomega v1.31.0
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
github.com/openshift/build-machinery-go v0.0.0-20240613134303-8359781da660
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.16.0
github.com/spf13/cobra v1.7.0
Expand All @@ -21,13 +21,13 @@ require (
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
golang.org/x/net v0.23.0
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.30.1
k8s.io/apimachinery v0.30.1
k8s.io/code-generator v0.29.0
k8s.io/component-base v0.29.0
k8s.io/api v0.30.2
k8s.io/apimachinery v0.30.2
k8s.io/code-generator v0.30.2
k8s.io/component-base v0.30.2
k8s.io/klog/v2 v2.120.1
k8s.io/kube-proxy v0.29.0
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
k8s.io/kube-proxy v0.30.2
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
sigs.k8s.io/controller-runtime v0.16.0
)

Expand Down Expand Up @@ -84,7 +84,7 @@ require (
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
Expand All @@ -102,22 +102,21 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

require (
github.com/openshift/api v0.0.0-20240701145226-44d00ee80f5e
github.com/openshift/client-go v0.0.0-20240415214935-be70f772f157
github.com/openshift/library-go v0.0.0-20231128230659-785a9313da6c
github.com/openshift/api v0.0.0-20240704102751-33ed71ab039f
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
github.com/openshift/library-go v0.0.0-20240704110337-4002bdd84f05
github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc
k8s.io/apiextensions-apiserver v0.29.0
k8s.io/client-go v0.29.0
k8s.io/apiextensions-apiserver v0.30.2
k8s.io/client-go v0.30.2
)

require (
Expand All @@ -139,7 +138,7 @@ require (
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/cel-go v0.17.7 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
Expand All @@ -153,8 +152,8 @@ require (
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
k8s.io/apiserver v0.29.0 // indirect
k8s.io/apiserver v0.30.2 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/kms v0.29.0 // indirect
k8s.io/kube-aggregator v0.28.2 // indirect
k8s.io/kms v0.30.2 // indirect
k8s.io/kube-aggregator v0.30.2 // indirect
)
90 changes: 40 additions & 50 deletions go.sum
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions pkg/client/operatorclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ func (c *OperatorHelperClient) GetOperatorState() (*operatorv1.OperatorSpec, *op
return &instance.Spec.OperatorSpec, &instance.Status.OperatorStatus, instance.ResourceVersion, nil
}

func (c *OperatorHelperClient) GetOperatorStateWithQuorum(ctx context.Context) (*operatorv1.OperatorSpec, *operatorv1.OperatorStatus, string, error) {
instance, err := c.client.Get(ctx, names.OPERATOR_CONFIG, metav1.GetOptions{})
if err != nil {
return nil, nil, "", err
}

return &instance.Spec.OperatorSpec, &instance.Status.OperatorStatus, instance.ResourceVersion, nil
}

func (c *OperatorHelperClient) GetObjectMeta() (*metav1.ObjectMeta, error) {
instance, err := c.informer.Lister().Get(names.OPERATOR_CONFIG)
if err != nil {
Expand Down
9 changes: 7 additions & 2 deletions pkg/controller/connectivitycheck/connectivity_check_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,13 @@ func (c *connectivityCheckTemplateProvider) generate(ctx context.Context, syncCo
}

if c.connectivityChecksStatus != currentStatus {
condition := currentStatus
condition.LastTransitionTime = metav1.NewTime(time.Now())
condition := applyconfigmetav1.Condition().
WithType(currentStatus.Type).
WithStatus(currentStatus.Status).
WithObservedGeneration(currentStatus.ObservedGeneration).
WithLastTransitionTime(metav1.NewTime(time.Now())).
WithReason(currentStatus.Reason).
WithMessage(currentStatus.Message)
netConfig := applyconfigv1.Network(names.CLUSTER_CONFIG).WithStatus(applyconfigv1.NetworkStatus().WithConditions(condition))
_, err := c.configClient.ConfigV1().Networks().Apply(context.TODO(), netConfig, metav1.ApplyOptions{
Force: true,
Expand Down
28 changes: 17 additions & 11 deletions pkg/controller/pki/pki_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,11 @@ func newPKI(config *netopv1.OperatorPKI, clientset *kubernetes.Clientset, mgr ma
cont := certrotation.NewCertRotationController(
fmt.Sprintf("%s/%s", config.Namespace, config.Name), // name, not really used
certrotation.RotatedSigningCASecret{
Namespace: config.Namespace,
Name: config.Name + "-ca",
JiraComponent: names.ClusterNetworkOperatorJiraComponent,
Namespace: config.Namespace,
Name: config.Name + "-ca",
AdditionalAnnotations: certrotation.AdditionalAnnotations{
JiraComponent: names.ClusterNetworkOperatorJiraComponent,
},
Validity: 10 * OneYear,
Refresh: 9 * OneYear,
Informer: inf.Core().V1().Secrets(),
Expand All @@ -204,20 +206,24 @@ func newPKI(config *netopv1.OperatorPKI, clientset *kubernetes.Clientset, mgr ma
EventRecorder: &eventrecorder.LoggingRecorder{},
},
certrotation.CABundleConfigMap{
Namespace: config.Namespace,
Name: config.Name + "-ca",
JiraComponent: names.ClusterNetworkOperatorJiraComponent,
Namespace: config.Namespace,
Name: config.Name + "-ca",
AdditionalAnnotations: certrotation.AdditionalAnnotations{
JiraComponent: names.ClusterNetworkOperatorJiraComponent,
},
Lister: inf.Core().V1().ConfigMaps().Lister(),
Informer: inf.Core().V1().ConfigMaps(),
Client: clientset.CoreV1(),
EventRecorder: &eventrecorder.LoggingRecorder{},
},
certrotation.RotatedSelfSignedCertKeySecret{
Namespace: config.Namespace,
Name: config.Name + "-cert",
JiraComponent: names.ClusterNetworkOperatorJiraComponent,
Validity: OneYear / 2,
Refresh: OneYear / 4,
Namespace: config.Namespace,
Name: config.Name + "-cert",
AdditionalAnnotations: certrotation.AdditionalAnnotations{
JiraComponent: names.ClusterNetworkOperatorJiraComponent,
},
Validity: OneYear / 2,
Refresh: OneYear / 4,
CertCreator: &certrotation.ServingRotation{
Hostnames: func() []string { return []string{spec.TargetCert.CommonName} },

Expand Down
3 changes: 3 additions & 0 deletions vendor/github.com/google/cel-go/checker/cost.go
View file

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

5 changes: 3 additions & 2 deletions vendor/github.com/openshift/api/config/v1alpha1/types_cluster_image_policy.go
View file

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

5 changes: 3 additions & 2 deletions vendor/github.com/openshift/api/config/v1alpha1/types_image_policy.go
View file

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

4 changes: 2 additions & 2 deletions vendor/github.com/openshift/api/config/v1alpha1/zz_generated.swagger_doc_generated.go
View file

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

4 changes: 4 additions & 0 deletions vendor/github.com/openshift/api/features.md
View file

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

0 comments on commit fc02e0c

Please sign in to comment.