Skip to content

Revert 155 change crds definitions and rename providerConfig to providerSpec #168

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

Closed
wants to merge 4 commits into from
Closed

Revert 155 change crds definitions and rename providerConfig to providerSpec #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e239af
Remove apiserver-builder dependency
Jan 9, 2019
c4e09da
Revert "Support both providerConfig and providerSpec under machine CR…
ingvagabund Jan 9, 2019
5438753
Rename providerConfig to providerSpec
ingvagabund Jan 9, 2019
5b1386b
Update cluster-api dep to include ProviderSpec
ingvagabund Jan 9, 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
29 changes: 4 additions & 25 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.

3 changes: 2 additions & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ required = [

[[override]]
name = "sigs.k8s.io/cluster-api"
branch = "master"
# Pin to the same revision as aws actuator has
revision = "cba244b06de7d29777036551e6b32817878d1fcd"

[[override]]
name = "k8s.io/code-generator"
Expand Down
20 changes: 8 additions & 12 deletions cmd/nodelink-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,32 @@ import (
"sync"
"time"

"github.com/golang/glog"
"github.com/spf13/pflag"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
coreinformers "k8s.io/client-go/informers/core/v1"
"k8s.io/client-go/kubernetes"
kubeclientset "k8s.io/client-go/kubernetes"
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
corelister "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"
"k8s.io/client-go/util/workqueue"

"github.com/golang/glog"
"github.com/kubernetes-incubator/apiserver-builder/pkg/controller"
"github.com/spf13/pflag"
"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
"sigs.k8s.io/controller-runtime/pkg/client/config"

capiv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
capiclient "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
capiinformersfactory "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions"
capiinformers "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions/cluster/v1alpha1"
lister "sigs.k8s.io/cluster-api/pkg/client/listers_generated/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/pkg/controller/config"

kubeinformers "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes"
capiinformersfactory "sigs.k8s.io/cluster-api/pkg/client/informers_generated/externalversions"
)

const (
Expand Down Expand Up @@ -429,16 +429,12 @@ var (
logLevel string
)

func init() {
config.ControllerConfig.AddFlags(pflag.CommandLine)
}

func main() {

pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
pflag.Parse()

config, err := controller.GetConfig(config.ControllerConfig.Kubeconfig)
config, err := config.GetConfig()
if err != nil {
glog.Fatalf("Could not create Config for talking to the apiserver: %v", err)
}
Expand Down
97 changes: 31 additions & 66 deletions install/0000_50_machine-api-operator_02_machine.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,75 +22,40 @@ spec:
metadata:
type: object
spec:
anyOf:
- type: object
properties:
configSource:
type: object
metadata:
type: object
providerSpec:
properties:
value:
type: object
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: object
taints:
items:
properties:
configSource:
type: object
metadata:
type: object
providerSpec:
properties:
value:
type: object
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
required:
- providerSpec
- type: object
properties:
configSource:
type: object
metadata:
type: object
providerConfig:
properties:
value:
type: object
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: object
taints:
items:
valueFrom:
properties:
machineClass:
properties:
provider:
type: string
type: object
type: object
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
taints:
items:
type: object
required:
- providerConfig
type: array
versions:
properties:
controlPlane:
type: string
kubelet:
type: string
required:
- kubelet
type: object
required:
- providerSpec
type: object
status:
properties:
addresses:
Expand Down
Loading