Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile and cluster status updade changes #165

Merged
merged 2 commits into from
Jul 31, 2020
Merged

Makefile and cluster status updade changes #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc1d945
Makefile: make manifests generates examples
zimnx Jul 30, 2020
4f76772
api: fix update of cluster status (#164)
zimnx Jul 30, 2020
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
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,12 @@ cert-manager:
deploy: manifests cert-manager
cd config/manager && kustomize edit set image controller=${IMG}
kustomize build config/default | kubectl apply -f -
kustomize build config/default > examples/generic/operator.yaml
kustomize build config/default > examples/gke/operator.yaml

# Generate manifests e.g. CRD, RBAC etc.
manifests: bin/deps controller-gen
$(CONTROLLER_GEN) $(CRD_OPTIONS) webhook rbac:roleName=manager-role paths="$(PKG)" output:crd:artifacts:config=config/crd/bases output:rbac:artifacts:config=config/rbac/bases

kustomize build config/default > examples/generic/operator.yaml
kustomize build config/default > examples/gke/operator.yaml
# Run go fmt against code
fmt:
go fmt $(PKG)
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/scylla.scylladb.com_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
plural: clusters
singular: cluster
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Cluster is the Schema for the clusters API
Expand Down
2 changes: 2 additions & 0 deletions examples/generic/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ spec:
singular: cluster
preserveUnknownFields: false
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Cluster is the Schema for the clusters API
Expand Down
2 changes: 2 additions & 0 deletions examples/gke/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ spec:
singular: cluster
preserveUnknownFields: false
scope: Namespaced
subresources:
status: {}
validation:
openAPIV3Schema:
description: Cluster is the Schema for the clusters API
Expand Down
1 change: 1 addition & 0 deletions pkg/api/v1alpha1/cluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ const (
)

// +kubebuilder:object:root=true
// +kubebuilder:subresource:status

// Cluster is the Schema for the clusters API
type Cluster struct {
Expand Down