Skip to content

Commit

Permalink
Merge pull request terraform-google-modules#74 from terraform-google-…
Browse files Browse the repository at this point in the history
…modules/adrienthebo/simple_zonal_no_version

Drop explicit version from simple_zonal example
  • Loading branch information
Jberlinsky committed Feb 11, 2019
2 parents e685c80 + ac914f4 commit 76b1da0
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
2 changes: 0 additions & 2 deletions examples/simple_zonal/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ module "gke" {
subnetwork = "${var.subnetwork}"
ip_range_pods = "${var.ip_range_pods}"
ip_range_services = "${var.ip_range_services}"
kubernetes_version = "1.11.4-gke.13"
node_version = "1.11.4-gke.13"
service_account = "${var.compute_engine_service_account}"
}

Expand Down
12 changes: 0 additions & 12 deletions test/integration/simple_zonal/controls/gcloud.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@
expect(data['locations'].size).to eq 1
end

it "has the expected initial cluster version" do
expect(data['initialClusterVersion']).to eq "1.11.4-gke.13"
end

it "has the expected addon settings" do
expect(data['addonsConfig']).to eq({
"horizontalPodAutoscaling" => {},
Expand Down Expand Up @@ -79,14 +75,6 @@
describe "node pool" do
let(:node_pools) { data['nodePools'].reject { |p| p['name'] == "default-pool" } }

it "is running the expected version of Kubernetes" do
expect(node_pools).to include(
including(
"version" => "1.11.4-gke.13",
)
)
end

it "has autoscaling enabled" do
expect(node_pools).to include(
including(
Expand Down

0 comments on commit 76b1da0

Please sign in to comment.