diff --git a/Gopkg.lock b/Gopkg.lock index cca39f1..ea06aa3 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -69,12 +69,12 @@ version = "v0.19.0" [[projects]] - digest = "1:9059915429f7f3a5f18cfa6b7cab9a28721d7ac6db4079a62044aa229eb7f2a8" + digest = "1:53151cc4366e3945282d4b783fd41f35222cabbc75601e68d8133648c63498d1" name = "github.com/gobuffalo/envy" packages = ["."] pruneopts = "NT" - revision = "fa0dfdc10b5366ce365b7d9d1755a03e4e797bc5" - version = "v1.6.15" + revision = "043cb4b8af871b49563291e32c66bb84378a60ac" + version = "v1.7.0" [[projects]] digest = "1:0b39706cfa32c1ba9e14435b5844d04aef81b60f44b6077e61e0607d56692603" @@ -96,12 +96,12 @@ revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" [[projects]] - branch = "master" digest = "1:52c5834e2bebac9030c97cc0798ac11c3aa8a39f098aeb419f142533da6cd3cc" name = "github.com/google/gofuzz" packages = ["."] pruneopts = "NT" - revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" + revision = "f140a6486e521aad38f5917de355cbf147cc0496" + version = "v1.0.0" [[projects]] digest = "1:f5b9328966ccea0970b1d15075698eff0ddb3e75889560aad2e9f76b289b536a" @@ -121,7 +121,7 @@ [[projects]] branch = "master" - digest = "1:1832b664bdd6ff3139a8590c907044d7d440cd10fa46979d89fe98a11b75b256" + digest = "1:782fb677791a7fe7b5b8e637bcf695efb13950ce09e3e8e3b1cf21c57649be7c" name = "github.com/mailru/easyjson" packages = [ "buffer", @@ -129,7 +129,7 @@ "jwriter", ] pruneopts = "NT" - revision = "1de009706dbeb9d05f18586f0735fcdb7c524481" + revision = "1ea4449da9834f4d333f1cc461c374aea217d249" [[projects]] digest = "1:56dbf15e091bf7926cb33a57cb6bdfc658fc6d3498d2f76f10a97ce7856f1fde" @@ -164,7 +164,7 @@ version = "v0.8.1" [[projects]] - digest = "1:fcef1ce61da6f8f6f115154fb0e0e5b159fe11656839ba1e6061372711c013ee" + digest = "1:a4644e85e1f29f9825a4e61dcdd8244fe7c4db02eead3f508d5a5bdf7924dbbd" name = "github.com/rogpeppe/go-internal" packages = [ "modfile", @@ -172,8 +172,8 @@ "semver", ] pruneopts = "NT" - revision = "1cf9852c553c5b7da2d5a4a091129a7822fed0c9" - version = "v1.2.2" + revision = "438578804ca6f31be148c27683afc419ce47c06e" + version = "v1.3.0" [[projects]] digest = "1:49b6e0d199dc20969bf7c9d14647313e1dd1b102178fad4ca999d8a9584edfab" @@ -196,7 +196,7 @@ [[projects]] branch = "master" - digest = "1:318eeba3eb64a2c2b6fdaa988b6d08dadde9ec7b6ff909d72dd87735be65f7d9" + digest = "1:940590250ff6229f11678ea802c15e75768bf39b6440d24025bc5bede1f40367" name = "golang.org/x/net" packages = [ "http/httpguts", @@ -205,16 +205,18 @@ "idna", ] pruneopts = "NT" - revision = "74de082e2cca95839e88aa0aeee5aadf6ce7710f" + revision = "4829fb13d2c62012c17688fa7f629f371014946d" [[projects]] - digest = "1:8c74f97396ed63cc2ef04ebb5fc37bb032871b8fd890a25991ed40974b00cd2a" + digest = "1:bce3b076d7b21ce3bc1fbc868222c86852e424762ec9b3e4bfc76f29805342f8" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -228,12 +230,12 @@ "width", ] pruneopts = "NT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + revision = "c942b20a5d85b458c4dce1589326051d85e25d6d" + version = "v0.3.1" [[projects]] branch = "master" - digest = "1:195c610154bae0beffb044dc9aa7fbd14134aba6b6df38e46486adb07188483d" + digest = "1:76c0816d46d54b4a0f4287be305b0f8d1d95c4283d65c6d54da47cd7db5b08c4" name = "golang.org/x/tools" packages = [ "go/ast/astutil", @@ -249,7 +251,7 @@ "internal/semver", ] pruneopts = "NT" - revision = "4c644d7e323d3b4a3883d4e238b908fe615f7586" + revision = "cb2dda6eabdf9160e66ca7293897f984154a7f8b" [[projects]] digest = "1:2d1fbdc6777e5408cabeb02bf336305e724b925ff4546ded0fa8715a7267922a" @@ -268,11 +270,12 @@ version = "v2.2.2" [[projects]] - digest = "1:6fa82ea248029bbbdddade20c06ab177ff6e485e5e45e48b045707415b7efd34" + digest = "1:18b9b70bdf29da610c0df032cf60ee7526a48756fa44012cc639dcb557335cbc" name = "k8s.io/api" packages = ["rbac/v1"] pruneopts = "NT" - revision = "05914d821849570fba9eacfb29466f2d8d3cd229" + revision = "5cb15d34447165a97c76ed5a60e4e99c8a01ecfe" + version = "kubernetes-1.13.4" [[projects]] digest = "1:c6f23048e162e65d586c809fd02e263e180ad157f110df17437c22517bb59a4b" @@ -282,10 +285,11 @@ "pkg/apis/apiextensions/v1beta1", ] pruneopts = "NT" - revision = "0fe22c71c47604641d9aa352c785b7912c200562" + revision = "d002e88f6236312f0289d9d1deab106751718ff0" + version = "kubernetes-1.13.4" [[projects]] - digest = "1:15b5c41ff6faa4d0400557d4112d6337e1abc961c65513d44fce7922e32c9ca7" + digest = "1:f44b5a32a31245ea062cd397cc343bda06d75c731596589996c1f77634e653af" name = "k8s.io/apimachinery" packages = [ "pkg/api/resource", @@ -311,7 +315,8 @@ "third_party/forked/golang/reflect", ] pruneopts = "NT" - revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd" + revision = "86fb29eff6288413d76bd8506874fddd9fccdff0" + version = "kubernetes-1.13.4" [[projects]] digest = "1:dc1ae99dcab96913d81ae970b1f7a7411a54199b14bfb17a7e86f9a56979c720" @@ -361,12 +366,12 @@ revision = "e17681d19d3ac4837a019ece36c2a0ec31ffe985" [[projects]] - digest = "1:29f93bb84d907a2c035e729e19d66fe52165d8c905cb3ef1920140d76ae6afaf" + digest = "1:300621bb4f98c1440b7298b376058928baf1fceb221a7f4520a92b7b9919bb3d" name = "k8s.io/klog" packages = ["."] pruneopts = "NT" - revision = "71442cd4037d612096940ceb0f3fec3f7fff66e0" - version = "v0.2.0" + revision = "e531227889390a39d9533dde61f590fe9f4b0035" + version = "v0.3.0" [[projects]] digest = "1:c48a795cd7048bb1888273bc604b6e69b22f9b8089c3df65f77cc527757b515c" @@ -383,12 +388,12 @@ revision = "0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803" [[projects]] - digest = "1:06035489efbd51ccface65fc878ceeb849aba05b2f9443c8993f363fc96e80ac" + digest = "1:f27c48732f0350be071e81d971a62afb9f5f1ff686ee6cf2b5e14c9266f50741" name = "sigs.k8s.io/controller-runtime" - packages = ["pkg/runtime/scheme"] + packages = ["pkg/scheme"] pruneopts = "NT" - revision = "12d98582e72927b6cd0123e2b4e819f9341ce62c" - version = "v0.1.10" + revision = "4276f3895df0acc9249f817eb86a47a3db6b7a9e" + version = "v0.2.0-alpha.0" [[projects]] digest = "1:0a14ea9a2647d064bb9d48b2de78306e74b196681efd7b654eb0b518d90c2e8d" @@ -422,7 +427,7 @@ "k8s.io/gengo/args", "k8s.io/kube-openapi/cmd/openapi-gen", "k8s.io/kube-openapi/pkg/common", - "sigs.k8s.io/controller-runtime/pkg/runtime/scheme", + "sigs.k8s.io/controller-runtime/pkg/scheme", "sigs.k8s.io/controller-tools/pkg/crd/generator", ] solver-name = "gps-cdcl" diff --git a/Gopkg.toml b/Gopkg.toml index 3b51fb0..9966adc 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -27,25 +27,25 @@ required = [ [[override]] name = "sigs.k8s.io/controller-tools" version = "=v0.1.8" - [[override]] name = "k8s.io/api" - # revision for tag "kubernetes-1.13.1" - revision = "05914d821849570fba9eacfb29466f2d8d3cd229" + version = "kubernetes-1.13.4" [[override]] name = "k8s.io/apiextensions-apiserver" - # revision for tag "kubernetes-1.13.1" - revision = "0fe22c71c47604641d9aa352c785b7912c200562" + version = "kubernetes-1.13.4" [[override]] name = "k8s.io/apimachinery" - # revision for tag "kubernetes-1.13.1" - revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd" + version = "kubernetes-1.13.4" + +[[override]] + name = "k8s.io/client-go" + version = "kubernetes-1.13.4" [[override]] name = "sigs.k8s.io/controller-runtime" - version = "=v0.1.10" + version = "v0.2.0-alpha.0" [prune] go-tests = true diff --git a/pkg/apis/devconsole/v1alpha1/component_types.go b/pkg/apis/devconsole/v1alpha1/component_types.go index 477e085..4fe325c 100644 --- a/pkg/apis/devconsole/v1alpha1/component_types.go +++ b/pkg/apis/devconsole/v1alpha1/component_types.go @@ -6,6 +6,7 @@ import ( // ComponentSpec defines the desired state of Component. // +k8s:openapi-gen=true +// +kubebuilder:subresource:status type ComponentSpec struct { // BuildType is the container image used to build (nodejs, golang etc..). BuildType string `json:"buildType"` @@ -24,7 +25,7 @@ type ComponentStatus struct { // It is linked to the ObjectMeta.ResourceVersion of the component. RevNumber string `json:"revNumber,omitempty"` // Phase indicates which phase the component build and deployment process is. - Phase string `json:"phase,omitempty"` + Phase string `json:"phase,omitempty"` } const ( diff --git a/pkg/apis/devconsole/v1alpha1/component_types_labels.go b/pkg/apis/devconsole/v1alpha1/component_types_labels.go index 38df400..5d0b8f1 100644 --- a/pkg/apis/devconsole/v1alpha1/component_types_labels.go +++ b/pkg/apis/devconsole/v1alpha1/component_types_labels.go @@ -25,7 +25,9 @@ func (c *Component) GetLabelPartOf() string { func (c *Component) GetLabelInstance() string { instance := c.Labels["app.kubernetes.io/instance"] if instance == "" { - instance = c.GetLabelName() + // Set instance to the component's name. + // This is used in secondary resource (bc, dc, build) as label selector for a given component. + instance = c.Name } return instance } diff --git a/pkg/apis/devconsole/v1alpha1/register.go b/pkg/apis/devconsole/v1alpha1/register.go index b28dd08..c08b073 100644 --- a/pkg/apis/devconsole/v1alpha1/register.go +++ b/pkg/apis/devconsole/v1alpha1/register.go @@ -7,7 +7,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/runtime/schema" - "sigs.k8s.io/controller-runtime/pkg/runtime/scheme" + "sigs.k8s.io/controller-runtime/pkg/scheme" ) var (