Skip to content

Commit

Permalink
Bump open-cluster-management.io/addon-framework from 0.1.0 to 0.3.0
Browse files Browse the repository at this point in the history
Bumps [open-cluster-management.io/addon-framework](https://github.com/open-cluster-management-io/addon-framework) from 0.1.0 to 0.3.0.
- [Release notes](https://github.com/open-cluster-management-io/addon-framework/releases)
- [Commits](open-cluster-management-io/addon-framework@v0.1.0...v0.3.0)

---
updated-dependencies:
- dependency-name: open-cluster-management.io/addon-framework
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
dependabot[bot] authored and tpantelis committed Jun 10, 2022
1 parent 52e84f4 commit c3c17c0
Show file tree
Hide file tree
Showing 990 changed files with 87,601 additions and 8,974 deletions.
27 changes: 8 additions & 19 deletions go.mod
Expand Up @@ -9,9 +9,9 @@ require (
github.com/gophercloud/utils v0.0.0-20210909165623-d7085207ff6d
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.19.0
github.com/openshift/api v0.0.0-20211201215911-5a82bae32e46
github.com/openshift/api v0.0.0-20211209135129-c58d9f695577
github.com/openshift/build-machinery-go v0.0.0-20220121085309-f94edc2d6874
github.com/openshift/library-go v0.0.0-20210916194400-ae21aab32431
github.com/openshift/library-go v0.0.0-20220112153822-ac82336bd076
github.com/operator-framework/api v0.5.2
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.4.0
Expand All @@ -30,7 +30,7 @@ require (
k8s.io/code-generator v0.23.5
k8s.io/component-base v0.23.5
k8s.io/klog/v2 v2.40.1
open-cluster-management.io/addon-framework v0.1.0
open-cluster-management.io/addon-framework v0.3.0
open-cluster-management.io/api v0.6.1-0.20220302050849-83dafb2a3afd
sigs.k8s.io/controller-runtime v0.11.2
)
Expand Down Expand Up @@ -91,14 +91,14 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/openshift/client-go v0.0.0-20211209144617-7385dd6338e3 // indirect
github.com/pkg/profile v1.3.0 // indirect
github.com/prometheus/client_golang v1.12.2 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/afero v1.6.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
go.etcd.io/etcd/client/v3 v3.5.0 // indirect
Expand All @@ -116,7 +116,7 @@ require (
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect
Expand All @@ -138,25 +138,14 @@ require (
k8s.io/apiserver v0.23.5 // indirect
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/kube-aggregator v0.22.1 // indirect
k8s.io/kube-aggregator v0.23.5 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
github.com/go-logr/zapr => github.com/go-logr/zapr v0.4.0
k8s.io/api => k8s.io/api v0.22.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.1
k8s.io/apimachinery => k8s.io/apimachinery v0.22.1
k8s.io/apiserver v0.23.5 => k8s.io/apiserver v0.22.1
k8s.io/client-go => k8s.io/client-go v0.22.1
k8s.io/code-generator => k8s.io/code-generator v0.22.1
k8s.io/component-base => k8s.io/component-base v0.22.1
k8s.io/klog/v2 => k8s.io/klog/v2 v2.9.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.1
)
replace k8s.io/client-go => k8s.io/client-go v0.23.5
470 changes: 432 additions & 38 deletions go.sum

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions pkg/hub/submarineraddonagent/agent.go
Expand Up @@ -70,17 +70,19 @@ var manifestFiles embed.FS

// addOnAgent monitors the Submariner agent status and configure Submariner cluster environment on the managed cluster.
type addOnAgent struct {
kubeClient kubernetes.Interface
recorder events.Recorder
agentImage string
kubeClient kubernetes.Interface
recorder events.Recorder
agentImage string
resourceCache resourceapply.ResourceCache
}

// NewAddOnAgent returns an instance of addOnAgent.
func NewAddOnAgent(kubeClient kubernetes.Interface, recorder events.Recorder, agentImage string) *addOnAgent {
return &addOnAgent{
kubeClient: kubeClient,
recorder: recorder,
agentImage: agentImage,
kubeClient: kubeClient,
recorder: recorder,
agentImage: agentImage,
resourceCache: resourceapply.NewResourceCache(),
}
}

Expand Down Expand Up @@ -190,7 +192,7 @@ func (a *addOnAgent) csrApproveCheck(cluster *clusterv1.ManagedCluster, addon *a
}

// Generates manifestworks to deploy the required roles of submariner-addon agent.
func (a *addOnAgent) permissionConfig(cluster *clusterv1.ManagedCluster, addon *addonapiv1alpha1.ManagedClusterAddOn) error {
func (a *addOnAgent) permissionConfig(cluster *clusterv1.ManagedCluster, _ *addonapiv1alpha1.ManagedClusterAddOn) error {
config := struct {
ClusterName string
Group string
Expand All @@ -203,6 +205,7 @@ func (a *addOnAgent) permissionConfig(cluster *clusterv1.ManagedCluster, addon *
context.TODO(),
resourceapply.NewKubeClientHolder(a.kubeClient),
a.recorder,
a.resourceCache,
func(name string) ([]byte, error) {
template, err := manifestFiles.ReadFile(name)
if err != nil {
Expand Down
4 changes: 3 additions & 1 deletion pkg/resource/manifest.go
Expand Up @@ -26,6 +26,7 @@ import (
var (
genericScheme = runtime.NewScheme()
genericCodec = serializer.NewCodecFactory(genericScheme).UniversalDeserializer()
resourceCache = resourceapply.NewResourceCache()
)

func init() {
Expand All @@ -39,7 +40,8 @@ func init() {
func ApplyManifests(ctx context.Context, kubeClient kubernetes.Interface, recorder events.Recorder,
assetFunc resourceapply.AssetFunc, files ...string,
) error {
applyResults := resourceapply.ApplyDirectly(ctx, resourceapply.NewKubeClientHolder(kubeClient), recorder, assetFunc, files...)
applyResults := resourceapply.ApplyDirectly(ctx, resourceapply.NewKubeClientHolder(kubeClient), recorder, resourceCache,
assetFunc, files...)

errs := []error{}

Expand Down
4 changes: 4 additions & 0 deletions test/util/util.go
Expand Up @@ -284,6 +284,10 @@ func (r *IntegrationTestEventRecorder) ForComponent(c string) events.Recorder {
return &IntegrationTestEventRecorder{component: c}
}

func (r *IntegrationTestEventRecorder) WithContext(ctx context.Context) events.Recorder {
return r
}

func (r *IntegrationTestEventRecorder) WithComponentSuffix(suffix string) events.Recorder {
return r.ForComponent(fmt.Sprintf("%s-%s", r.ComponentName(), suffix))
}
Expand Down
29 changes: 29 additions & 0 deletions vendor/github.com/go-logr/logr/.golangci.yaml

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

6 changes: 6 additions & 0 deletions vendor/github.com/go-logr/logr/CHANGELOG.md

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

17 changes: 17 additions & 0 deletions vendor/github.com/go-logr/logr/CONTRIBUTING.md

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

0 comments on commit c3c17c0

Please sign in to comment.