Skip to content

Commit

Permalink
fix dependecy crd module
Browse files Browse the repository at this point in the history
  • Loading branch information
bharathkkb committed Jul 27, 2020
1 parent 45a060a commit e4f79f5
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions modules/k8s-operator-crd-support/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

locals {
cluster_endpoint = "https://${var.cluster_endpoint}"
token = data.google_client_config.default.access_token
cluster_ca_certificate = data.google_container_cluster.primary.master_auth.0.cluster_ca_certificate
private_key = var.create_ssh_key && var.ssh_auth_key == null ? tls_private_key.k8sop_creds[0].private_key_pem : var.ssh_auth_key
k8sop_creds_secret_key = var.secret_type == "cookiefile" ? "cookie_file" : var.secret_type
should_download_manifest = var.operator_path == null ? true : false
Expand All @@ -26,16 +24,6 @@ locals {
policy_dir_node = var.policy_dir != "" ? format("policyDir: %s", var.policy_dir) : ""
}


data "google_container_cluster" "primary" {
name = var.cluster_name
project = var.project_id
location = var.location
}

data "google_client_config" "default" {
}

module "k8sop_manifest" {
source = "terraform-google-modules/gcloud/google"
version = "~> 1.2"
Expand All @@ -52,7 +40,7 @@ module "k8sop_manifest" {
module "k8s_operator" {
source = "github.com/terraform-google-modules/terraform-google-gcloud//modules/kubectl-wrapper"
# version = "~> 1.3"
module_depends_on = [module.k8sop_manifest.wait, data.google_client_config.default.project, data.google_container_cluster.primary.name]
module_depends_on = [module.k8sop_manifest.wait, var.cluster_endpoint]
skip_download = var.skip_gcloud_download
cluster_name = var.cluster_name
cluster_location = var.location
Expand Down

0 comments on commit e4f79f5

Please sign in to comment.