add alicloud

acre.yaml

@@ -244,6 +244,7 @@ backup_type_mapping:
   aws: s3
   azure: abs
   openstack: swift
+  alicloud: oss
 
 
 ######################
@@ -288,7 +289,7 @@ validation:
         credentials:
           - and
           - ["mapfield", "accessKeyID"]
-          - ["mapfield", "secretAccessKey"]
+          - ["mapfield", "accessKeySecret"]
         config:
           - ["mapfield", "region"]
           - ["mapfield", "zones", ["list"]]
@@ -386,6 +387,9 @@ validation:
       swift:
         credentials: (( iaas.openstack.credentials ))
         config: (( return_true ))
+      oss:
+        credentials: (( iaas.alicloud.credentials ))
+        config: (( return_true ))
     dns:
       google-clouddns:
         credentials: (( iaas.gcp.credentials ))

components/etcd/backupinfra/provider/oss/export.yaml

@@ -0,0 +1 @@
+bucketname: (( data.terraform.outputs.bucketName.value ))

components/etcd/backupinfra/provider/oss/main.tf

@@ -0,0 +1,42 @@
+// Copyright 2019 Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+provider "alicloud" {
+  access_key = var.ACCESS_KEY
+  secret_key = var.SECRET_KEY
+  region     = var.REGION
+  version    = "=1.95.0"
+}
+
+//=====================================================================
+//= S3 bucket
+//=====================================================================
+
+resource "alicloud_oss_bucket" "bucket" {
+  bucket_prefix = var.BUCKETNAME
+  region        = var.REGION
+  force_destroy = true
+  tags = {
+    Name = var.LANDSCAPE
+  }
+}
+
+//=====================================================================
+//= Output variables
+//=====================================================================
+
+output "bucketName" {
+  value = alicloud_oss_bucket.bucket.id
+}
+

components/etcd/backupinfra/provider/oss/tfvars.yaml

@@ -0,0 +1,17 @@
+# Copyright 2019 Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ACCESS_KEY: (( config.credentials.accessKeyID ))
+SECRET_KEY: (( config.credentials.accessKeySecret ))
+LANDSCAPE: (( landscape.name ))

components/etcd/backupinfra/provider/oss/variables.tf

@@ -0,0 +1,39 @@
+// Copyright 2019 Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file.
+//
+# Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+variable "ACCESS_KEY" {
+  description = "Alicloud Access Key"
+  type        = string
+}
+
+variable "SECRET_KEY" {
+  description = "Alicloud Secret Key"
+  type        = string
+}
+
+variable "REGION" {
+  description = "Region of the OSS bucket"
+  type        = string
+}
+
+variable "BUCKETNAME" {
+  description = "Name of the bucket"
+  type        = string
+}
+
+variable "LANDSCAPE" {
+  description = "Name of the Landscape (for tagging)"
+  type        = string
+}
+

components/etcd/backupinfra/provider/oss/versions.tf

@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}

components/etcd/backupinfra/provider/s3/main.tf

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-provider "aws" {
+provider "alicloud" {
   access_key = var.ACCESS_KEY
   secret_key = var.SECRET_KEY
   region     = var.REGION
@@ -23,7 +23,7 @@ provider "aws" {
 //= S3 bucket
 //=====================================================================
 
-resource "aws_s3_bucket" "bucket" {
+resource "alicloud_oss_bucket" "bucket" {
   bucket_prefix = var.BUCKETNAME
   region        = var.REGION
   force_destroy = true

components/etcd/backupinfra/provider/s3/tfvars.yaml

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 ACCESS_KEY: (( config.credentials.accessKeyID ))
-SECRET_KEY: (( config.credentials.secretAccessKey ))
+SECRET_KEY: (( config.credentials.accessKeySecret ))
 LANDSCAPE: (( landscape.name ))

components/etcd/backupinfra/provider/s3/variables.tf

@@ -13,17 +13,17 @@
 // limitations under the License.
 
 variable "ACCESS_KEY" {
-  description = "AWS Access Key"
+  description = "OSS Access Key"
   type        = string
 }
 
 variable "SECRET_KEY" {
-  description = "AWS Secret Key"
+  description = "OSS Secret Key"
   type        = string
 }
 
 variable "REGION" {
-  description = "Region of the GCS bucket"
+  description = "Region of the Oss bucket"
   type        = string
 }
 

components/etcd/cluster/deployment.yaml

@@ -43,6 +43,7 @@ spec:
     s3: S3
     abs: ABS
     swift: Swift
+    oss: OSS
 
   server:
     commonName: garden:etcd-server:etcd

components/etcd/cluster/provider/oss/provider.yaml

@@ -0,0 +1,23 @@
+# Copyright 2019 Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, v. 2 except as noted otherwise in the LICENSE file.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+env:
+  - name: "ALICLOUD_ENDPOINT"
+    value: (( config.region ))
+  - name: "ALICLOUD_ACCESS_KEY_ID"
+    value: (( config.credentials.accessKeyID ))
+  - name: "ALICLOUD_ACCESS_KEY_SECRET"
+    value: (( config.credentials.accessKeySecret ))
+
+volumeMounts: []