From 96c82e377dd3f90fc38aa72a5e8e2d05c026f01d Mon Sep 17 00:00:00 2001 From: Enxebre Date: Wed, 10 Apr 2019 18:04:00 +0200 Subject: [PATCH 1/2] Fix controllers naming --- ...anager-controllers.yaml => machine-api-controllers.yaml} | 6 +++--- pkg/operator/sync.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename owned-manifests/{clusterapi-manager-controllers.yaml => machine-api-controllers.yaml} (95%) diff --git a/owned-manifests/clusterapi-manager-controllers.yaml b/owned-manifests/machine-api-controllers.yaml similarity index 95% rename from owned-manifests/clusterapi-manager-controllers.yaml rename to owned-manifests/machine-api-controllers.yaml index 989547f93..3320f0e1e 100644 --- a/owned-manifests/clusterapi-manager-controllers.yaml +++ b/owned-manifests/machine-api-controllers.yaml @@ -1,7 +1,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: clusterapi-manager-controllers + name: machine-api-controllers namespace: {{ .TargetNamespace }} labels: api: clusterapi @@ -39,7 +39,7 @@ spec: - name: controller-manager image: {{ .Controllers.Provider }} command: - - "./manager" + - /manager args: - --logtostderr=true - --v=3 @@ -70,7 +70,7 @@ spec: requests: cpu: 10m memory: 20Mi - - name: machine-healthcheck + - name: machine-healthcheck-controller image: {{ .Controllers.MachineHealthCheck }} command: - /machine-healthcheck diff --git a/pkg/operator/sync.go b/pkg/operator/sync.go index 4d7be4549..fd74c387c 100644 --- a/pkg/operator/sync.go +++ b/pkg/operator/sync.go @@ -48,7 +48,7 @@ func (optr *Operator) syncAll(config OperatorConfig) error { } func (optr *Operator) syncClusterAPIController(config OperatorConfig) error { - controllerBytes, err := PopulateTemplate(&config, filepath.Join(ownedManifestsDir, "clusterapi-manager-controllers.yaml")) + controllerBytes, err := PopulateTemplate(&config, filepath.Join(ownedManifestsDir, "machine-api-controllers.yaml")) if err != nil { return err } From 80fd3124f5b1df94bf529164fe570c2c51968e07 Mon Sep 17 00:00:00 2001 From: Enxebre Date: Mon, 15 Apr 2019 19:08:37 +0200 Subject: [PATCH 2/2] Revendor for tests to support new deployment naming https://github.com/openshift/cluster-api-actuator-pkg/pull/63 --- Gopkg.lock | 4 ++-- .../pkg/e2e/operators/machine-api-operator.go | 13 ++++++++++--- .../pkg/e2e/operators/utils.go | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index af80a8ab1..fed271589 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -438,7 +438,7 @@ [[projects]] branch = "master" - digest = "1:61745f35032f46da3e23c6b454209c5146c0166aff19d6cbc2477a384868252a" + digest = "1:ada209c942e97be1ee2b8310da6f393df8b5789175eca2b580184b81eb469b39" name = "github.com/openshift/cluster-api-actuator-pkg" packages = [ "pkg/e2e", @@ -451,7 +451,7 @@ "pkg/types", ] pruneopts = "" - revision = "f9925b22c1414c7c65704030ec11463beee95138" + revision = "480b54695c31cb66af3b8d0925d5c3adef044b05" [[projects]] branch = "master" diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators/machine-api-operator.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators/machine-api-operator.go index 6c3f77590..c128b831a 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators/machine-api-operator.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators/machine-api-operator.go @@ -8,6 +8,10 @@ import ( e2e "github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/framework" ) +var ( + deploymentDeprecatedName = "clusterapi-manager-controllers" +) + var _ = g.Describe("[Feature:Operators] Machine API operator deployment should", func() { defer g.GinkgoRecover() @@ -23,9 +27,13 @@ var _ = g.Describe("[Feature:Operators] Machine API operator deployment should", client, err := e2e.LoadClient() o.Expect(err).NotTo(o.HaveOccurred()) - deploymentName := "clusterapi-manager-controllers" + deploymentName := "machine-api-controllers" initialDeployment, err := getDeployment(client, deploymentName) - o.Expect(err).NotTo(o.HaveOccurred()) + if err != nil { + initialDeployment, err = getDeployment(client, deploymentDeprecatedName) + o.Expect(err).NotTo(o.HaveOccurred()) + deploymentName = deploymentDeprecatedName + } g.By(fmt.Sprintf("checking deployment %q is available", deploymentName)) o.Expect(isDeploymentAvailable(client, deploymentName)).To(o.BeTrue()) @@ -37,7 +45,6 @@ var _ = g.Describe("[Feature:Operators] Machine API operator deployment should", g.By(fmt.Sprintf("checking deployment %q is available again", deploymentName)) o.Expect(isDeploymentAvailable(client, deploymentName)).To(o.BeTrue()) }) - }) var _ = g.Describe("[Feature:Operators] Machine API cluster operator status should", func() { diff --git a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators/utils.go b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators/utils.go index a47ee2a6c..d0e2581aa 100644 --- a/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators/utils.go +++ b/vendor/github.com/openshift/cluster-api-actuator-pkg/pkg/e2e/operators/utils.go @@ -45,7 +45,7 @@ func deleteDeployment(client runtimeclient.Client, deployment *kappsapi.Deployme } func isDeploymentAvailable(client runtimeclient.Client, name string) bool { - if err := wait.PollImmediate(1*time.Second, e2e.WaitMedium, func() (bool, error) { + if err := wait.PollImmediate(1*time.Second, e2e.WaitLong, func() (bool, error) { d, err := getDeployment(client, name) if err != nil { glog.Errorf("Error getting deployment: %v", err)