Skip to content

Commit 1405058

Browse files
Move to client-go 8. (zalando#362)
Not much changes, except for one function that has been deprecated. However, unless we find a way to use semantic version comparisons like '^' on a branch name, we would have to update the apimachinery, apiextensions-apiserver and code-generator dependencies manually. Also, slash a linter warning about RoleOriginUnknown being not used.
1 parent b06186e commit 1405058

File tree

3 files changed

+42
-52
lines changed

3 files changed

+42
-52
lines changed

glide.lock

Lines changed: 22 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import:
1111
- package: github.com/lib/pq
1212
- package: github.com/motomux/pretty
1313
- package: k8s.io/apimachinery
14-
version: kubernetes-1.9.9
14+
version: kubernetes-1.11.1
1515
- package: k8s.io/apiextensions-apiserver
16-
version: kubernetes-1.9.9
16+
version: kubernetes-1.11.1
1717
- package: k8s.io/client-go
18-
version: ^6.0.0
18+
version: ^8.0.0
1919
- package: k8s.io/code-generator
20-
version: kubernetes-1.9.9
20+
version: kubernetes-1.11.1
2121
- package: k8s.io/gengo
2222
- package: gopkg.in/yaml.v2
2323
- package: github.com/mohae/deepcopy

pkg/spec/types.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,23 @@ func (n *NamespacedName) UnmarshalJSON(data []byte) error {
205205
// DecodeWorker separates the decode logic to (unit) test
206206
// from obtaining the operator namespace that depends on k8s mounting files at runtime
207207
func (n *NamespacedName) DecodeWorker(value, operatorNamespace string) error {
208-
name := types.NewNamespacedNameFromString(value)
208+
var (
209+
name types.NamespacedName
210+
)
209211

210-
if strings.Trim(value, string(types.Separator)) != "" && name == (types.NamespacedName{}) {
211-
name.Name = value
212-
name.Namespace = operatorNamespace
213-
} else if name.Namespace == "" {
214-
name.Namespace = operatorNamespace
212+
result := strings.SplitN(value, string(types.Separator), 2)
213+
if len(result) < 2 {
214+
name.Name = result[0]
215+
} else {
216+
name.Name = strings.TrimLeft(result[1], string(types.Separator))
217+
name.Namespace = result[0]
215218
}
216-
217219
if name.Name == "" {
218220
return fmt.Errorf("incorrect namespaced name: %v", value)
219221
}
222+
if name.Namespace == "" {
223+
name.Namespace = operatorNamespace
224+
}
220225

221226
*n = NamespacedName(name)
222227

@@ -225,6 +230,8 @@ func (n *NamespacedName) DecodeWorker(value, operatorNamespace string) error {
225230

226231
func (r RoleOrigin) String() string {
227232
switch r {
233+
case RoleOriginUnknown:
234+
return "unknown"
228235
case RoleOriginManifest:
229236
return "manifest role"
230237
case RoleOriginInfrastructure:
@@ -233,8 +240,9 @@ func (r RoleOrigin) String() string {
233240
return "teams API role"
234241
case RoleOriginSystem:
235242
return "system role"
243+
default:
244+
panic(fmt.Sprintf("bogus role origin value %d", r))
236245
}
237-
return "unknown"
238246
}
239247

240248
// GetOperatorNamespace assumes serviceaccount secret is mounted by kubernetes

0 commit comments

Comments
 (0)