Skip to content

Commit

Permalink
Update: addon-framework to 0.8.0 (#169)
Browse files Browse the repository at this point in the history
Signed-off-by: xuezhaojun <[email protected]>
  • Loading branch information
xuezhaojun authored Oct 12, 2023
1 parent 03b52f3 commit ffa4f5c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ require (
k8s.io/client-go v0.26.7
k8s.io/klog/v2 v2.80.1
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
open-cluster-management.io/addon-framework v0.6.1
open-cluster-management.io/api v0.11.1-0.20230905055724-cf1ead467a83
open-cluster-management.io/addon-framework v0.8.0
open-cluster-management.io/api v0.12.0
sigs.k8s.io/apiserver-network-proxy v0.0.27
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37
sigs.k8s.io/controller-runtime v0.14.4
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -708,10 +708,10 @@ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+O
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y=
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
open-cluster-management.io/addon-framework v0.6.1 h1:gnBZaCRgtiPRjCBJoaRqMivajng/XOKp0NQhJUqLd+U=
open-cluster-management.io/addon-framework v0.6.1/go.mod h1:Uu4XC3Ec0ATS7U73PJtzAP4NCDfbDBVy1k5RUUwQDqY=
open-cluster-management.io/api v0.11.1-0.20230905055724-cf1ead467a83 h1:3zbT3sT/tEAQbpjIk6uRiTQGknQ3kQlfd11ElVuXyyQ=
open-cluster-management.io/api v0.11.1-0.20230905055724-cf1ead467a83/go.mod h1:nsQ/G5JpfjQUg7dHpblyywWC6BRqklNaF6fIswVCHyY=
open-cluster-management.io/addon-framework v0.8.0 h1:i1OReMHuZIoAw2Q04SLjkieU25DnxYilzVZzBNyROwU=
open-cluster-management.io/addon-framework v0.8.0/go.mod h1:20DP06VXhJ9RE1PetAMEQyeFCP7+nhs92pCAkqbWUOg=
open-cluster-management.io/api v0.12.0 h1:sNkj4k2XyWA/GLsTiFg82bLIZ7JDZKkLLLyZjJUlJMs=
open-cluster-management.io/api v0.12.0/go.mod h1:/CZhelEH+30/pX7vXGSZOzLMX0zvjthYOkT/5ZTzVTQ=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
Expand Down
2 changes: 1 addition & 1 deletion pkg/proxyagent/agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func NewAgentAddon(
Version: proxyv1alpha1.GroupVersion.Version,
Resource: "managedproxyconfigurations",
},
addonfactory.AddOnDeploymentConfigGVR,
utils.AddOnDeploymentConfigGVR,
).
WithGetValuesFuncs(
GetClusterProxyValueFunc(runtimeClient, nativeClient, signerNamespace, caCertData, v1CSRSupported, enableKubeApiProxy),
Expand Down
8 changes: 5 additions & 3 deletions test/e2e/install/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,12 @@ var _ = Describe("Basic install Test",
if len(addon.Status.ConfigReferences) == 0 {
return fmt.Errorf("no config references in addon status")
}
if addon.Status.ConfigReferences[0].Name != deployConfigName {
return fmt.Errorf("unexpected config references %v", addon.Status.ConfigReferences)
for _, cr := range addon.Status.ConfigReferences {
if cr.Name == deployConfigName {
return nil
}
}
return nil
return fmt.Errorf("unexpected config references %v", addon.Status.ConfigReferences)
}).WithTimeout(time.Minute).ShouldNot(HaveOccurred())

By("Ensure the cluster-proxy is configured")
Expand Down

0 comments on commit ffa4f5c

Please sign in to comment.