Skip to content

Commit 8ccc21e

Browse files
laveryalaverya
authored
update to embedded-cluster-operator v0.4.1 (#186)
* update to embedded-cluster v0.4.1 * fix roles in CI file * go mod tidy * update helm chart version in makefile
1 parent 78b60a4 commit 8ccc21e

File tree

5 files changed

+40
-38
lines changed

5 files changed

+40
-38
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ADMIN_CONSOLE_CHART_NAME = admin-console
77
ADMIN_CONSOLE_CHART_VERSION = 1.104.2
88
EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
99
EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator
10-
EMBEDDED_OPERATOR_CHART_VERSION = 0.4.0
10+
EMBEDDED_OPERATOR_CHART_VERSION = 0.4.1
1111
OPENEBS_CHART_URL = https://openebs.github.io/charts
1212
OPENEBS_CHART_NAME = openebs/openebs
1313
OPENEBS_CHART_VERSION = 3.9.0

‎e2e/kots-release/config.yaml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,19 @@ kind: Config
33
metadata:
44
name: "testconfig"
55
spec:
6-
controller:
7-
labels:
8-
controller-label: controller-label-value
9-
name: controller-test
10-
custom:
11-
- labels:
12-
abc-test-label: abc-test-label-value
13-
abc-test-label-two: abc-test-label-value-2
14-
name: abc
15-
- labels:
16-
xyz-test-label: xyz-value
17-
name: xyz
6+
roles:
7+
controller:
8+
labels:
9+
controller-label: controller-label-value
10+
name: controller-test
11+
custom:
12+
- labels:
13+
abc-test-label: abc-test-label-value
14+
abc-test-label-two: abc-test-label-value-2
15+
name: abc
16+
- labels:
17+
xyz-test-label: xyz-value
18+
name: xyz
1819
unsupportedOverrides:
1920
k0s: |
2021
metadata:

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/k0sproject/dig v0.2.0
1414
github.com/k0sproject/k0sctl v0.16.0
1515
github.com/k0sproject/rig v0.15.1
16-
github.com/replicatedhq/embedded-cluster-operator v0.3.0
16+
github.com/replicatedhq/embedded-cluster-operator v0.4.1
1717
github.com/replicatedhq/kotskinds v0.0.0-20230724164735-f83482cc9cfe
1818
github.com/replicatedhq/troubleshoot v0.77.0
1919
github.com/sirupsen/logrus v1.9.3
@@ -23,8 +23,8 @@ require (
2323
golang.org/x/term v0.14.0
2424
gopkg.in/yaml.v2 v2.4.0
2525
helm.sh/helm/v3 v3.13.2
26-
k8s.io/api v0.28.3
27-
k8s.io/apimachinery v0.28.3
26+
k8s.io/api v0.28.4
27+
k8s.io/apimachinery v0.28.4
2828
sigs.k8s.io/controller-runtime v0.16.3
2929
sigs.k8s.io/yaml v1.4.0
3030
)
@@ -57,7 +57,7 @@ require (
5757
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
5858
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
5959
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
60-
github.com/go-logr/logr v1.2.4 // indirect
60+
github.com/go-logr/logr v1.3.0 // indirect
6161
github.com/go-logr/zapr v1.2.4 // indirect
6262
github.com/go-macaroon-bakery/macaroon-bakery/v3 v3.0.1 // indirect
6363
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
@@ -138,7 +138,7 @@ require (
138138
golang.org/x/sys v0.14.0 // indirect
139139
golang.org/x/text v0.14.0 // indirect
140140
golang.org/x/time v0.3.0 // indirect
141-
golang.org/x/tools v0.13.0 // indirect
141+
golang.org/x/tools v0.14.0 // indirect
142142
google.golang.org/appengine v1.6.8 // indirect
143143
google.golang.org/protobuf v1.31.0 // indirect
144144
gopkg.in/errgo.v1 v1.0.1 // indirect
@@ -148,7 +148,7 @@ require (
148148
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
149149
gopkg.in/yaml.v3 v3.0.1
150150
k8s.io/apiextensions-apiserver v0.28.3 // indirect
151-
k8s.io/client-go v0.28.3 // indirect
151+
k8s.io/client-go v0.28.4 // indirect
152152
k8s.io/klog/v2 v2.100.1 // indirect
153153
k8s.io/kube-openapi v0.0.0-20230905202853-d090da108d2f // indirect
154154
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect

‎go.sum‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,9 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG
306306
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
307307
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
308308
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
309-
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
310309
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
310+
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
311+
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
311312
github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
312313
github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA=
313314
github.com/go-macaroon-bakery/macaroon-bakery/v3 v3.0.1 h1:uvQJoKTHrFFu8zxoaopNKedRzwdy3+8H72we4T/5cGs=
@@ -819,16 +820,16 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
819820
github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0=
820821
github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4=
821822
github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
822-
github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
823-
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
823+
github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU=
824+
github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
824825
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
825826
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
826827
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
827828
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
828829
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
829830
github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
830-
github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
831-
github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
831+
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
832+
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
832833
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
833834
github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
834835
github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -920,8 +921,8 @@ github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:
920921
github.com/quasilyte/go-ruleguard v0.2.0/go.mod h1:2RT/tf0Ce0UDj5y243iWKosQogJd8+1G3Rs2fxmlYnw=
921922
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0=
922923
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
923-
github.com/replicatedhq/embedded-cluster-operator v0.3.0 h1:DeSueBy8krZjEITyzjfordeve+hMQ1bLgTt5Uk+mj8E=
924-
github.com/replicatedhq/embedded-cluster-operator v0.3.0/go.mod h1:9DfU7ulB6+x9QNKg0cKeBk4a01uNw1rwvE07Axhvi38=
924+
github.com/replicatedhq/embedded-cluster-operator v0.4.1 h1:4LMbS5Z8adVe+nO4lFG0oI926RiQgSKOn3h2yjHXShI=
925+
github.com/replicatedhq/embedded-cluster-operator v0.4.1/go.mod h1:Z9hN4T1105PiYVh2UcgkYLSLLQDhQiuP3aDB8KDBGZA=
925926
github.com/replicatedhq/kotskinds v0.0.0-20230724164735-f83482cc9cfe h1:3AJInd06UxzqHmgy8+24CPsT2tYSE0zToJZyuX9q+MA=
926927
github.com/replicatedhq/kotskinds v0.0.0-20230724164735-f83482cc9cfe/go.mod h1:QjhIUu3+OmHZ09u09j3FCoTt8F3BYtQglS+OLmftu9I=
927928
github.com/replicatedhq/troubleshoot v0.77.0 h1:vQs2qb4ZsoS+dxfOnKu+RBwFBO+DTrb+dg2Nmyk+lzw=
@@ -1419,8 +1420,8 @@ golang.org/x/tools v0.0.0-20201013201025-64a9e34f3752/go.mod h1:z6u4i615ZeAfBE4X
14191420
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
14201421
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
14211422
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
1422-
golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ=
1423-
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
1423+
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
1424+
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
14241425
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
14251426
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
14261427
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1562,25 +1563,25 @@ honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzE
15621563
k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI=
15631564
k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8=
15641565
k8s.io/api v0.20.5/go.mod h1:FQjAceXnVaWDeov2YUWhOb6Yt+5UjErkp6UO3nczO1Y=
1565-
k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
1566-
k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc=
1566+
k8s.io/api v0.28.4 h1:8ZBrLjwosLl/NYgv1P7EQLqoO8MGQApnbgH8tu3BMzY=
1567+
k8s.io/api v0.28.4/go.mod h1:axWTGrY88s/5YE+JSt4uUi6NMM+gur1en2REMR7IRj0=
15671568
k8s.io/apiextensions-apiserver v0.19.2/go.mod h1:EYNjpqIAvNZe+svXVx9j4uBaVhTB4C94HkY3w058qcg=
15681569
k8s.io/apiextensions-apiserver v0.28.3 h1:Od7DEnhXHnHPZG+W9I97/fSQkVpVPQx2diy+2EtmY08=
15691570
k8s.io/apiextensions-apiserver v0.28.3/go.mod h1:NE1XJZ4On0hS11aWWJUTNkmVB03j9LM7gJSisbRt8Lc=
15701571
k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
15711572
k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
15721573
k8s.io/apimachinery v0.20.5/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
1573-
k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A=
1574-
k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8=
1574+
k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8=
1575+
k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
15751576
k8s.io/apiserver v0.19.2/go.mod h1:FreAq0bJ2vtZFj9Ago/X0oNGC51GfubKK/ViOKfVAOA=
15761577
k8s.io/apiserver v0.20.5/go.mod h1:AY3lKhcJ2Tm81XvvcBzk2VnKINSoN+qczYsdo2YEvIc=
15771578
k8s.io/cli-runtime v0.19.2/go.mod h1:CMynmJM4Yf02TlkbhKxoSzi4Zf518PukJ5xep/NaNeY=
15781579
k8s.io/cli-runtime v0.20.2/go.mod h1:FjH6uIZZZP3XmwrXWeeYCbgxcrD6YXxoAykBaWH0VdM=
15791580
k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA=
15801581
k8s.io/client-go v0.20.2/go.mod h1:kH5brqWqp7HDxUFKoEgiI4v8G1xzbe9giaCenUWJzgE=
15811582
k8s.io/client-go v0.20.5/go.mod h1:Ee5OOMMYvlH8FCZhDsacjMlCBwetbGZETwo1OA+e6Zw=
1582-
k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4=
1583-
k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo=
1583+
k8s.io/client-go v0.28.4 h1:Np5ocjlZcTrkyRJ3+T3PkXDpe4UpatQxj85+xjaD2wY=
1584+
k8s.io/client-go v0.28.4/go.mod h1:0VDZFpgoZfelyP5Wqu0/r/TRYcLYuJ2U1KEeoaPa1N4=
15841585
k8s.io/code-generator v0.19.2/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=
15851586
k8s.io/code-generator v0.20.2/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
15861587
k8s.io/code-generator v0.20.5/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=

‎pkg/config/config.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ func getControllerRoleName() string {
353353
controllerRoleName := "controller"
354354
if err == nil {
355355
if clusterConfig != nil {
356-
if clusterConfig.Spec.Controller.Name != "" {
357-
controllerRoleName = clusterConfig.Spec.Controller.Name
356+
if clusterConfig.Spec.Roles.Controller.Name != "" {
357+
controllerRoleName = clusterConfig.Spec.Roles.Controller.Name
358358
}
359359
}
360360
}
@@ -366,8 +366,8 @@ func additionalControllerLabels() map[string]string {
366366

367367
if err == nil {
368368
if clusterConfig != nil {
369-
if clusterConfig.Spec.Controller.Labels != nil {
370-
return clusterConfig.Spec.Controller.Labels
369+
if clusterConfig.Spec.Roles.Controller.Labels != nil {
370+
return clusterConfig.Spec.Roles.Controller.Labels
371371
}
372372
}
373373
}

0 commit comments

Comments
 (0)