Support Alicloud

acre.yaml

@@ -118,6 +118,13 @@ landscape:
           chart_path: charts/gardener-extension-provider-openstack
           image_tag: (( valid( provider-openstack.tag ) ? provider-openstack.tag :~~ ))
           image_repo: (( ~~ ))
+        provider-alicloud:
+          <<: (( merge ))
+          tag: (( valid( provider-alicloud.branch ) -or valid( provider-alicloud.commit ) ? ~~ :.dependency_versions.versions.gardener.extensions.provider-alicloud.version ))
+          repo: (( .dependency_versions.versions.gardener.extensions.provider-alicloud.repo ))
+          chart_path: charts/gardener-extension-provider-alicloud
+          image_tag: (( valid( provider-alicloud.tag ) ? provider-alicloud.tag :~~ ))
+          image_repo: (( ~~ ))
         networking-calico:
           <<: (( merge ))
           tag: (( valid( networking-calico.branch ) -or valid( networking-calico.commit ) ? ~~ :.dependency_versions.versions.gardener.extensions.networking-calico.version ))
@@ -230,13 +237,15 @@ dns_type_mapping:
   aws: aws-route53
   azure: azure-dns
   openstack: openstack-designate
+  alicloud: alicloud-dns
 
 backup_type_mapping:
   <<: (( &temporary ))
   gcp: gcs
   aws: s3
   azure: abs
   openstack: swift
+  alicloud: oss
 
 
 ######################
@@ -277,6 +286,18 @@ validation:
           - ["mapfield", "internal", ["cidr"]]
           - ["mapfield", "public", ["cidr"]]
           - ["mapfield", "vpc", ["or", ["mapfield", "id"], ["mapfield", "cidr", ["cidr"]]]]
+      alicloud:
+        credentials:
+          - and
+          - ["mapfield", "accessKeyID"]
+          - ["mapfield", "accessKeySecret"]
+        config:
+          - ["mapfield", "region"]
+          - ["mapfield", "zones", ["list"]]
+        networks:
+          - ["mapfield", "internal", ["cidr"]]
+          - ["mapfield", "public", ["cidr"]]
+          - ["mapfield", "vpc", ["or", ["mapfield", "id"], ["mapfield", "cidr", ["cidr"]]]]
       azure:
         credentials:
           - and
@@ -367,6 +388,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 ))
@@ -382,6 +406,9 @@ validation:
           - <<: (( iaas.openstack.credentials ))
           - ["mapfield", "region"]
         config: (( return_true ))
+      alicloud-dns:
+        credentials: (( iaas.alicloud.credentials ))
+        config: (( return_true ))
       cloudflare-dns:
         credentials:
           - mapfield

components/dns-controller/deployment.yaml

@@ -61,6 +61,7 @@ typeToProvider:
   azure-dns: azure
   openstack-designate: openstack
   cloudflare-dns: cloudflare
+  alicloud-dns: alicloud
 
 spec:
   <<: (( &temporary ))

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,41 @@
+// 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"
+}
+
+resource "random_id" "storage_account" {
+  byte_length = 8
+}
+
+//=====================================================================
+//= OSS bucket
+//=====================================================================
+
+resource "alicloud_oss_bucket" "bucket-acl" {
+  bucket        = "${var.BUCKETNAME}${random_id.storage_account.hex}"
+  acl           = "private"
+}
+
+//=====================================================================
+//= Output variables
+//=====================================================================
+
+output "bucketName" {
+  value = "${var.BUCKETNAME}${random_id.storage_account.hex}"
+}

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/variables.tf

@@ -23,7 +23,7 @@ variable "SECRET_KEY" {
 }
 
 variable "REGION" {
-  description = "Region of the GCS bucket"
+  description = "Region of the AWS bucket"
   type        = string
 }
 

components/etcd/cluster/chart/templates/statefulset-etcd.yaml

@@ -173,4 +173,4 @@ spec:
       - "ReadWriteOnce"
       resources:
         requests:
-          storage: 10Gi
+          storage: 20Gi

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: (( "oss-" config.region "-internal.aliyuncs.com" ))
+  - name: "ALICLOUD_ACCESS_KEY_ID"
+    value: (( config.credentials.accessKeyID ))
+  - name: "ALICLOUD_ACCESS_KEY_SECRET"
+    value: (( config.credentials.accessKeySecret ))
+
+volumeMounts: []