mirror of https://github.com/kubernetes/kops.git
Verify addon versions in BootstrapChannelBuilder
This commit is contained in:
parent
19f35385b2
commit
a2bc9cca26
|
@ -1,9 +1,22 @@
|
|||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
|
||||
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = ["channel.go"],
|
||||
importpath = "k8s.io/kops/channels/pkg/api",
|
||||
visibility = ["//visibility:public"],
|
||||
deps = ["//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library"],
|
||||
deps = [
|
||||
"//vendor/github.com/blang/semver:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
go_test(
|
||||
name = "go_default_test",
|
||||
srcs = ["channel_test.go"],
|
||||
embed = [":go_default_library"],
|
||||
deps = [
|
||||
"//vendor/github.com/stretchr/testify/assert:go_default_library",
|
||||
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||
],
|
||||
)
|
||||
|
|
|
@ -17,6 +17,9 @@ limitations under the License.
|
|||
package api
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/blang/semver"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
)
|
||||
|
||||
|
@ -60,3 +63,21 @@ type AddonSpec struct {
|
|||
// switch kubernetes versions.
|
||||
Id string `json:"id,omitempty"`
|
||||
}
|
||||
|
||||
func (a *Addons) Verify() error {
|
||||
for _, addon := range a.Spec.Addons {
|
||||
if addon != nil && addon.Version != nil && *addon.Version != "" {
|
||||
name := a.ObjectMeta.Name
|
||||
if addon.Name != nil {
|
||||
name = *addon.Name
|
||||
}
|
||||
|
||||
_, err := semver.ParseTolerant(*addon.Version)
|
||||
if err != nil {
|
||||
return fmt.Errorf("addon %q has unparseable version %q: %v", name, *addon.Version, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -0,0 +1,50 @@
|
|||
/*
|
||||
Copyright 2020 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package api
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
)
|
||||
|
||||
func Test_UnparseableVersion(t *testing.T) {
|
||||
addons := Addons{
|
||||
TypeMeta: v1.TypeMeta{
|
||||
Kind: "Addons",
|
||||
},
|
||||
ObjectMeta: v1.ObjectMeta{
|
||||
Name: "test",
|
||||
},
|
||||
Spec: AddonsSpec{
|
||||
Addons: []*AddonSpec{
|
||||
{
|
||||
Name: s("testaddon"),
|
||||
Version: s("1.0-kops"),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
err := addons.Verify()
|
||||
assert.EqualError(t, err, "addon \"testaddon\" has unparseable version \"1.0-kops\": Short version cannot contain PreRelease/Build meta data", "detected invalid version")
|
||||
}
|
||||
|
||||
func s(v string) *string {
|
||||
return &v
|
||||
}
|
|
@ -44,6 +44,10 @@ var _ fi.ModelBuilder = &BootstrapChannelBuilder{}
|
|||
// Build is responsible for adding the addons to the channel
|
||||
func (b *BootstrapChannelBuilder) Build(c *fi.ModelBuilderContext) error {
|
||||
addons := b.buildAddons()
|
||||
if err := addons.Verify(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
tasks := c.Tasks
|
||||
|
||||
for _, a := range addons.Spec.Addons {
|
||||
|
|
Loading…
Reference in New Issue