diff --git a/Gopkg.lock b/Gopkg.lock index 19686e20f7..b68a6de240 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -374,8 +374,7 @@ version = "v1.4.2" [[projects]] - branch = "master" - digest = "1:689b3b1987d5248b956837dedfd7da013efc1ff6c662f8a22cd9088afa290cc4" + digest = "1:8a5594cfb48c87f2e1d54ac443bc466c98e74484e4da43647f995836788a94ad" name = "github.com/openshift/cluster-api-actuator-pkg" packages = [ "pkg/e2e/framework", @@ -383,7 +382,7 @@ "pkg/types", ] pruneopts = "T" - revision = "95150a82b5ae6ef9244f19dff48625f7f2c6f0e1" + revision = "6983d93876009e8c004dfe7868c1dece4a9d1137" [[projects]] digest = "1:e5d0bd87abc2781d14e274807a470acd180f0499f8bf5bb18606e9ec22ad9de9" diff --git a/Gopkg.toml b/Gopkg.toml index fb886f3571..b5b695d2d7 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -25,7 +25,11 @@ required = [ [[override]] name = "sigs.k8s.io/cluster-api" branch = "master" - #revision = "0734939e05aeb64ab198e3feeee8b4e90ee5cbb2" + +[[override]] + #branch = "master" + name = "github.com/openshift/cluster-api-actuator-pkg" + revision = "6983d93876009e8c004dfe7868c1dece4a9d1137" # STANZAS BELOW ARE GENERATED AND MAY BE WRITTEN - DO NOT MODIFY BELOW THIS LINE. diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.lock b/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.lock index e790c561f7..f3721ab28e 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.lock +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.lock @@ -752,6 +752,14 @@ pruneopts = "" revision = "4242d8e6c5dba56827bb7bcf14ad11cda38f3991" +[[projects]] + digest = "1:4f5eb833037cc0ba0bf8fe9cae6be9df62c19dd1c869415275c708daa8ccfda5" + name = "k8s.io/klog" + packages = ["."] + pruneopts = "" + revision = "a5bc97fbc634d635061f3146511332c7e313a55a" + version = "v0.1.0" + [[projects]] branch = "master" digest = "1:bb17aab96138a89eb0550fbf135a9812f6be8bc9805080e36c9efe50f607261e" @@ -761,7 +769,8 @@ revision = "5d05df014ac640f14b5e777958248251c2ef5e86" [[projects]] - digest = "1:e421451f5d6a27697b1e6ce6f7b7b0e088841c556757ead74834d23ea9995226" + branch = "master" + digest = "1:c3f06fd90052ca9c02f7288e32bbaaaa75241cbca3d551a646e912975eb956ec" name = "sigs.k8s.io/cluster-api" packages = [ "pkg/apis/cluster/common", @@ -771,7 +780,7 @@ "pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1", ] pruneopts = "" - revision = "0734939e05aeb64ab198e3feeee8b4e90ee5cbb2" + revision = "cba244b06de7d29777036551e6b32817878d1fcd" [[projects]] digest = "1:6cad2468c5831529b860a01f09032f6ff38202bc4f76332ef7ad74a993e4aa5a" diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.toml b/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.toml index a4bc4cc19a..e95056b13a 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.toml +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/Gopkg.toml @@ -48,7 +48,5 @@ required = [ [[constraint]] name = "sigs.k8s.io/cluster-api" - #branch = "master" - # Due to breaking change: https://github.com/kubernetes-sigs/cluster-api/pull/548 - # TODO(jchaloup): bump to newer after the KubeCon is over - revision = "0734939e05aeb64ab198e3feeee8b4e90ee5cbb2" + branch = "master" + diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusterapi.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusterapi.go index 393bb3031b..6b02fde547 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusterapi.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/clusterapi.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -func (f *Framework) DeployClusterAPIStack(clusterAPINamespace, actuatorImage, actuatorPrivateKey string) { +func (f *Framework) DeployClusterAPIStack(clusterAPINamespace, actuatorPrivateKey string) { f.By("Deploying cluster API stack components") @@ -66,7 +66,7 @@ func (f *Framework) DeployClusterAPIStack(clusterAPINamespace, actuatorImage, ac f.ErrNotExpected(err) f.By("Deploying machine API controllers") - deploymentManifest := manifests.ClusterAPIControllersDeployment(clusterAPINamespace, actuatorImage, actuatorPrivateKey) + deploymentManifest := manifests.ClusterAPIControllersDeployment(clusterAPINamespace, f.MachineControllerImage, f.MachineManagerImage, f.NodelinkControllerImage, actuatorPrivateKey) _, err = f.KubeClient.AppsV1().Deployments(deploymentManifest.Namespace).Create(deploymentManifest) f.ErrNotExpected(err) @@ -85,10 +85,10 @@ func (f *Framework) DeployClusterAPIStack(clusterAPINamespace, actuatorImage, ac f.By("Cluster API stack deployed") } -func (f *Framework) DestroyClusterAPIStack(clusterAPINamespace, actuatorImage, actuatorPrivateKey string) { +func (f *Framework) DestroyClusterAPIStack(clusterAPINamespace, actuatorPrivateKey string) { f.By("Deleting machine API controllers") - deploymentManifest := manifests.ClusterAPIControllersDeployment(clusterAPINamespace, actuatorImage, actuatorPrivateKey) + deploymentManifest := manifests.ClusterAPIControllersDeployment(clusterAPINamespace, f.MachineControllerImage, f.MachineManagerImage, f.NodelinkControllerImage, actuatorPrivateKey) err := WaitUntilDeleted(func() error { return f.KubeClient.AppsV1().Deployments(deploymentManifest.Namespace).Delete(deploymentManifest.Name, &metav1.DeleteOptions{}) }, func() error { diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/framework.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/framework.go index 5b8b9f3f9b..12476c8a9f 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/framework.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework/framework.go @@ -52,7 +52,9 @@ var sshkey string // Default ssh user var sshuser string -var actuatorImage string +var machineControllerImage string +var machineManagerImage string +var nodelinkControllerImage string var libvirtURI string var libvirtPK string @@ -62,7 +64,10 @@ func init() { flag.StringVar(&ClusterID, "cluster-id", "", "cluster ID") flag.StringVar(&sshkey, "ssh-key", "", "Path to private ssh to connect to instances (e.g. to download kubeconfig or copy docker images)") flag.StringVar(&sshuser, "ssh-user", "ec2-user", "Ssh user to connect to instances") - flag.StringVar(&actuatorImage, "actuator-image", "gcr.io/k8s-cluster-api/machine-controller:0.0.1", "Actuator image to run") + flag.StringVar(&machineControllerImage, "machine-controller-image", "gcr.io/k8s-cluster-api/machine-controller:0.0.1", "Machine controller (actuator) image to run") + flag.StringVar(&machineManagerImage, "machine-manager-image", "gcr.io/k8s-cluster-api/machine-controller:0.0.1", "Machine manager image to run") + flag.StringVar(&nodelinkControllerImage, "nodelink-controller-image", "gcr.io/k8s-cluster-api/machine-controller:0.0.1", "Nodelink controller image to run") + // libvirt specific flags flag.StringVar(&libvirtURI, "libvirt-uri", "", "Libvirt URI to connect to libvirt from within machine controller container") flag.StringVar(&libvirtPK, "libvirt-pk", "", "Private key to connect to qemu+ssh libvirt uri") @@ -93,7 +98,10 @@ type Framework struct { LibvirtURI string LibvirtPK string - ActuatorImage string + MachineControllerImage string + MachineManagerImage string + NodelinkControllerImage string + ErrNotExpected ErrNotExpectedFnc By ByFnc } @@ -116,7 +124,9 @@ func NewFramework() (*Framework, error) { LibvirtURI: libvirtURI, LibvirtPK: libvirtPK, - ActuatorImage: actuatorImage, + MachineControllerImage: machineControllerImage, + MachineManagerImage: machineManagerImage, + NodelinkControllerImage: nodelinkControllerImage, } f.ErrNotExpected = f.DefaultErrNotExpected @@ -139,11 +149,13 @@ func DefaultSSHConfig() (*SSHConfig, error) { func NewFrameworkFromConfig(config *rest.Config, sshConfig *SSHConfig) (*Framework, error) { f := &Framework{ - RestConfig: config, - SSH: sshConfig, - ActuatorImage: actuatorImage, - LibvirtURI: libvirtURI, - LibvirtPK: libvirtPK, + RestConfig: config, + SSH: sshConfig, + MachineControllerImage: machineControllerImage, + MachineManagerImage: machineManagerImage, + NodelinkControllerImage: nodelinkControllerImage, + LibvirtURI: libvirtURI, + LibvirtPK: libvirtPK, } f.ErrNotExpected = f.DefaultErrNotExpected diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go index 057fe8d0dd..24297491be 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/manifests/manifests.go @@ -93,7 +93,7 @@ func ClusterCRDManifest() *v1beta1.CustomResourceDefinition { }, }, }, - "providerConfig": { + "providerSpec": { Type: "object", Properties: map[string]v1beta1.JSONSchemaProps{ "value": { @@ -195,7 +195,7 @@ func MachineCRDManifest() *v1beta1.CustomResourceDefinition { "spec": { Type: "object", Required: []string{ - "providerConfig", + "providerSpec", }, Properties: map[string]v1beta1.JSONSchemaProps{ "versions": { @@ -218,7 +218,7 @@ func MachineCRDManifest() *v1beta1.CustomResourceDefinition { "metadata": { Type: "object", }, - "providerConfig": { + "providerSpec": { Type: "object", Properties: map[string]v1beta1.JSONSchemaProps{ "value": { @@ -392,7 +392,7 @@ func MachineSetCRDManifest() *v1beta1.CustomResourceDefinition { "spec": { Type: "object", Required: []string{ - "providerConfig", + "providerSpec", }, Properties: map[string]v1beta1.JSONSchemaProps{ "configSource": { @@ -401,7 +401,7 @@ func MachineSetCRDManifest() *v1beta1.CustomResourceDefinition { "metadata": { Type: "object", }, - "providerConfig": { + "providerSpec": { Type: "object", Properties: map[string]v1beta1.JSONSchemaProps{ "value": { @@ -535,7 +535,7 @@ func MachineDeploymentCRDManifest() *v1beta1.CustomResourceDefinition { "spec": { Type: "object", Required: []string{ - "providerConfig", + "providerSpec", }, Properties: map[string]v1beta1.JSONSchemaProps{ "versions": { @@ -558,7 +558,7 @@ func MachineDeploymentCRDManifest() *v1beta1.CustomResourceDefinition { "metadata": { Type: "object", }, - "providerConfig": { + "providerSpec": { Type: "object", Properties: map[string]v1beta1.JSONSchemaProps{ "valueFrom": { @@ -715,7 +715,7 @@ func ClusterRoleBinding(clusterAPINamespace string) *rbacv1.ClusterRoleBinding { } } -func ClusterAPIControllersDeployment(clusterAPINamespace, actuatorImage string, ActuatorPrivateKey string) *appsv1.Deployment { +func ClusterAPIControllersDeployment(clusterAPINamespace, machineControllerImage, machineManagerImage, nodelinkControllerImage, ActuatorPrivateKey string) *appsv1.Deployment { var replicas int32 = 1 deployment := &appsv1.Deployment{ ObjectMeta: metav1.ObjectMeta{ @@ -765,7 +765,7 @@ func ClusterAPIControllersDeployment(clusterAPINamespace, actuatorImage string, Containers: []apiv1.Container{ { Name: fmt.Sprintf("machine-controller"), - Image: actuatorImage, + Image: machineControllerImage, VolumeMounts: []apiv1.VolumeMount{ { Name: "config", @@ -809,7 +809,7 @@ func ClusterAPIControllersDeployment(clusterAPINamespace, actuatorImage string, { Name: "nodelink-controller", // TODO(jchaloup): use other than the latest tag - Image: "openshift/origin-machine-api-operator:latest", + Image: nodelinkControllerImage, VolumeMounts: []apiv1.VolumeMount{ { Name: "config", @@ -834,7 +834,7 @@ func ClusterAPIControllersDeployment(clusterAPINamespace, actuatorImage string, }, { Name: "manager", - Image: actuatorImage, + Image: machineManagerImage, Command: []string{ "/manager", }, @@ -902,7 +902,7 @@ func ClusterAPIControllersDeployment(clusterAPINamespace, actuatorImage string, return deployment } -func TestingMachine(clusterID string, namespace string, providerConfig clusterv1alpha1.ProviderConfig) *clusterv1alpha1.Machine { +func TestingMachine(clusterID string, namespace string, providerSpec clusterv1alpha1.ProviderSpec) *clusterv1alpha1.Machine { randomUUID := string(uuid.NewUUID()) machine := &clusterv1alpha1.Machine{ ObjectMeta: metav1.ObjectMeta{ @@ -919,7 +919,7 @@ func TestingMachine(clusterID string, namespace string, providerConfig clusterv1 "node-role.kubernetes.io/compute": "", }, }, - ProviderConfig: providerConfig, + ProviderSpec: providerSpec, Versions: clusterv1alpha1.MachineVersionInfo{ Kubelet: "1.10.1", ControlPlane: "1.10.1", @@ -930,7 +930,7 @@ func TestingMachine(clusterID string, namespace string, providerConfig clusterv1 return machine } -func MasterMachine(clusterID, namespace string, providerConfig clusterv1alpha1.ProviderConfig) *clusterv1alpha1.Machine { +func MasterMachine(clusterID, namespace string, providerSpec clusterv1alpha1.ProviderSpec) *clusterv1alpha1.Machine { randomUUID := string(uuid.NewUUID()) machine := &clusterv1alpha1.Machine{ ObjectMeta: metav1.ObjectMeta{ @@ -942,7 +942,7 @@ func MasterMachine(clusterID, namespace string, providerConfig clusterv1alpha1.P }, }, Spec: clusterv1alpha1.MachineSpec{ - ProviderConfig: providerConfig, + ProviderSpec: providerSpec, Versions: clusterv1alpha1.MachineVersionInfo{ Kubelet: "1.10.1", ControlPlane: "1.10.1", @@ -1003,7 +1003,7 @@ func WorkerMachineUserDataSecret(secretName, namespace, masterIP string) (*apiv1 }, nil } -func WorkerMachineSet(clusterID, namespace string, providerConfig clusterv1alpha1.ProviderConfig) *clusterv1alpha1.MachineSet { +func WorkerMachineSet(clusterID, namespace string, providerSpec clusterv1alpha1.ProviderSpec) *clusterv1alpha1.MachineSet { var replicas int32 = 1 randomUUID := string(uuid.NewUUID()) return &clusterv1alpha1.MachineSet{ @@ -1037,7 +1037,7 @@ func WorkerMachineSet(clusterID, namespace string, providerConfig clusterv1alpha "node-role.kubernetes.io/compute": "", }, }, - ProviderConfig: providerConfig, + ProviderSpec: providerSpec, Versions: clusterv1alpha1.MachineVersionInfo{ Kubelet: "1.10.1", ControlPlane: "1.10.1",