Skip to content
This repository has been archived by the owner on Mar 6, 2024. It is now read-only.

Ferry service cluster #114

Merged
merged 37 commits into from
Jan 14, 2020
Merged

Ferry service cluster #114

merged 37 commits into from
Jan 14, 2020

Conversation

nmiculinic
Copy link
Contributor

What this PR does / why we need it:

This PR adds ServiceCluster controller to the Ferry. It periodically checks the service clusters' status and reports back to the master cluster, which is an appropriate object in the provider namespace.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #90

* Added serviceCluster controller to ferry

@kubermatic-bot kubermatic-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels Jan 8, 2020
@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nmiculinic

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 8, 2020
…cluster

# Conflicts:
#	Makefile
#	config/internal/ferry/default/kustomization.yaml
#	config/internal/ferry/rbac/role.yaml
#	config/internal/manager/crd/kustomization.yaml
#	config/operator/crd/bases/operator.kubecarrier.io_serviceclusterregistrations.yaml
#	config/operator/crd/kustomization.yaml
#	hack/codegen.sh
#	hack/gen-intelij-tasks.sh
#	pkg/apis/operator/v1alpha1/serviceclusterregistration_types.go
#	pkg/ferry/ferry.go
#	pkg/internal/resources/ferry/ferry.go
#	pkg/internal/resources/ferry/ferry.golden.yaml
#	pkg/internal/resources/ferry/statik.go
#	pkg/internal/resources/manager/manager.golden.yaml
#	pkg/internal/resources/manager/statik.go
#	pkg/internal/resources/operator/operator.golden.yaml
#	pkg/internal/resources/operator/statik.go
#	pkg/operator/operator.go
#	test/admin/ferry.go
@kubermatic-bot kubermatic-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 9, 2020
@nmiculinic nmiculinic changed the title [WIP] Federation service cluster Federation service cluster Jan 9, 2020
@kubermatic-bot kubermatic-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 10, 2020
@nmiculinic nmiculinic changed the title Federation service cluster Ferry service cluster Jan 10, 2020
test/tenant/tenant.go Outdated Show resolved Hide resolved
@kubermatic-bot kubermatic-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 14, 2020
@kubermatic-bot kubermatic-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 14, 2020
Copy link
Contributor

@jiachengxu jiachengxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jan 14, 2020
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3917ba0f583271f975abadb06929a6bdeb3fe73c

@nmiculinic
Copy link
Contributor Author

/unhold

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 14, 2020
@kubermatic-bot kubermatic-bot merged commit 9e4f10e into master Jan 14, 2020
@kubermatic-bot kubermatic-bot deleted the federation-service-cluster branch January 14, 2020 13:37
thetechnick added a commit that referenced this pull request Jan 27, 2020
* Added tender controller & serviceclusterregistration object

* Updated the tender role & added serviceClusterRegistration to the operator

* moved serviceclusterregistration ControllerObjects closer to their usage

* Added cmd logging mixin

* Added tender cmd log mixing

* update

* Renamed tender to ferry

* small nit

* minor update

* updated inline with master

* Added service cluster controller

* fixed e2e test and made sure it's working

* renamed components

* Refactored and simplified ferry main.go

* fixed merging

* Fixed rest of forgotten merge conflicts screwing up the e2e tests

* lint

* Changed group from core.kubecarrier.io to kubecarrier.io

* Update pkg/ferry/internal/controllers/servicecluster_controller.go

Co-Authored-By: Nico Schieder <nico@loodse.com>

* Added display name to serviceCluster printer column

* Made ServiceCluster upsert operation result more verbose

* renamed upsert to create or update

* renamed service-cluster to serviceCluster

* WIP --> debugging why merging master broke the build

* fixed e2e tests

* Made serviceCluster query serviceClusterVersion

* renamed cluster version to only Version

* update

Co-authored-by: Nico Schieder <Nico.schieder@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Federation] Report ServiceCluster status
4 participants