Skip to content

Commit 7ca42b7

Browse files
qiujian16qiujian16
authoredMay 20, 2024
support install ns from addonDeploymentConfig (#194)
* Support install namespace and remove installAll Signed-off-by: Jian Qiu <jqiu@redhat.com> * Support addon install ns from addonDeploymentConfig Signed-off-by: Jian Qiu <jqiu@redhat.com> --------- Signed-off-by: Jian Qiu <jqiu@redhat.com>
1 parent c049a71 commit 7ca42b7

File tree

16 files changed

+172
-121
lines changed

16 files changed

+172
-121
lines changed
 

‎.github/workflows/go-presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
helm install \
114114
-n open-cluster-management-addon --create-namespace \
115115
cluster-proxy charts/cluster-proxy/ \
116-
--set tag=latest
116+
--set tag=latest --set installByPlacement.placementName=default
117117
- name: Build&Run e2e test
118118
run: |
119119
kubectl wait --for=condition=ProxyServerDeployed=true managedproxyconfiguration cluster-proxy --timeout=60s

‎Makefile

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,6 @@ docker-push: ## Push docker image with the manager.
7979

8080
##@ Deployment
8181

82-
install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
83-
$(KUSTOMIZE) build config/crd | kubectl apply -f -
84-
85-
uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config.
86-
$(KUSTOMIZE) build config/crd | kubectl delete -f -
87-
88-
deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
89-
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
90-
$(KUSTOMIZE) build config/default | kubectl apply -f -
91-
92-
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
93-
$(KUSTOMIZE) build config/default | kubectl delete -f -
94-
95-
9682
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
9783
controller-gen: ## Download controller-gen locally if necessary.
9884
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)

‎charts/cluster-proxy/templates/addondeploymentconfig.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: addon.open-cluster-management.io/v1alpha1
2+
kind: AddOnDeploymentConfig
3+
metadata:
4+
name: cluster-proxy-agent-deploy-config
5+
namespace: {{ .Release.Namespace }}
6+
spec:
7+
agentInstallNamespace: {{ .Values.spokeAddonNamespace }}

‎charts/cluster-proxy/templates/clustermanagementaddon.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: addon.open-cluster-management.io/v1alpha1
22
kind: ClusterManagementAddOn
33
metadata:
44
name: cluster-proxy
5+
annotations:
6+
"addon.open-cluster-management.io/lifecycle": "addon-manager"
57
spec:
68
addOnMeta:
79
displayName: cluster-proxy
@@ -13,3 +15,17 @@ spec:
1315
name: cluster-proxy
1416
- group: addon.open-cluster-management.io
1517
resource: addondeploymentconfigs
18+
defaultConfig:
19+
name: cluster-proxy-agent-deploy-config
20+
namespace: {{ .Release.Namespace }}
21+
{{- if .Values.installByPlacement.placementName }}
22+
installStrategy:
23+
type: Placements
24+
placements:
25+
- name: {{ .Values.installByPlacement.placementName }}
26+
{{- if .Values.installByPlacement.placementNamespace }}
27+
namespace: {{ .Values.installByPlacement.placementNamespace }}
28+
{{- else }}
29+
namespace: {{ .Release.Namespace }}
30+
{{- end }}
31+
{{- end }}

‎charts/cluster-proxy/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ proxyServer:
1919
entrypointLoadBalancer: false
2020
entrypointAddress: ""
2121
port: 8091
22+
23+
installByPlacement:
24+
placementName: ""
25+
placementNamespace: ""

