Skip to content
This repository was archived by the owner on Oct 4, 2019. It is now read-only.

Update.version.runtime controller #23

Merged
corinnekrych merged 3 commits into from
May 2, 2019
Merged

Update.version.runtime controller #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90f2ebe
update to 0.2.0-alpha.0 for runtime-controller
corinnekrych Apr 24, 2019
0fb38aa
update component with subresource:status
corinnekrych Apr 25, 2019
daa8af1
instance label should design component's name
corinnekrych Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 35 additions & 30 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion pkg/apis/devconsole/v1alpha1/component_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand All @@ -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 (
Expand Down
4 changes: 3 additions & 1 deletion pkg/apis/devconsole/v1alpha1/component_types_labels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/devconsole/v1alpha1/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down