update upgrade guide #2665

megan07 · 2019-11-12T23:54:27Z

updating upgrade doc

`access_context_manager`: Made `os_type` required on block `google_access_context_manager_access_level.basic.conditions.device_policy.os_constraints`.

`app_engine`: Made `script_path` required on `google_app_engine_standard_app_version.handlers.script`.

`bigquery`: Made `role` required on `google_bigquery_dataset.access`.

`bigtable`: Made exactly one of `single_cluster_routing` or `multi_cluster_routing_use_any` required on `google_bigtable_app_profile`.

`binary_authorization`: Made `name_pattern` required on `google_binary_authorization_policy.admission_whitelist_patterns`.

`binary_authorization`: Made `evaluation_mode` and `enforcement_mode` required on `google_binary_authorization_policy.cluster_admission_rules`.

`cloudbuild`: Made exactly one of `filename` or `build` required on `google_cloudbuild_trigger`.

`cloudscheduler`: Made exactly one of `pubsub_target`, `http_target` or `app_engine_http_target` required on `google_cloudscheduler_job`.

`compute`: Made exactly one of `http_health_check`, `https_health_check`, `http2_health_check`, `tcp_health_check` or `ssl_health_check` required on `google_compute_health_check`.

`compute`: Made exactly one of `http_health_check`, `https_health_check`, `http2_health_check`, `tcp_health_check` or `ssl_health_check` required on `google_compute_region_health_check`.

`monitoring`: Made exactly one of `http_check` or `tcp_check` is now required on `google_monitoring_uptime_check_config`.

`monitoring`: Made at least one of `auth_info`, `port`, `headers`, `path`, `use_ssl`, or `mask_headers` is now required on `google_monitoring_uptime_check_config.http_check`

modular-magician · 2019-11-13T00:02:12Z

3.0.0 diff report as of 7aadc69a734cf6253f983c8e7e498d4dd2076720

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T00:02:58Z

3.0.0 diff report as of bd05c368fbe178aaadbae2d6b6a2e066cca2b8e0

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T00:04:13Z

3.0.0 diff report as of a6c96bfe517c95e47dfd331396d905be9a93c8ca

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T00:04:14Z

3.0.0 diff report as of b13f4af4db8cf9b8065148b42146a601df632167

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T00:05:01Z

3.0.0 diff report as of b13f4af4db8cf9b8065148b42146a601df632167

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T00:08:57Z

3.0.0 diff report as of 5df362bead7eb5860df6aeffce3481ecd597db77

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T00:10:26Z

3.0.0 diff report as of 5df362bead7eb5860df6aeffce3481ecd597db77

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T00:14:11Z

3.0.0 diff report as of f2ec9e4d7afe6c3f216e8a5c47ebc33f96b1f153

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T00:14:56Z

3.0.0 diff report as of f2ec9e4d7afe6c3f216e8a5c47ebc33f96b1f153

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T04:02:36Z

3.0.0 diff report as of 350535762485d21bd8beee1c5ae102018fffe3e0

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T04:17:03Z

3.0.0 diff report as of 8d04b16b35dd9f9e58cbcaee1858741699c70044

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T04:25:58Z

3.0.0 diff report as of ca04da5abb103a5dfd9071caa17f2edb2e2cb093

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T04:49:38Z

3.0.0 diff report as of 01fd7d953a32c5b31a1920629b877e790d3aaa45

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T05:08:45Z

3.0.0 diff report as of `7bfe81e`

TPG Diff
TPGB Diff
Mapper Diff

paddycarver

A couple of typos/out of order/merge artifacts I saw that I'd like to see fixed, but nothing major. Other than those, LGTM.

paddycarver · 2019-11-13T05:47:01Z

third_party/terraform/website/docs/guides/version_3_upgrade.html.markdown

