Skip to content

Commit 4106418

Browse files
authored
Check for CronJob/VolumeSnapshot version only once (#1479)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent fc4e260 commit 4106418

File tree

10 files changed

+478
-28
lines changed

10 files changed

+478
-28
lines changed

go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ require (
3333
k8s.io/klog/v2 v2.80.1
3434
k8s.io/kube-aggregator v0.25.1
3535
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
36-
kmodules.xyz/client-go v0.25.4-0.20220919001439-1aa8c64d960f
36+
kmodules.xyz/client-go v0.25.6
3737
kmodules.xyz/constants v0.0.0-20220317041001-545c1e31a70a
38-
kmodules.xyz/csi-utils v0.25.1
38+
kmodules.xyz/csi-utils v0.25.3
3939
kmodules.xyz/custom-resources v0.25.0
4040
kmodules.xyz/objectstore-api v0.25.0
4141
kmodules.xyz/offshoot-api v0.25.0
@@ -187,6 +187,7 @@ require (
187187
k8s.io/component-base v0.25.1 // indirect
188188
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
189189
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
190+
kmodules.xyz/apiversion v0.2.0 // indirect
190191
kmodules.xyz/resource-metadata v0.13.0 // indirect
191192
kmodules.xyz/resource-metrics v0.25.0 // indirect
192193
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect

go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,12 +1353,14 @@ k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHU
13531353
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
13541354
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 h1:H9TCJUUx+2VA0ZiD9lvtaX8fthFsMoD+Izn93E/hm8U=
13551355
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
1356-
kmodules.xyz/client-go v0.25.4-0.20220919001439-1aa8c64d960f h1:vBDDAIDR63gDIlkn5T5bhFBtkQMgyIX75dmt2b6B2I8=
1357-
kmodules.xyz/client-go v0.25.4-0.20220919001439-1aa8c64d960f/go.mod h1:PQAVWlXoHmk/OXqIuUz3xEW5H04uidiLwVyGX0yYnBQ=
1356+
kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
1357+
kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
1358+
kmodules.xyz/client-go v0.25.6 h1:59mMNoanKrqOFYqDMtqYU5caFxd+7YrfNqpvyKYWqNE=
1359+
kmodules.xyz/client-go v0.25.6/go.mod h1:NgLAVr+IEAFpI9g7FhZF5qG0SG+SBADxknWu5jp0m8M=
13581360
kmodules.xyz/constants v0.0.0-20220317041001-545c1e31a70a h1:wo6TxmquRJwXXX/HejI6NRyfx13UzuHGjndTumlutbc=
13591361
kmodules.xyz/constants v0.0.0-20220317041001-545c1e31a70a/go.mod h1:3C5i73Z7fcMVyu5TXtPuizGD8vWAbesXFVp1ESbIa1k=
1360-
kmodules.xyz/csi-utils v0.25.1 h1:nawNvZHflavV7ARDZu7CH0KNUmx5hKtbWKp6ORGrtC8=
1361-
kmodules.xyz/csi-utils v0.25.1/go.mod h1:GL/DCW8gkFiyzwYJ82uMRqQY+O2tWyskZsgzIAxyk80=
1362+
kmodules.xyz/csi-utils v0.25.3 h1:WFnr2fni78HewJukwquk3bASoYjOEq/xi/7xXtzYU+A=
1363+
kmodules.xyz/csi-utils v0.25.3/go.mod h1:4qHSDnu+5L55wNbzpZDcEez0utzcrtHMfRfb7MrZ2yI=
13621364
kmodules.xyz/custom-resources v0.25.0 h1:5JQTEuiv6lC/+VVFNKqzfX4YtJCmN5E7mcNtGnHGVQM=
13631365
kmodules.xyz/custom-resources v0.25.0/go.mod h1:ULwzvLmOqZJcPSXKI7iLclYL5eYRlKx8Nbex28Ht19E=
13641366
kmodules.xyz/objectstore-api v0.25.0 h1:xT7+SXBqAMtVkfOdp4espHAfZ6MYUC4G1OgzTkURNnU=
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Binaries for programs and plugins
2+
*.exe
3+
*.exe~
4+
*.dll
5+
*.so
6+
*.dylib
7+
8+
# Test binary, built with `go test -c`
9+
*.test
10+
11+
# Output of the go coverage tool, specifically when used with LiteIDE
12+
*.out
13+
14+
# Dependency directories (remove the comment below to include it)
15+
vendor/
16+
.idea/
Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# apiversion
2+
3+
A Go library for parsing and comparing versions like `v1alpha1` `v1beta1`, `v1rc1` and `v1` commonly found in Kubernetes.

vendor/kmodules.xyz/apiversion/lib.go

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
package apiversion
2+
3+
import (
4+
"fmt"
5+
"regexp"
6+
"strconv"
7+
)
8+
9+
type Version struct {
10+
X int
11+
Y string
12+
Z int
13+
}
14+
15+
type InvalidVersion struct {
16+
v string
17+
}
18+
19+
func (e InvalidVersion) Error() string {
20+
return fmt.Sprintf("invalid version %s", e.v)
21+
}
22+
23+
var (
24+
re = regexp.MustCompile(`^v(\d+)(alpha|beta|rc)?(\d*)$`)
25+
)
26+
27+
func NewVersion(s string) (*Version, error) {
28+
groups := re.FindStringSubmatch(s)
29+
if len(groups) == 0 {
30+
return nil, InvalidVersion{v: s}
31+
}
32+
33+
var out Version
34+
35+
x, err := strconv.Atoi(groups[1])
36+
if err != nil {
37+
return nil, err
38+
}
39+
out.X = x
40+
41+
out.Y = groups[2]
42+
43+
if groups[3] != "" {
44+
z, err := strconv.Atoi(groups[3])
45+
if err != nil {
46+
return nil, err
47+
}
48+
out.Z = z
49+
}
50+
51+
return &out, nil
52+
}
53+
54+
// Compare returns an integer comparing two version strings.
55+
// The result will be 0 if v==other, -1 if v < other, and +1 if v > other.
56+
func (v Version) Compare(other Version) int {
57+
diffX := v.X - other.X
58+
switch {
59+
case diffX > 0:
60+
return 1
61+
case diffX < 0:
62+
return -1
63+
}
64+
65+
if v.Y != other.Y {
66+
if v.Y == "" {
67+
return 1
68+
} else if other.Y == "" {
69+
return -1
70+
} else if v.Y > other.Y {
71+
return 1
72+
} else {
73+
return -1
74+
}
75+
}
76+
77+
diffZ := v.Z - other.Z
78+
switch {
79+
case diffZ > 0:
80+
return 1
81+
case diffZ < 0:
82+
return -1
83+
}
84+
return 0
85+
}
86+
87+
// Compare returns an integer comparing two version strings.
88+
// The result will be 0 if x==y, -1 if x < y, and +1 if x > y.
89+
// An error is returned, if version string can't be parsed.
90+
func Compare(x, y string) (int, error) {
91+
xv, err := NewVersion(x)
92+
if err != nil {
93+
return 0, err
94+
}
95+
yv, err := NewVersion(y)
96+
if err != nil {
97+
return 0, err
98+
}
99+
return xv.Compare(*yv), nil
100+
}
101+
102+
// MustCompare returns an integer comparing two version strings.
103+
// The result will be 0 if x==y, -1 if x < y, and +1 if x > y.
104+
func MustCompare(x, y string) int {
105+
result, err := Compare(x, y)
106+
if err != nil {
107+
panic(err)
108+
}
109+
return result
110+
}

0 commit comments

Comments
 (0)