Enable alicloud

acre.yaml

@@ -105,6 +105,13 @@ landscape:
           chart_path: charts/gardener-extension-provider-aws
           image_tag: (( valid( provider-aws.tag ) ? provider-aws.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: (( ~~ ))
         provider-gcp:
           <<: (( merge ))
           tag: (( valid( provider-gcp.branch ) -or valid( provider-gcp.commit ) ? ~~ :.dependency_versions.versions.gardener.extensions.provider-gcp.version ))
@@ -277,13 +284,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
 
 
 ######################
@@ -331,6 +340,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"]]
+        profileConfig:
+          - (( return_true ))
+        networks:
+          - ["mapfield", "vpc", ["or", ["mapfield", "id"], ["mapfield", "cidr", ["cidr"]]]]
       azure:
         credentials:
           - and
@@ -493,6 +514,9 @@ validation:
       swift:
         credentials: (( iaas.openstack.credentials ))
         config: (( return_true ))
+      oss:
+        credentials: (( iaas.alicloud.credentials ))
+        config: (( return_true ))
     backup_config:
       - <<: (( &template ))
       - and
@@ -516,6 +540,9 @@ validation:
       azure-dns:
         credentials: (( iaas.azure.credentials ))
         config: (( return_true ))
+      alicloud-dns:
+        credentials: (( iaas.alicloud.credentials ))
+        config: (( return_true ))
       openstack-designate:
         credentials:
           - <<: (( iaas.openstack.credentials ))

components/dns-controller/deployment.yaml

@@ -62,6 +62,7 @@ typeToProvider:
   openstack-designate: openstack
   cloudflare-dns: cloudflare
   infoblox-dns: infoblox
+  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,46 @@
+// 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" {
+  version    = "~> 1.162.0"
+  access_key = var.ACCESS_KEY
+  secret_key = var.SECRET_KEY
+  region     = var.REGION
+}
+
+//=====================================================================
+//= OSS bucket
+//=====================================================================
+
+resource "alicloud_oss_bucket" "bucket" {
+  bucket      = var.BUCKETNAME
+  acl         = "private"
+  force_destroy = true
+  server_side_encryption_rule {
+    sse_algorithm = "KMS"
+  }
+  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 ALICLOUD 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/cluster/chart/templates/statefulset-etcd.yaml

@@ -173,4 +173,4 @@ spec:
       - "ReadWriteOnce"
       resources:
         requests:
-          storage: 10Gi
+          storage: {{ .Values.volumeClaimTemplates.requests.storage }}

components/etcd/cluster/chart/values.yaml

@@ -46,6 +46,10 @@ resources:
     cpu: 1000m
     memory: 2560Mi
 
+volumeClaimTemplates:
+  requests:
+    storage: 10Gi
+
 # Aws S3 storage configuration
 # Note: No volumeMounts variable needed
 # storageProvider: "S3"

components/etcd/cluster/deployment.yaml

@@ -43,6 +43,7 @@ spec:
     s3: S3
     abs: ABS
     swift: Swift
+    oss: OSS
 
   server:
     commonName: garden:etcd-server:etcd
@@ -91,7 +92,7 @@ etcd:
       backup:
         schedule: (( defined(landscape.etcd.backup.schedule) ? landscape.etcd.backup.schedule :"0 */24 * * *" )) # Backup interval (default 24h)
         maxBackups: (( defined(landscape.etcd.backup.maxBackups) ? landscape.etcd.backup.maxBackups :7 )) # Maximum number of backups to keep (default 7)
-        storageProvider: (( landscape.etcd.backup.active ? spec.providertypes.[landscape.etcd.backup.type] :"" ))  # Abs,Gcs,S3,Swift empty means no backup,
+        storageProvider: (( landscape.etcd.backup.active ? spec.providertypes.[landscape.etcd.backup.type] :"" ))  # Abs,Gcs,S3,Swift,OSS empty means no backup,
         secretData: (( sum[temp.config.credentials|{}|c,k,v|->c {k=base64(v)}] ))
         storageContainer: (( landscape.etcd.backup.active ? imports.backupinfra.export.bucketname :~ ))
         env: (( temp.addon.env ))
@@ -110,6 +111,9 @@ etcd:
 
       resources:
         <<: (( landscape.etcd.resources || ~~ ))
+      volumeClaimTemplates:
+        requests:
+          storage: (( landscape.iaas.[0].type == "alicloud" ? "20Gi" :"10Gi" ))
   events:
     kubeconfig: (( landscape.clusters.[0].kubeconfig ))
     files:
@@ -135,4 +139,7 @@ etcd:
         client:
           crt: (( state.client.value.cert ))
           key: (( state.client.value.key ))
+      volumeClaimTemplates:
+        requests:
+          storage: (( landscape.iaas.[0].type == "alicloud" ? "20Gi" :"10Gi" ))
 

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: []