‎cmd/addon-manager/main.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ func main() {
8686
flag.StringVar(&config.AgentImageName, "agent-image-name",
8787
config.AgentImageName,
8888
"The name of the addon agent's image")
89-
flag.StringVar(&config.AddonInstallNamespace, "agent-install-namespace", config.DefaultAddonInstallNamespace,
90-
"The target namespace to install the addon agents.")
89+
// This is deprecated.
9190
flag.BoolVar(
9291
&agentInstallAll, "agent-install-all", false,
9392
"Configure the install strategy of agent on managed clusters. "+
@@ -186,7 +185,6 @@ func main() {
186185
supportsV1CSR,
187186
mgr.GetClient(),
188187
nativeClient,
189-
agentInstallAll,
190188
enableKubeApiProxy,
191189
addonClient,
192190
)

‎go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ require (
88
github.com/openshift/library-go v0.0.0-20240304201338-a2ff756d8fc2
99
github.com/pkg/errors v0.9.1
1010
github.com/stretchr/testify v1.9.0
11-
google.golang.org/grpc v1.62.0
11+
google.golang.org/grpc v1.62.1
1212
k8s.io/api v0.29.2
1313
k8s.io/apimachinery v0.29.2
1414
k8s.io/client-go v0.29.2
1515
k8s.io/klog/v2 v2.120.1
16-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
17-
open-cluster-management.io/addon-framework v0.9.0
16+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
17+
open-cluster-management.io/addon-framework v0.9.2
1818
open-cluster-management.io/api v0.13.0
19-
open-cluster-management.io/sdk-go v0.13.0
19+
open-cluster-management.io/sdk-go v0.13.1-0.20240416030555-aa744f426379
2020
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0
2121
sigs.k8s.io/controller-runtime v0.17.2
2222
)
@@ -45,7 +45,7 @@ require (
4545
github.com/gobwas/glob v0.2.3 // indirect
4646
github.com/gogo/protobuf v1.3.2 // indirect
4747
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
48-
github.com/golang/protobuf v1.5.3 // indirect
48+
github.com/golang/protobuf v1.5.4 // indirect
4949
github.com/google/gnostic-models v0.6.8 // indirect
5050
github.com/google/go-cmp v0.6.0 // indirect
5151
github.com/google/gofuzz v1.2.0 // indirect
@@ -76,19 +76,19 @@ require (
7676
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
7777
go.uber.org/multierr v1.11.0 // indirect
7878
go.uber.org/zap v1.26.0 // indirect
79-
golang.org/x/crypto v0.18.0 // indirect
79+
golang.org/x/crypto v0.19.0 // indirect
8080
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
81-
golang.org/x/net v0.20.0 // indirect
81+
golang.org/x/net v0.21.0 // indirect
8282
golang.org/x/oauth2 v0.16.0 // indirect
83-
golang.org/x/sys v0.16.0 // indirect
84-
golang.org/x/term v0.16.0 // indirect
83+
golang.org/x/sys v0.17.0 // indirect
84+
golang.org/x/term v0.17.0 // indirect
8585
golang.org/x/text v0.14.0 // indirect
8686
golang.org/x/time v0.3.0 // indirect
8787
golang.org/x/tools v0.17.0 // indirect
8888
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8989
google.golang.org/appengine v1.6.8 // indirect
9090
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
91-
google.golang.org/protobuf v1.32.0 // indirect
91+
google.golang.org/protobuf v1.33.0 // indirect
9292
gopkg.in/inf.v0 v0.9.1 // indirect
9393
gopkg.in/yaml.v2 v2.4.0 // indirect
9494
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l
5353
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
5454
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
5555
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
56-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
57-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
56+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
57+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
5858
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
5959
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
6060
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -171,8 +171,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
171171
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
172172
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
173173
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
174-
golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
175-
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
174+
golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
175+
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
176176
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
177177
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
178178
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -185,8 +185,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
185185
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
186186
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
187187
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
188-
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
189-
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
188+
golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
189+
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
190190
golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ=
191191
golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o=
192192
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -202,13 +202,13 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
202202
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
203203
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
204204
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
205-
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
206-
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
205+
golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
206+
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
207207
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
208208
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
209209
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
210-
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
211-
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
210+
golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
211+
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
212212
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
213213
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
214214
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -235,12 +235,12 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs
235235
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
236236
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
237237
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
238-
google.golang.org/grpc v1.62.0 h1:HQKZ/fa1bXkX1oFOvSjmZEUL8wLSaZTjCcLAlmZRtdk=
239-
google.golang.org/grpc v1.62.0/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
238+
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
239+
google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
240240
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
241241
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
242-
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
243-
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
242+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
243+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
244244
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
245245
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
246246
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -274,14 +274,14 @@ k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
274274
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
275275
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
276276
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
277-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
278-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
279-
open-cluster-management.io/addon-framework v0.9.0 h1:7QKLgfRns2BRLFigjIaWVTPCwG9feM+CNtZ22Yf2I20=
280-
open-cluster-management.io/addon-framework v0.9.0/go.mod h1:OEIFCEXhZKO/Grv08CB0T+TGzS0bLshw4G9u7Vw8dw0=
277+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY=
278+
k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
279+
open-cluster-management.io/addon-framework v0.9.2 h1:oQnk6Y6433Fvi/MC8sWoy68lHzkqPsFLj7IEx07kFfU=
280+
open-cluster-management.io/addon-framework v0.9.2/go.mod h1:LDkGLGTQh+sthF1qWlv87iMeAuRPsNEMK31O14kMneA=
281281
open-cluster-management.io/api v0.13.0 h1:dlcJEZlNlE0DmSDctK2s7iWKg9l+Tgb0V78Z040nMuk=
282282
open-cluster-management.io/api v0.13.0/go.mod h1:CuCPEzXDvOyxBB0H1d1eSeajbHqaeGEKq9c63vQc63w=
283-
open-cluster-management.io/sdk-go v0.13.0 h1:ddMGsPUekQr9z03tVN6vF39Uf+WEKMtGU/xSd81HdoA=
284-
open-cluster-management.io/sdk-go v0.13.0/go.mod h1:UnsjzYOrDTF9a8rHEXksoIAtAdO1o5CD5Jtaw6T5B9w=
283+
open-cluster-management.io/sdk-go v0.13.1-0.20240416030555-aa744f426379 h1:8jXVHfgy+wgXq1mrWC1mTieoP77WsAAHNpzILMIzWB0=
284+
open-cluster-management.io/sdk-go v0.13.1-0.20240416030555-aa744f426379/go.mod h1:w2OaxtCyegxeyFLU42UQ3oxUz01QdsBQkcHI17T/l48=
285285
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c=
286286
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0/go.mod h1:z7+wmGM2dfIiLRfrC6jb5kV2Mq/sK1ZP303cxzkV5Y4=
287287
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=

‎pkg/config/agent.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ import (
1515
// Can be override via "--agent-image-name" on the hub addon manager.
1616
var AgentImageName string
1717

18-
// AgentImageName is the installing namespace of the spoke addon agent.
19-
// Can be override via "--agent-install-namespace" on the hub addon manager.
20-
var AddonInstallNamespace = DefaultAddonInstallNamespace
21-
2218
const DefaultAddonInstallNamespace = "open-cluster-management-cluster-proxy"
2319

2420
func GetParsedAgentImage(defaultAgentImageName string) (string, string, string, error) {

‎pkg/proxyagent/agent/agent.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ func NewAgentAddon(
5454
v1CSRSupported bool,
5555
runtimeClient client.Client,
5656
nativeClient kubernetes.Interface,
57-
agentInstallAll bool,
5857
enableKubeApiProxy bool,
5958
addonClient addonclient.Interface) (agent.AgentAddon, error) {
6059
caCertData, caKeyData, err := signer.CA().Config.GetPEMBytes()
@@ -145,11 +144,10 @@ func NewAgentAddon(
145144
utils.NewAddOnDeploymentConfigGetter(addonClient),
146145
toAgentAddOnChartValues(caCertData),
147146
),
148-
)
149-
150-
if agentInstallAll {
151-
agentFactory.WithInstallStrategy(agent.InstallAllStrategy(config.AddonInstallNamespace))
152-
}
147+
).
148+
WithAgentInstallNamespace(utils.AgentInstallNamespaceFromDeploymentConfigFunc(
149+
utils.NewAddOnDeploymentConfigGetter(addonClient),
150+
))
153151

154152
return agentFactory.BuildHelmAgentAddon()
155153
}
@@ -167,8 +165,8 @@ func GetClusterProxyValueFunc(
167165

168166
managedProxyConfigurations := []string{}
169167
for _, configReference := range addon.Status.ConfigReferences {
170-
if config.IsManagedProxyConfiguration(configReference.ConfigGroupResource) {
171-
managedProxyConfigurations = append(managedProxyConfigurations, configReference.Name)
168+
if config.IsManagedProxyConfiguration(configReference.ConfigGroupResource) && configReference.DesiredConfig != nil {
169+
managedProxyConfigurations = append(managedProxyConfigurations, configReference.DesiredConfig.Name)
172170
}
173171
}
174172

@@ -276,9 +274,15 @@ func GetClusterProxyValueFunc(
276274

277275
var aids []string
278276
// add default kube-apiserver agentIdentifiers
277+
278+
// get agent namespace from addon status
279+
namespace := config.DefaultAddonInstallNamespace
280+
if len(addon.Status.Namespace) > 0 {
281+
namespace = addon.Status.Namespace
282+
}
279283
if enableKubeApiProxy {
280284
aids = append(aids, fmt.Sprintf("host=%s", cluster.Name))
281-
aids = append(aids, fmt.Sprintf("host=%s.%s", cluster.Name, config.AddonInstallNamespace))
285+
aids = append(aids, fmt.Sprintf("host=%s.%s", cluster.Name, namespace))
282286
}
283287
// add servicesToExpose into aids
284288
for _, s := range servicesToExpose {

0 commit comments

Comments
 (0)