From c72892a07f080a813121b4f2e0c1dfb6619a922c Mon Sep 17 00:00:00 2001 From: Morgante Pell Date: Thu, 8 Jul 2021 17:18:55 -0400 Subject: [PATCH] add version info from ACM --- modules/acm/templates/acm-config.yml.tpl | 23 ----------------------- modules/acm/templates/root-sync.yml.tpl | 14 -------------- modules/acm/versions.tf | 24 ++++++++++++++++++++++++ 3 files changed, 24 insertions(+), 37 deletions(-) delete mode 100644 modules/acm/templates/acm-config.yml.tpl delete mode 100644 modules/acm/templates/root-sync.yml.tpl create mode 100644 modules/acm/versions.tf diff --git a/modules/acm/templates/acm-config.yml.tpl b/modules/acm/templates/acm-config.yml.tpl deleted file mode 100644 index e8ebeb966e..0000000000 --- a/modules/acm/templates/acm-config.yml.tpl +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: configmanagement.gke.io/v1 -kind: ConfigManagement -metadata: - name: config-management -spec: - # clusterName is required and must be unique among all managed clusters - clusterName: ${cluster_name} - policyController: - enabled: ${enable_policy_controller} - templateLibraryInstalled: ${install_template_library} - logDeniesEnabled: ${enable_log_denies} -%{ if enable_multi_repo ~} - enableMultiRepo: true -%{ else ~} - git: - syncRepo: ${sync_repo} - secretType: ${secret_type} - ${policy_dir_node} - ${sync_branch_node} - ${sync_revision_node} - ${source_format_node} -%{ endif ~} - ${hierarchy_controller_map_node} diff --git a/modules/acm/templates/root-sync.yml.tpl b/modules/acm/templates/root-sync.yml.tpl deleted file mode 100644 index c2ba6ec520..0000000000 --- a/modules/acm/templates/root-sync.yml.tpl +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: configsync.gke.io/v1beta1 -kind: RootSync -metadata: - name: root-sync - namespace: config-management-system -spec: - ${source_format_node} - git: - repo: ${sync_repo} - auth: ${secret_type} - ${policy_dir_node} - ${sync_branch_node} - ${sync_revision_node} - ${secret_ref_node} diff --git a/modules/acm/versions.tf b/modules/acm/versions.tf new file mode 100644 index 0000000000..6ab26ba2d6 --- /dev/null +++ b/modules/acm/versions.tf @@ -0,0 +1,24 @@ + +/** + * Copyright 2021 Google LLC + * + * 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. + */ + +terraform { + required_version = ">= 0.13.0" + + provider_meta "google" { + module_name = "blueprints/terraform/terraform-google-kubernetes-engine:acm/v15.0.2" + } +}