Skip to content

Commit

Permalink
upgrade kube version (#1061)
Browse files Browse the repository at this point in the history 
* upgrade kube version

Signed-off-by: ldpliu <[email protected]>

* fix kafka reconcile error

Signed-off-by: ldpliu <[email protected]>

---------

Signed-off-by: ldpliu <[email protected]>
  • Loading branch information
@ldpliu
ldpliu authored Aug 20, 2024
1 parent 346fb2b commit 092cca6
Show file tree
Hide file tree
Showing 12 changed files with 378 additions and 673 deletions.
2 changes: 1 addition & 1 deletion agent/pkg/controllers/cert_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (c *certController) Reconcile(ctx context.Context, request ctrl.Request) (c
}

func AddCertController(mgr ctrl.Manager, kubeClient kubernetes.Interface) error {
return ctrl.NewControllerManagedBy(mgr).
return ctrl.NewControllerManagedBy(mgr).Named("cert-controller").
For(&corev1.Secret{}, builder.WithPredicates(predicate.Funcs{
CreateFunc: func(e event.CreateEvent) bool {
return false
Expand Down
2 changes: 1 addition & 1 deletion agent/pkg/controllers/hub_clusterclaim_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func AddHubClusterClaimController(mgr ctrl.Manager) error {
clusterClaim, _ := getClusterClaim(context.Background(), mgr.GetClient(), constants.HubClusterClaimName)
return clusterClaim == nil
})
return ctrl.NewControllerManagedBy(mgr).
return ctrl.NewControllerManagedBy(mgr).Named("hubclusterclaim-controller").
For(&clustersv1alpha1.ClusterClaim{}, builder.WithPredicates(clusterClaimPredicate)).
Complete(&hubClusterClaimController{
client: mgr.GetClient(),
Expand Down
2 changes: 1 addition & 1 deletion agent/pkg/controllers/version_clusterclaim_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func AddVersionClusterClaimController(mgr ctrl.Manager) error {
constants.GlobalHubOwnerLabelKey: constants.GHAgentOwnerLabelValue,
},
})
return ctrl.NewControllerManagedBy(mgr).
return ctrl.NewControllerManagedBy(mgr).Named("clusterclaim-controller").
For(&clustersv1alpha1.ClusterClaim{}, builder.WithPredicates(clusterClaimPredicate)).
Watches(&mchv1.MultiClusterHub{}, &handler.EnqueueRequestForObject{}).
Complete(&versionClusterClaimController{
Expand Down
65 changes: 33 additions & 32 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.4
require (
github.com/RedHatInsights/strimzi-client-go v0.34.2
github.com/Shopify/sarama v1.38.1
github.com/cenkalti/backoff/v4 v4.2.1
github.com/cenkalti/backoff/v4 v4.3.0
github.com/cloudevents/sdk-go/protocol/kafka_confluent/v2 v2.0.0-20240413090539-7fef29478991
github.com/cloudevents/sdk-go/v2 v2.15.3-0.20240422145248-9a61fcad9967
github.com/cloudflare/cfssl v1.6.5
Expand All @@ -16,14 +16,14 @@ require (
github.com/fergusstrange/embedded-postgres v1.17.0
github.com/gin-gonic/gin v1.9.1
github.com/go-co-op/gocron v1.23.0
github.com/go-logr/logr v1.4.1
github.com/go-logr/logr v1.4.2
github.com/gonvenience/ytbx v1.4.4
github.com/google/uuid v1.6.0
github.com/homeport/dyff v1.5.5
github.com/jackc/pgx/v4 v4.18.2
github.com/lib/pq v1.10.9
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.32.0
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/openshift/api v0.0.0-20240527133614-ba11c1587003
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
github.com/openshift/library-go v0.0.0-20240723172506-8bb8fe6cc56d
Expand All @@ -41,34 +41,37 @@ require (
gorm.io/datatypes v1.2.0
gorm.io/driver/postgres v1.5.2
gorm.io/gorm v1.25.4
k8s.io/api v0.30.1
k8s.io/apiextensions-apiserver v0.30.1
k8s.io/apimachinery v0.30.1
k8s.io/client-go v0.30.1
k8s.io/api v0.31.0
k8s.io/apiextensions-apiserver v0.31.0
k8s.io/apimachinery v0.31.0
k8s.io/client-go v0.31.0
k8s.io/klog v1.0.0
k8s.io/kube-aggregator v0.30.1
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
k8s.io/kube-aggregator v0.31.0
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
open-cluster-management.io/addon-framework v0.9.0
open-cluster-management.io/api v0.13.0
open-cluster-management.io/governance-policy-propagator v0.11.1-0.20230815182526-b4ee1b24b1d0
open-cluster-management.io/multicloud-operators-channel v0.11.0
open-cluster-management.io/multicloud-operators-subscription v0.11.0
sigs.k8s.io/application v0.8.3
sigs.k8s.io/controller-runtime v0.18.4
sigs.k8s.io/kustomize/api v0.16.0
sigs.k8s.io/kustomize/kyaml v0.16.0
sigs.k8s.io/controller-runtime v0.19.0
sigs.k8s.io/kustomize/api v0.17.2
sigs.k8s.io/kustomize/kyaml v0.17.2
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/certificate-transparency-go v1.1.7 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jmoiron/sqlx v1.3.5 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/weppos/publicsuffix-go v0.30.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/zmap/zcrypto v0.0.0-20230310154051-c8b263fd8300 // indirect
github.com/zmap/zlint/v3 v3.5.0 // indirect
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
helm.sh/helm/v3 v3.14.2 // indirect
)

Expand All @@ -81,11 +84,11 @@ require (
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bytedance/sonic v1.9.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
github.com/cloudevents/sdk-go/protocol/kafka_sarama/v2 v2.13.0
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/eapache/go-resiliency v1.3.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect
github.com/eapache/queue v1.1.0 // indirect
Expand All @@ -99,12 +102,11 @@ require (
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/go-sql-driver/mysql v1.7.1 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand All @@ -119,7 +121,7 @@ require (
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/h2non/filetype v1.1.1 // indirect
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
Expand Down Expand Up @@ -166,11 +168,11 @@ require (
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.19.1
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
Expand All @@ -192,24 +194,23 @@ require (
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.17.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/mysql v1.4.7 // indirect
k8s.io/apiserver v0.30.1 // indirect
k8s.io/component-base v0.30.1 // indirect
k8s.io/klog/v2 v2.120.1
k8s.io/apiserver v0.31.0 // indirect
k8s.io/component-base v0.31.0 // indirect
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
open-cluster-management.io/sdk-go v0.13.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
Loading

0 comments on commit 092cca6

Please sign in to comment.