From 9a5d40e1669554e011f5027791cfeaaea9947d96 Mon Sep 17 00:00:00 2001 From: d-kuro Date: Mon, 6 Jan 2020 22:39:43 +0900 Subject: [PATCH] Fix rolling update deadlock. Remove readiness probe. --- cmd/manager/main.go | 8 -------- deploy/advanced/deployment.yaml | 8 -------- deploy/deployment.yaml | 8 -------- 3 files changed, 24 deletions(-) diff --git a/cmd/manager/main.go b/cmd/manager/main.go index d34c6c56..f12daa31 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -10,7 +10,6 @@ import ( "github.com/mumoshu/aws-secret-operator/pkg/controller" "github.com/operator-framework/operator-sdk/pkg/k8sutil" "github.com/operator-framework/operator-sdk/pkg/leader" - "github.com/operator-framework/operator-sdk/pkg/ready" sdkVersion "github.com/operator-framework/operator-sdk/version" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "sigs.k8s.io/controller-runtime/pkg/client/config" @@ -54,13 +53,6 @@ func run() error { // Become the leader before proceeding leader.Become(context.TODO(), "aws-secret-operator-lock") - r := ready.NewFileReady() - err = r.Set() - if err != nil { - return errors.Wrap(err, "failed to set") - } - defer r.Unset() - // Create a new Cmd to provide shared dependencies and start components mgr, err := manager.New(cfg, manager.Options{Namespace: namespace}) if err != nil { diff --git a/deploy/advanced/deployment.yaml b/deploy/advanced/deployment.yaml index b7b6117a..34e505e5 100644 --- a/deploy/advanced/deployment.yaml +++ b/deploy/advanced/deployment.yaml @@ -26,14 +26,6 @@ spec: command: - aws-secret-operator imagePullPolicy: Always - readinessProbe: - exec: - command: - - stat - - /tmp/operator-sdk-ready - initialDelaySeconds: 4 - periodSeconds: 10 - failureThreshold: 1 env: - name: WATCH_NAMESPACE value: "" diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml index 18fb2617..f5f35c51 100644 --- a/deploy/deployment.yaml +++ b/deploy/deployment.yaml @@ -26,14 +26,6 @@ spec: command: - aws-secret-operator imagePullPolicy: Always - readinessProbe: - exec: - command: - - stat - - /tmp/operator-sdk-ready - initialDelaySeconds: 4 - periodSeconds: 10 - failureThreshold: 1 env: - name: WATCH_NAMESPACE valueFrom: