Skip to content

Commit 5fc0d5b

Browse files
liranmaudaliranmauda
authored
Merge pull request #1261 from liranmauda/liran-bumping-rook-5_13
[5.13] Bumping rook to v1.11.4 and k8s.io/api to v0.26.4
2 parents 2e167e5 + dbe700c commit 5fc0d5b

File tree

5 files changed

+36
-26
lines changed

5 files changed

+36
-26
lines changed

‎deploy/crds/noobaa.io_backingstores_crd.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ spec:
168168
description: "Claims lists the names of resources, defined
169169
in spec.resourceClaims, that are used by this container.
170170
\n This is an alpha field and requires enabling the DynamicResourceAllocation
171-
feature gate. \n This field is immutable."
171+
feature gate. \n This field is immutable. It can only be
172+
set for containers."
172173
items:
173174
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
174175
properties:

‎deploy/crds/noobaa.io_noobaas_crd.yaml

+9-5
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,8 @@ spec:
900900
description: "Claims lists the names of resources, defined in
901901
spec.resourceClaims, that are used by this container. \n This
902902
is an alpha field and requires enabling the DynamicResourceAllocation
903-
feature gate. \n This field is immutable."
903+
feature gate. \n This field is immutable. It can only be set
904+
for containers."
904905
items:
905906
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
906907
properties:
@@ -955,7 +956,8 @@ spec:
955956
description: "Claims lists the names of resources, defined in
956957
spec.resourceClaims, that are used by this container. \n This
957958
is an alpha field and requires enabling the DynamicResourceAllocation
958-
feature gate. \n This field is immutable."
959+
feature gate. \n This field is immutable. It can only be set
960+
for containers."
959961
items:
960962
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
961963
properties:
@@ -1020,7 +1022,8 @@ spec:
10201022
description: "Claims lists the names of resources, defined in
10211023
spec.resourceClaims, that are used by this container. \n This
10221024
is an alpha field and requires enabling the DynamicResourceAllocation
1023-
feature gate. \n This field is immutable."
1025+
feature gate. \n This field is immutable. It can only be set
1026+
for containers."
10241027
items:
10251028
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
10261029
properties:
@@ -1200,7 +1203,7 @@ spec:
12001203
in spec.resourceClaims, that are used by this container.
12011204
\n This is an alpha field and requires enabling the
12021205
DynamicResourceAllocation feature gate. \n This field
1203-
is immutable."
1206+
is immutable. It can only be set for containers."
12041207
items:
12051208
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
12061209
properties:
@@ -1334,7 +1337,8 @@ spec:
13341337
description: "Claims lists the names of resources, defined
13351338
in spec.resourceClaims, that are used by this container.
13361339
\n This is an alpha field and requires enabling the DynamicResourceAllocation
1337-
feature gate. \n This field is immutable."
1340+
feature gate. \n This field is immutable. It can only be
1341+
set for containers."
13381342
items:
13391343
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
13401344
properties:

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ require (
2525
github.com/openshift/cloud-credential-operator v0.0.0-20210716145643-0ee1808fb8ed
2626
github.com/openshift/custom-resource-status v1.1.2
2727
github.com/operator-framework/api v0.17.3
28-
github.com/operator-framework/operator-lib v0.11.0
28+
github.com/operator-framework/operator-lib v0.11.1-0.20230126194151-7fc7204a9445
2929
github.com/pkg/errors v0.9.1
3030
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.63.0
31-
github.com/rook/rook v1.11.3
31+
github.com/rook/rook v1.11.4
3232
github.com/sirupsen/logrus v1.9.0
3333
github.com/spf13/cobra v1.6.1
3434
github.com/spf13/pflag v1.0.5
3535
golang.org/x/term v0.5.0
3636
google.golang.org/api v0.109.0
37-
k8s.io/api v0.26.1
37+
k8s.io/api v0.26.4
3838
k8s.io/apiextensions-apiserver v0.26.1
39-
k8s.io/apimachinery v0.26.1
39+
k8s.io/apimachinery v0.26.4
4040
k8s.io/cli-runtime v0.25.4
4141
k8s.io/client-go v0.26.1
4242
k8s.io/code-generator v0.26.1

‎go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -1673,8 +1673,8 @@ github.com/openshift/library-go v0.0.0-20200911100307-610c6e9e90b8/go.mod h1:NI6
16731673
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:FfH+VrHHk6Lxt9HdVS0PXzSXFyS2NbZKXv33FYPol0A=
16741674
github.com/operator-framework/api v0.17.3 h1:wddE1SLKTNiIzwt28DbBIO+vPG2GOV6dkB9xBkDfT3o=
16751675
github.com/operator-framework/api v0.17.3/go.mod h1:34tb98EwTN5SZLkgoxwvRkhMJKLHUWHOrrcv1ZwvEeA=
1676-
github.com/operator-framework/operator-lib v0.11.0 h1:eYzqpiOfq9WBI4Trddisiq/X9BwCisZd3rIzmHRC9Z8=
1677-
github.com/operator-framework/operator-lib v0.11.0/go.mod h1:RpyKhFAoG6DmKTDIwMuO6pI3LRc8IE9rxEYWy476o6g=
1676+
github.com/operator-framework/operator-lib v0.11.1-0.20230126194151-7fc7204a9445 h1:gCyT/BU8gqYDup40C9vFkn0e2z4KlmKRCOtEC1WfFVQ=
1677+
github.com/operator-framework/operator-lib v0.11.1-0.20230126194151-7fc7204a9445/go.mod h1:lxhjtIxa4WwJTKsmhWipEDr2RYjs7VjRlD1vtBMXbco=
16781678
github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
16791679
github.com/oracle/oci-go-sdk v13.1.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
16801680
github.com/oracle/oci-go-sdk v24.3.0+incompatible h1:x4mcfb4agelf1O4/1/auGlZ1lr97jXRSSN5MxTgG/zU=
@@ -1812,8 +1812,8 @@ github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
18121812
github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
18131813
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
18141814
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
1815-
github.com/rook/rook v1.11.3 h1:dijg6WRMH2sNE2T+qXK09FkuLoqQlZ4FpLmkQ1kjGmY=
1816-
github.com/rook/rook v1.11.3/go.mod h1:RwQdIZvb7BGomy9yR9caWYCoT8pHngYsxBXg6Fl8LZk=
1815+
github.com/rook/rook v1.11.4 h1:V5+r8JnVpSCdWGZ8eV5zUX1SnMTgCnz3azux+7Jefzc=
1816+
github.com/rook/rook v1.11.4/go.mod h1:RwQdIZvb7BGomy9yR9caWYCoT8pHngYsxBXg6Fl8LZk=
18171817
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
18181818
github.com/rs/zerolog v1.4.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
18191819
github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -2872,8 +2872,8 @@ k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
28722872
k8s.io/api v0.22.2/go.mod h1:y3ydYpLJAaDI+BbSe2xmGcqxiWHmWjkEeIbiwHvnPR8=
28732873
k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ=
28742874
k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8=
2875-
k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
2876-
k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
2875+
k8s.io/api v0.26.4 h1:qSG2PmtcD23BkYiWfoYAcak870eF/hE7NNYBYavTT94=
2876+
k8s.io/api v0.26.4/go.mod h1:WwKEXU3R1rgCZ77AYa7DFksd9/BAIKyOmRlbVxgvjCk=
28772877
k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
28782878
k8s.io/apiextensions-apiserver v0.17.0/go.mod h1:XiIFUakZywkUl54fVXa7QTEHcqQz9HG55nHd1DCoHj8=
28792879
k8s.io/apiextensions-apiserver v0.18.0-beta.2/go.mod h1:Hnrg5jx8/PbxRbUoqDGxtQkULjwx8FDW4WYJaKNK+fk=
@@ -2899,8 +2899,8 @@ k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MA
28992899
k8s.io/apimachinery v0.22.2/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
29002900
k8s.io/apimachinery v0.23.3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
29012901
k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
2902-
k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
2903-
k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
2902+
k8s.io/apimachinery v0.26.4 h1:rZccKdBLg9vP6J09JD+z8Yr99Ce8gk3Lbi9TCx05Jzs=
2903+
k8s.io/apimachinery v0.26.4/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
29042904
k8s.io/apiserver v0.17.0/go.mod h1:ABM+9x/prjINN6iiffRVNCBR2Wk7uY4z+EtEGZD48cg=
29052905
k8s.io/apiserver v0.18.0-beta.2/go.mod h1:bnblMkMoCFnIfVnVftd0SXJPzyvrk3RtaqSbblphF/A=
29062906
k8s.io/apiserver v0.18.3/go.mod h1:tHQRmthRPLUtwqsOnJJMoI8SW3lnoReZeE861lH8vUw=

‎pkg/bundle/deploy.go

+13-8
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ roleRef:
104104
name: noobaa.noobaa.io
105105
`
106106

107-
const Sha256_deploy_crds_noobaa_io_backingstores_crd_yaml = "4e5794deec0a962fe42352d9fb56182f3e052d94a404277e084fdc47fed9ffd2"
107+
const Sha256_deploy_crds_noobaa_io_backingstores_crd_yaml = "8ffffa6e21cfd3c8d5ae8d64e90c733807057543856c02e3832992beb50db630"
108108

109109
const File_deploy_crds_noobaa_io_backingstores_crd_yaml = `apiVersion: apiextensions.k8s.io/v1
110110
kind: CustomResourceDefinition
@@ -276,7 +276,8 @@ spec:
276276
description: "Claims lists the names of resources, defined
277277
in spec.resourceClaims, that are used by this container.
278278
\n This is an alpha field and requires enabling the DynamicResourceAllocation
279-
feature gate. \n This field is immutable."
279+
feature gate. \n This field is immutable. It can only be
280+
set for containers."
280281
items:
281282
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
282283
properties:
@@ -1265,7 +1266,7 @@ spec:
12651266
status: {}
12661267
`
12671268

1268-
const Sha256_deploy_crds_noobaa_io_noobaas_crd_yaml = "813b6af0d38eddc034a7bec55c1fff5255d8d7e3707da939abb060803c55c6b8"
1269+
const Sha256_deploy_crds_noobaa_io_noobaas_crd_yaml = "7c5af817f04354a9f15d0baaea074115faff24b6ddb18e76c33931cf24da04c6"
12691270

12701271
const File_deploy_crds_noobaa_io_noobaas_crd_yaml = `apiVersion: apiextensions.k8s.io/v1
12711272
kind: CustomResourceDefinition
@@ -2169,7 +2170,8 @@ spec:
21692170
description: "Claims lists the names of resources, defined in
21702171
spec.resourceClaims, that are used by this container. \n This
21712172
is an alpha field and requires enabling the DynamicResourceAllocation
2172-
feature gate. \n This field is immutable."
2173+
feature gate. \n This field is immutable. It can only be set
2174+
for containers."
21732175
items:
21742176
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
21752177
properties:
@@ -2224,7 +2226,8 @@ spec:
22242226
description: "Claims lists the names of resources, defined in
22252227
spec.resourceClaims, that are used by this container. \n This
22262228
is an alpha field and requires enabling the DynamicResourceAllocation
2227-
feature gate. \n This field is immutable."
2229+
feature gate. \n This field is immutable. It can only be set
2230+
for containers."
22282231
items:
22292232
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
22302233
properties:
@@ -2289,7 +2292,8 @@ spec:
22892292
description: "Claims lists the names of resources, defined in
22902293
spec.resourceClaims, that are used by this container. \n This
22912294
is an alpha field and requires enabling the DynamicResourceAllocation
2292-
feature gate. \n This field is immutable."
2295+
feature gate. \n This field is immutable. It can only be set
2296+
for containers."
22932297
items:
22942298
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
22952299
properties:
@@ -2469,7 +2473,7 @@ spec:
24692473
in spec.resourceClaims, that are used by this container.
24702474
\n This is an alpha field and requires enabling the
24712475
DynamicResourceAllocation feature gate. \n This field
2472-
is immutable."
2476+
is immutable. It can only be set for containers."
24732477
items:
24742478
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
24752479
properties:
@@ -2603,7 +2607,8 @@ spec:
26032607
description: "Claims lists the names of resources, defined
26042608
in spec.resourceClaims, that are used by this container.
26052609
\n This is an alpha field and requires enabling the DynamicResourceAllocation
2606-
feature gate. \n This field is immutable."
2610+
feature gate. \n This field is immutable. It can only be
2611+
set for containers."
26072612
items:
26082613
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
26092614
properties:

0 commit comments

Comments
 (0)