@@ -236,17 +261,236 @@ resource "google_cloudiot_registry" "myregistry" {
 }
 ```

+### `logging_service` and `monitoring_service` defaults changed


I think this needs to get moved to container_cluster after the rebase.

third_party/terraform/website/docs/guides/version_3_upgrade.html.markdown

paddycarver · 2019-11-13T05:49:21Z

third_party/terraform/website/docs/guides/version_3_upgrade.html.markdown

+In an attempt to avoid allowing empty blocks in config files, `name` and `path` are now
+required on the `build.volumes` block.
+
+### `taint` field is now authoritative when set


This seems like it's in the wrong spot--it seems like it should be under container_cluster?

paddycarver · 2019-11-13T05:54:58Z

third_party/terraform/website/docs/guides/version_3_upgrade.html.markdown

@@ -619,30 +1028,49 @@ The `kubernetes_dashboard` addon is deprecated for clusters on GKE and
 will soon be removed. It is recommended to use alternative GCP Console
 dashboards.

+### `channel` is now required on `google_container_cluster.relase_channel`


relase looks like a typo

paddycarver · 2019-11-13T05:55:40Z

third_party/terraform/website/docs/guides/version_3_upgrade.html.markdown

+### `channel` is now required on `google_container_cluster.relase_channel`
+
+In an attempt to avoid allowing empty blocks in config files, `channel` is now
+required on the `relase_channel` block.


relase again.

modular-magician · 2019-11-13T06:36:51Z

3.0.0 diff report as of `7826c12`

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T15:26:33Z

3.0.0 diff report as of `b12e7fe`

TPG Diff
TPGB Diff
Mapper Diff

modular-magician · 2019-11-13T17:03:09Z

3.0.0 diff report as of `d4d95e1`

TPG Diff
TPGB Diff
Mapper Diff

megan07 · 2019-11-13T17:04:15Z

products/cloudfunctions/api.yaml

@@ -136,17 +136,30 @@ objects:
        description: |
          The Google Cloud Storage URL, starting with gs://, pointing to the zip
          archive which contains the function.
+        exactly_one_of:


These changes actually don't do anything, because this resource is not currently generated. I removed the update from the upgrade guide, but I figured I could leave them all in here so that when we eventually do generate it, they'll be there.

modular-magician · 2019-11-13T18:11:49Z

3.0.0 diff report as of `2444f22`

TPG Diff
TPGB Diff
Mapper Diff

paddycarver · 2019-11-13T18:32:50Z

products/cloudrun/api.yaml

@@ -272,7 +272,6 @@ objects:
    properties:
    - !ruby/object:Api::Type::NestedObject
      name: template
-      required: true


Is this change intentional? Seems out of character with the rest of the changes.

Yes! I took that out because i saw its all flattened in terraform.yaml, and the flattened part is already required.

* cloudbuild build trigger's trigger template should be required in 3.0.0. (#2352) * cloudbuild build trigger's trigger template should be required in 3.0.0. * Make backend_service.backends.group required. (#2373) * Remove Removed fields (#2391) * deprecated-->removed event notification config (#2390) * deprecated-->removed event notification config * remove singular config from tests/docs * pluralize * Update third_party/terraform/tests/resource_cloudiot_registry_test.go Co-Authored-By: Riley Karson <[email protected]> * Delete google_project_services in 3.0.0. (#2403) * Changing IAM audit config to be authoritative (#2438) * Changing IAM audit config to be authoritative * Remove unused code + test * Removing deprecated fields (#2436) * Add validation for scratch disks in Instance Template (#2282) * Add validation for scratch disks * Remove source from scratch disk * Use hardcoded image * Add reverse logic * Change default id format from {{name}} to self_link_uri (#2461) * Change default id format from {{name}} to self_link_uri * Updates to generated id formats (#2460) * Update ID fields for various MM-generated resources * gofmt -s -w extra file * Add userinfo.email to default scopes (#2473) * Set GKE Stackdriver defaults to GKE Stackdriver Monitoring (#2471) * only allow instance templates with 375gb scratch disks (#2495) * Update cloudfunction id for 3.0.0 release (#2501) * handle cloudfunctions deprecating nodejs6 (#2499) * Handwritten id updates for several compute resources (#2502) * Composer environment and compute attached disk id updates * Add compute instance * Add instance_from_group and instance_group * IGM id * Instance template tests passing * Add new id format to other calls of parseImportId in IGM * Small refactor to memoize var * Refactor, remove parseImportId in IGM * handle legacy network deprecation (#2508) * Fix gofmt diff in Cloud Functions (#2542) * More handwritten ids (#2527) * Fix cloudfunction formatting, migrate RIGM id * Update security policy resource id * Update target pool id format * Add new id for container cluster * Node pool id updates * PR feedback, using parseImportId for container resources * Formatting * fix container cluster (#2550) * Datasource id updates (#2544) * Update datasources * formatting * Even more handwritten ids (#2540) * Dataproc cluster, job, google project * Update sql ssl cert, database instance ids * Project id comparison include projects/ * remove kubernetes_dashboard from google_container_cluster (#2551) * Add back encoder that always sends autoCreateSubnetworks (#2558) * Allow defining empty taint, remove old DSF (#2537) * Remove encoder, can be done as send_empty_value on autoCreateSubnetworks (#2559) * deprecate 0.11 syntax in docs (datasources) (#2573) * deprecate 0.11 syntax in docs (resources) (#2574) * deprecate 0.11 syntax in docs (magic modules examples) (#2579) * remove long name behavior for pubsub subscriptions, clean up cu… (#2561) * remove long name behavior for pubsub subscriptions, clean up custom expanders * fix build * fix tests * Fix merge conflict in rigm test * Remove unused regexes from rigm (#2602) * Fix missing paren + bad var in resourcepolicy datasource 3.0.0 (#2600) * Test fixes based on integration tests, id formats + other easy fixes (#2605) * Test fixes based on integration tests, id formats + other easy fixes * Compute network id test update * Fix region disk test id * Update subnetwork to remove enable_flow_logs and depend on log_config instead (#2597) * Test updates to not depend on id format. Also test fixes (#2609) * Test updates to not depend on id format. Also test fixes * Typo * location -> region in node pool test * Cluster test fixes (#2611) * Fix container cluster tests, and signed url key, instance group * Fix invalid accessor * Update hand-written resources with `AtLeastOneOf` and `ExactlyOneOf` attributes (#2608) * Rigm/igm field removals for 3.0.0 (#2595) * Remove deprecated IGM fields for 3.0 * fix imports (#2619) * Remove automatic subnetwork creation in GKE (#2615) * Remove automatic subnetwork creation in GKE * Update docs, add Computed * More integration test fixes (#2617) * Fix bigtable for real, scratch disk size, target pool checks * Proxy test fixes * CloudIOT registry set removed field to nil. Add specific id format for access context manager * (r)igm imports for customdiff (#2623) * (r)igm imports for customdiff * Fix schema issues * Fix IGM custom diff and reuse method between resources (#2624) * Forwardingrule ip address (#2620) add the validation function * Remove unused sort import from rigm (#2625) * add composer test fixes, backend bucket signed url key (#2631) * Stop users from specifying bigquery-json in 3.0.0 (#2626) * Send null logConfig if subnetwork is L7ILB (#2635) * Send null logConfig if subnetwork is L7ILB * Move subnet ilb check to only if logConfig unspecified * deprecate 0.11 syntax in tests (datasources) (#2593) * Make master_authorized_networks_config.cidr_blocks Optional in… (#2642) * Make master_authorized_networks_config.cidr_blocks Optional in GKE * Add note * update magic module-generated resources with at_least_one_of (#2639) * add exactly_one_of to magic modules update comment * Update Data Fusion Instance to conform with 3.0.0 id updates (#2649) * Fix IAM doc id_format to new post 3.0.0 style * Add note on id format changes (#2656) * Add upgrade guide for subnetwork log_config (#2653) * Add upgrade guide for subnetwork log_config * Add examples for subnet logConfig update * Wording on upgrade guide * Add note on audit log config (#2658) * Add misc entries to the upgrade guide (#2657) * Add misc entries to the upgrade guide * Remove extra space * add info on scratch disk size and remove duplicate kms_key_self… (#2659) * Add upgrade guide notes. (#2663) * Add upgrade guide for forwarding rule validation (#2666) * Convert old import formats (using non-/) to use /. (#2638) * Convert old import formats (using non-/) to use /. * Upgrade proofreading (#2668) * Add upgrade note for IoT registry event_notification_configs (#2390) (#2651) Merged PR #2651. * sort upgrade guide; change wording in a few places * Password is not actually required. (#2670) * Add improved for_each non-module variant to project service upg… (#2671) * Update bigtable import & tests to 3.0 (#2673) * update upgrade guide (#2665) * update formatting for upgrade doc (#2674) * Add rigm to upgrade guide (#2667) Update docs to be accurate for 3.0 * proofreading changes (#2676) * Add back lost newlines

googlebot added the cla: yes label Nov 12, 2019

megan07 requested a review from paddycarver November 13, 2019 00:07

megan07 force-pushed the megan_update_docs branch from f2ec9e4 to 3505357 Compare November 13, 2019 03:56

megan07 added 10 commits November 12, 2019 23:00

update upgrade guide

46ea178

update typo

f241ea1

update typo

997cf40

update typo

63fe939

update typo

d11eafe

update typo

0076758

update doc for second PR

0022969

update doc for third PR

f7574c0

remove atleastoneof/exactlyoneof customize diffs for arrays

70fb406

try to clean it up some

7bfe81e

megan07 force-pushed the megan_update_docs branch from 01fd7d9 to 7bfe81e Compare November 13, 2019 05:01

paddycarver approved these changes Nov 13, 2019

View reviewed changes

adding more changes, plus updates from code review comments

7826c12

megan07 requested a review from paddycarver November 13, 2019 06:44

adding more changes

b12e7fe

last minute updates

d4d95e1

megan07 commented Nov 13, 2019

View reviewed changes

update last minute changes

2444f22

paddycarver approved these changes Nov 13, 2019

View reviewed changes

megan07 merged commit b2a10bb into GoogleCloudPlatform:3.0.0 Nov 13, 2019

rileykarson pushed a commit that referenced this pull request Nov 13, 2019

update upgrade guide (#2665)

7a51a89

rileykarson pushed a commit that referenced this pull request Nov 13, 2019

update upgrade guide (#2665)

7ffe32c

mattdrees mentioned this pull request Feb 26, 2020

seems to break with google terraform provider version 3.x without os policy terraform-google-modules/terraform-google-vpc-service-controls#29

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update upgrade guide #2665

update upgrade guide #2665

megan07 commented Nov 12, 2019 •

edited

Loading

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

paddycarver left a comment

paddycarver Nov 13, 2019

paddycarver Nov 13, 2019

paddycarver Nov 13, 2019

paddycarver Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

modular-magician commented Nov 13, 2019

megan07 Nov 13, 2019

modular-magician commented Nov 13, 2019

paddycarver Nov 13, 2019

megan07 Nov 13, 2019

update upgrade guide #2665

update upgrade guide #2665

Conversation

megan07 commented Nov 12, 2019 • edited Loading

modular-magician commented Nov 13, 2019

3.0.0 diff report as of 7aadc69a734cf6253f983c8e7e498d4dd2076720

modular-magician commented Nov 13, 2019

3.0.0 diff report as of bd05c368fbe178aaadbae2d6b6a2e066cca2b8e0

modular-magician commented Nov 13, 2019

3.0.0 diff report as of a6c96bfe517c95e47dfd331396d905be9a93c8ca

modular-magician commented Nov 13, 2019

3.0.0 diff report as of b13f4af4db8cf9b8065148b42146a601df632167

modular-magician commented Nov 13, 2019

3.0.0 diff report as of b13f4af4db8cf9b8065148b42146a601df632167

modular-magician commented Nov 13, 2019

3.0.0 diff report as of 5df362bead7eb5860df6aeffce3481ecd597db77

modular-magician commented Nov 13, 2019

3.0.0 diff report as of 5df362bead7eb5860df6aeffce3481ecd597db77

modular-magician commented Nov 13, 2019

3.0.0 diff report as of f2ec9e4d7afe6c3f216e8a5c47ebc33f96b1f153

modular-magician commented Nov 13, 2019

3.0.0 diff report as of f2ec9e4d7afe6c3f216e8a5c47ebc33f96b1f153

modular-magician commented Nov 13, 2019

3.0.0 diff report as of 350535762485d21bd8beee1c5ae102018fffe3e0

modular-magician commented Nov 13, 2019

3.0.0 diff report as of 8d04b16b35dd9f9e58cbcaee1858741699c70044

modular-magician commented Nov 13, 2019

3.0.0 diff report as of ca04da5abb103a5dfd9071caa17f2edb2e2cb093

modular-magician commented Nov 13, 2019

3.0.0 diff report as of 01fd7d953a32c5b31a1920629b877e790d3aaa45

modular-magician commented Nov 13, 2019

3.0.0 diff report as of 7bfe81e

paddycarver left a comment

Choose a reason for hiding this comment

paddycarver Nov 13, 2019

Choose a reason for hiding this comment

paddycarver Nov 13, 2019

Choose a reason for hiding this comment

paddycarver Nov 13, 2019

Choose a reason for hiding this comment

paddycarver Nov 13, 2019

Choose a reason for hiding this comment

modular-magician commented Nov 13, 2019

3.0.0 diff report as of 7826c12

modular-magician commented Nov 13, 2019

3.0.0 diff report as of b12e7fe

modular-magician commented Nov 13, 2019

3.0.0 diff report as of d4d95e1

megan07 Nov 13, 2019

Choose a reason for hiding this comment

modular-magician commented Nov 13, 2019

3.0.0 diff report as of 2444f22

paddycarver Nov 13, 2019

Choose a reason for hiding this comment

megan07 Nov 13, 2019

Choose a reason for hiding this comment

megan07 commented Nov 12, 2019 •

edited

Loading

3.0.0 diff report as of `7bfe81e`

3.0.0 diff report as of `7826c12`

3.0.0 diff report as of `b12e7fe`

3.0.0 diff report as of `d4d95e1`

3.0.0 diff report as of `2444f22`