operator: remove s3 flags from operator
@@ -25,7 +25,6 @@ import (
"time"
"github.com/coreos/etcd-operator/pkg/analytics"
- "github.com/coreos/etcd-operator/pkg/backup/s3/s3config"
"github.com/coreos/etcd-operator/pkg/chaos"
"github.com/coreos/etcd-operator/pkg/client"
"github.com/coreos/etcd-operator/pkg/controller"
@@ -56,9 +55,6 @@ var (
pvProvisioner string
namespace string
name string
- awsSecret string
- awsConfig string
- s3Bucket string
listenAddr string
gcInterval time.Duration
@@ -70,13 +66,7 @@ var (
func init() {
flag.BoolVar(&analyticsEnabled, "analytics", true, "Send analytical event (Cluster Created/Deleted etc.) to Google Analytics")
flag.StringVar(&debug.DebugFilePath, "debug-logfile-path", "", "only for a self hosted cluster, the path where the debug logfile will be written, recommended to be under: /var/tmp/etcd-operator/debug/ to avoid any issue with lack of write permissions")
-
flag.StringVar(&pvProvisioner, "pv-provisioner", constants.PVProvisionerGCEPD, "persistent volume provisioner type")
- flag.StringVar(&awsSecret, "backup-aws-secret", "",
- "DEPRECATED - The name of the kube secret object that stores the AWS credential file. The file name must be 'credentials'.")
- flag.StringVar(&awsConfig, "backup-aws-config", "",
- "DEPRECATED - The name of the kube configmap object that stores the AWS config file. The file name must be 'config'.")
- flag.StringVar(&s3Bucket, "backup-s3-bucket", "", "DEPRECATED - The name of the AWS S3 bucket to store backups in.")
flag.StringVar(&listenAddr, "listen-addr", "0.0.0.0:8080", "The address on which the HTTP server will listen to")
// chaos level will be removed once we have a formal tool to inject failures.
flag.IntVar(&chaosLevel, "chaos-level", -1, "DO NOT USE IN PRODUCTION - level of chaos injected into the etcd clusters created by the operator.")
@@ -195,21 +185,10 @@ func newControllerConfig() controller.Config {
logrus.Fatalf("fail to get my pod's service account: %v", err)
}
- // TODO: remove this when deleting aws config flags.
- anySet := len(awsConfig) != 0 || len(s3Bucket) != 0 || len(awsSecret) != 0
- if anySet {
- logrus.Warn("Saving backups to S3 via operator flags is deprecated; use Cluster level configuration instead.")
- }
-
cfg := controller.Config{
Namespace: namespace,
ServiceAccount: serviceAccount,
PVProvisioner: pvProvisioner,
- S3Context: s3config.S3Context{
- AWSSecret: awsSecret,
- AWSConfig: awsConfig,
- S3Bucket: s3Bucket,
- },
KubeCli: kubecli,
KubeExtCli: k8sutil.MustNewKubeExtClient(),
EtcdCRCli: client.MustNewCRInCluster(),
