-
Notifications
You must be signed in to change notification settings - Fork 6
API types and basic controller/actuator scaffolding #2
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Binaries for programs and plugins | ||
| *.exe | ||
| *.exe~ | ||
| *.dll | ||
| *.so | ||
| *.dylib | ||
|
|
||
| # Test binary, build with `go test -c` | ||
| *.test | ||
|
|
||
| # Output of the go coverage tool, specifically when used with LiteIDE | ||
| *.out | ||
|
|
||
| bin/ | ||
| .gobincache/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder | ||
| WORKDIR /go/src/github.com/openshift/cluster-api-provider-packet | ||
| COPY . . | ||
| # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own | ||
| RUN unset VERSION \ | ||
| && make build GOPROXY=off NO_DOCKER=1 CGO_ENABLED=0 | ||
|
|
||
| FROM registry.svc.ci.openshift.org/ocp/4.6:base | ||
| COPY --from=builder /go/src/github.com/openshift/cluster-api-provider-packet/bin/machine-controller-manager / | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder | ||
| WORKDIR /go/src/github.com/openshift/cluster-api-provider-packet | ||
| COPY . . | ||
| # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own | ||
| RUN unset VERSION \ | ||
| && make build GOPROXY=off NO_DOCKER=1 CGO_ENABLED=0 | ||
|
|
||
| FROM registry.svc.ci.openshift.org/ocp/4.6:base | ||
| COPY --from=builder /go/src/github.com/openshift/cluster-api-provider-packet/bin/machine-controller-manager / |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| DBG ?= 0 | ||
|
|
||
| ifeq ($(DBG),1) | ||
| GOGCFLAGS ?= -gcflags=all="-N -l" | ||
| endif | ||
|
|
||
| VERSION ?= $(shell git describe --always --abbrev=7) | ||
| REPO_PATH ?= github.com/openshift/cluster-api-provider-packet | ||
| LD_FLAGS ?= -X $(REPO_PATH)/pkg/version.Raw=$(VERSION) -extldflags -static | ||
|
|
||
| GO111MODULE = on | ||
| export GO111MODULE | ||
| GOFLAGS ?= -mod=vendor | ||
| export GOFLAGS | ||
| GOPROXY ?= | ||
| export GOPROXY | ||
|
|
||
| NO_DOCKER ?= 0 | ||
| ifeq ($(NO_DOCKER), 1) | ||
| DOCKER_CMD = | ||
| IMAGE_BUILD_CMD = imagebuilder | ||
| CGO_ENABLED = 1 | ||
| else | ||
| DOCKER_CMD := docker run --rm -e CGO_ENABLED=1 -v "$(PWD)":/go/src/github.com/openshift/cluster-api-provider-packet:Z -w /go/src/openshift/cluster-api-provider-packet openshift/origin-release:golang-1.13 | ||
| IMAGE_BUILD_CMD = docker build | ||
| endif | ||
|
|
||
| .PHONY: vendor | ||
| vendor: | ||
| go mod tidy | ||
| go mod vendor | ||
| go mod verify | ||
|
|
||
| .PHONY: generate | ||
| generate: | ||
| go generate ./pkg/... ./cmd/... | ||
|
|
||
| .PHONY: fmt | ||
| fmt: ## Go fmt your code | ||
| hack/go-fmt.sh . | ||
|
|
||
| .PHONY: goimports | ||
| goimports: ## Go fmt your code | ||
| hack/goimports.sh . | ||
|
|
||
| .PHONY: vet | ||
| vet: ## Apply go vet to all go files | ||
| hack/go-vet.sh ./... | ||
|
|
||
| .PHONY: test | ||
| test: ## Run tests | ||
| @echo -e "\033[32mTesting...\033[0m" | ||
| $(DOCKER_CMD) hack/ci-test.sh | ||
|
|
||
| .PHONY: unit | ||
| unit: # Run unit test | ||
| $(DOCKER_CMD) go test -race -cover ./cmd/... ./pkg/... | ||
|
|
||
| .PHONY: sec | ||
| sec: # Run security static analysis | ||
| hack/gosec.sh ./... | ||
|
|
||
| .PHONY: build | ||
| build: ## build binaries | ||
| $(DOCKER_CMD) go build $(GOGCFLAGS) -o "bin/machine-controller-manager" \ | ||
| -ldflags "$(LD_FLAGS)" "$(REPO_PATH)/cmd/manager" | ||
|
|
||
| .PHONY: test-e2e | ||
| test-e2e: ## Run e2e tests | ||
| hack/e2e.sh |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| approvers: | ||
| - enxebre | ||
| - JoelSpeed | ||
| - detiber | ||
| - displague |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| # OpenShift cluster-api-provider-equinix-metal | ||
|
|
||
| This repository hosts an implementation of a provider for Equinix Metal for the | ||
| OpenShift [machine-api](https://github.com/openshift/cluster-api). | ||
|
|
||
| This provider runs as a machine-controller deployed by the | ||
| [machine-api-operator](https://github.com/openshift/machine-api-operator) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "flag" | ||
| "fmt" | ||
| "os" | ||
| "time" | ||
|
|
||
| configv1 "github.com/openshift/api/config/v1" | ||
| "github.com/openshift/cluster-api-provider-packet/pkg/apis" | ||
| "github.com/openshift/cluster-api-provider-packet/pkg/cloud/equinixmetal/actuators/machine" | ||
| machinesetcontroller "github.com/openshift/cluster-api-provider-packet/pkg/cloud/equinixmetal/actuators/machineset" | ||
| "github.com/openshift/cluster-api-provider-packet/pkg/version" | ||
| "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1" | ||
| capimachine "github.com/openshift/machine-api-operator/pkg/controller/machine" | ||
| "github.com/openshift/machine-api-operator/pkg/metrics" | ||
| "k8s.io/klog/v2" | ||
| "k8s.io/klog/v2/klogr" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| "sigs.k8s.io/controller-runtime/pkg/client/config" | ||
| "sigs.k8s.io/controller-runtime/pkg/controller" | ||
| "sigs.k8s.io/controller-runtime/pkg/healthz" | ||
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| ) | ||
|
|
||
| // The default durations for the leader electrion operations. | ||
| var ( | ||
| leaseDuration = 120 * time.Second | ||
| renewDealine = 110 * time.Second | ||
| retryPeriod = 20 * time.Second | ||
| ) | ||
|
|
||
| func main() { | ||
| printVersion := flag.Bool( | ||
| "version", | ||
| false, | ||
| "print version and exit", | ||
| ) | ||
|
|
||
| leaderElectResourceNamespace := flag.String( | ||
| "leader-elect-resource-namespace", | ||
| "", | ||
| "The namespace of resource object that is used for locking during leader election. If unspecified and running in cluster, defaults to the service account namespace for the controller. Required for leader-election outside of a cluster.", | ||
| ) | ||
|
|
||
| leaderElect := flag.Bool( | ||
| "leader-elect", | ||
| false, | ||
| "Start a leader election client and gain leadership before executing the main loop. Enable this when running replicated components for high availability.", | ||
| ) | ||
|
|
||
| leaderElectLeaseDuration := flag.Duration( | ||
| "leader-elect-lease-duration", | ||
| leaseDuration, | ||
| "The duration that non-leader candidates will wait after observing a leadership renewal until attempting to acquire leadership of a led but unrenewed leader slot. This is effectively the maximum duration that a leader can be stopped before it is replaced by another candidate. This is only applicable if leader election is enabled.", | ||
| ) | ||
|
|
||
| watchNamespace := flag.String( | ||
| "namespace", | ||
| "", | ||
| "Namespace that the controller watches to reconcile machine-api objects. If unspecified, the controller watches for machine-api objects across all namespaces.", | ||
| ) | ||
|
|
||
| healthAddr := flag.String( | ||
| "health-addr", | ||
| ":9440", | ||
| "The address for health checking.", | ||
| ) | ||
|
|
||
| metricsAddress := flag.String( | ||
| "metrics-bind-address", | ||
| metrics.DefaultMachineMetricsAddress, | ||
| "Address for hosting metrics", | ||
| ) | ||
|
|
||
| klog.InitFlags(nil) | ||
| flag.Set("logtostderr", "true") | ||
| flag.Parse() | ||
|
|
||
| if *printVersion { | ||
| fmt.Println(version.String) | ||
| os.Exit(0) | ||
| } | ||
|
|
||
| cfg := config.GetConfigOrDie() | ||
|
|
||
| opts := manager.Options{ | ||
| LeaderElection: *leaderElect, | ||
| LeaderElectionNamespace: *leaderElectResourceNamespace, | ||
| LeaderElectionID: "cluster-api-provider-equinixmetal-leader", | ||
| LeaseDuration: leaderElectLeaseDuration, | ||
| HealthProbeBindAddress: *healthAddr, | ||
| MetricsBindAddress: *metricsAddress, | ||
| // Slow the default retry and renew election rate to reduce etcd writes at idle: BZ 1858400 | ||
| RetryPeriod: &retryPeriod, | ||
| RenewDeadline: &renewDealine, | ||
| } | ||
|
|
||
| if *watchNamespace != "" { | ||
| opts.Namespace = *watchNamespace | ||
| klog.Infof("Watching machine-api objects only in namespace %q for reconciliation.", opts.Namespace) | ||
| } | ||
|
|
||
| // Setup a Manager | ||
| mgr, err := manager.New(cfg, opts) | ||
| if err != nil { | ||
| klog.Fatalf("Failed to set up overall controller manager: %v", err) | ||
| } | ||
|
|
||
| // Initialize machine actuator. | ||
| machineActuator := machine.NewActuator(machine.ActuatorParams{ | ||
| CoreClient: mgr.GetClient(), | ||
| EventRecorder: mgr.GetEventRecorderFor("equinixmetalcontroller"), | ||
| // ComputeClientBuilder: computeservice.NewComputeService, | ||
| }) | ||
|
|
||
| if err := apis.AddToScheme(mgr.GetScheme()); err != nil { | ||
| klog.Fatal(err) | ||
| } | ||
|
|
||
| if err := v1beta1.AddToScheme(mgr.GetScheme()); err != nil { | ||
| klog.Fatal(err) | ||
| } | ||
|
|
||
| if err := configv1.AddToScheme(mgr.GetScheme()); err != nil { | ||
| klog.Fatal(err) | ||
| } | ||
|
|
||
| if err := capimachine.AddWithActuator(mgr, machineActuator); err != nil { | ||
| klog.Fatal(err) | ||
| } | ||
|
|
||
| ctrl.SetLogger(klogr.New()) | ||
| setupLog := ctrl.Log.WithName("setup") | ||
|
|
||
| if err = (&machinesetcontroller.Reconciler{ | ||
| Client: mgr.GetClient(), | ||
| Log: ctrl.Log.WithName("controllers").WithName("MachineSet"), | ||
| }).SetupWithManager(mgr, controller.Options{}); err != nil { | ||
| setupLog.Error(err, "unable to create controller", "controller", "MachineSet") | ||
| os.Exit(1) | ||
| } | ||
|
|
||
| if err := mgr.AddReadyzCheck("ping", healthz.Ping); err != nil { | ||
| klog.Fatal(err) | ||
| } | ||
|
|
||
| if err := mgr.AddHealthzCheck("ping", healthz.Ping); err != nil { | ||
| klog.Fatal(err) | ||
| } | ||
|
|
||
| if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil { | ||
| klog.Fatalf("Failed to run manager: %v", err) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| module github.com/openshift/cluster-api-provider-packet | ||
|
|
||
| go 1.13 | ||
|
|
||
| require ( | ||
| github.com/blang/semver v3.5.1+incompatible | ||
| github.com/go-logr/logr v0.2.1 | ||
| github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971 | ||
| github.com/openshift/machine-api-operator v0.2.1-0.20201002104344-6abfb5440597 | ||
|
|
||
| // kube 1.18 | ||
| k8s.io/api v0.19.0 | ||
| k8s.io/apimachinery v0.19.0 | ||
| k8s.io/client-go v0.19.0 | ||
| k8s.io/klog/v2 v2.3.0 | ||
| sigs.k8s.io/controller-runtime v0.6.2 | ||
| sigs.k8s.io/controller-tools v0.3.0 | ||
| sigs.k8s.io/yaml v1.2.0 | ||
| ) | ||
|
|
||
| replace ( | ||
| sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20200929152424-eab2e087f366 | ||
|
detiber marked this conversation as resolved.
|
||
| sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20200929220456-04e680e51d03 | ||
| ) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Who can help us rename this project to
cluster-api-provider-equinix-metal? (or unhyphenatedequinixmetal, I don't know if there is a preference for technical or historical reasons)