From 5f9b4b0e5be2b19bd2e2252130b52c366e724cd7 Mon Sep 17 00:00:00 2001 From: Bogdan Popescu <68062990+bopopescu@users.noreply.github.com> Date: Sat, 25 Jul 2020 14:50:19 +0300 Subject: [PATCH] Migrating from master/slave jargon --- .../data/cli/gcloud_completions.py | 150 +++++++++--------- .../api_lib/app/ext_runtimes/loader.py | 10 +- .../api_lib/container/api_adapter.py | 130 +++++++-------- .../api_lib/container/kubeconfig.py | 2 +- .../api_lib/container/transforms.py | 10 +- .../googlecloudsdk/api_lib/container/util.py | 4 +- .../googlecloudsdk/api_lib/dns/import_util.py | 12 +- .../lib/googlecloudsdk/api_lib/run/gke.py | 10 +- .../api_lib/sql/instance_prop_reducers.py | 30 ++-- .../command_lib/composer/util.py | 2 +- .../command_lib/container/constants.py | 2 +- .../container/container_command_util.py | 24 +-- .../command_lib/container/flags.py | 48 +++--- .../command_lib/dataproc/clusters.py | 88 +++++----- .../command_lib/dataproc/flags.py | 4 +- .../functions/deploy/source_util.py | 2 +- .../command_lib/functions/flags.py | 4 +- .../command_lib/ml_engine/flags.py | 38 ++--- .../command_lib/ml_engine/jobs_util.py | 52 +++--- .../command_lib/ml_engine/local_train.py | 14 +- .../googlecloudsdk/command_lib/sql/flags.py | 26 +-- .../command_lib/sql/instances.py | 38 ++--- .../appengine/v1/appengine_v1_messages.py | 2 +- .../v1alpha/appengine_v1alpha_messages.py | 2 +- .../v1beta/appengine_v1beta_messages.py | 2 +- .../cloudbilling/v1/cloudbilling_v1_client.py | 4 +- .../v1/cloudbilling_v1_messages.py | 8 +- .../v1/cloudfunctions_v1_messages.py | 2 +- .../apis/container/v1/container_v1_client.py | 76 ++++----- .../container/v1/container_v1_messages.py | 118 +++++++------- .../v1alpha1/container_v1alpha1_client.py | 76 ++++----- .../v1alpha1/container_v1alpha1_messages.py | 124 +++++++-------- .../v1beta1/container_v1beta1_client.py | 76 ++++----- .../v1beta1/container_v1beta1_messages.py | 130 +++++++-------- .../apis/dataproc/v1/dataproc_v1_messages.py | 16 +- .../v1beta2/dataproc_v1beta2_messages.py | 18 +-- .../apis/genomics/v1/genomics_v1_messages.py | 4 +- .../v1alpha2/healthcare_v1alpha2_messages.py | 2 +- .../third_party/apis/ml/v1/ml_v1_messages.py | 30 ++-- .../run/v1alpha1/run_v1alpha1_messages.py | 4 +- .../v1alpha1/serverless_v1alpha1_messages.py | 4 +- .../v1beta3/sqladmin_v1beta3_messages.py | 4 +- .../v1beta4/sqladmin_v1beta4_messages.py | 100 ++++++------ .../surface/auth/application_default/login.py | 2 +- .../lib/surface/billing/accounts/list.py | 2 +- .../lib/surface/compute/images/import.py | 2 +- .../attestors/public_keys/__init__.py | 8 +- .../lib/surface/container/clusters/create.py | 22 +-- .../lib/surface/container/clusters/delete.py | 2 +- .../container/clusters/get_credentials.py | 2 +- .../lib/surface/container/clusters/update.py | 30 ++-- .../lib/surface/container/clusters/upgrade.py | 38 ++--- .../lib/surface/dataproc/clusters/create.py | 6 +- .../dataproc/workflow_templates/__init__.py | 4 +- .../lib/surface/ml_engine/local/train.py | 2 +- .../lib/surface/source/repos/clone.py | 4 +- .../lib/surface/sql/instances/create.py | 32 ++-- .../lib/surface/sql/instances/failover.py | 2 +- .../lib/third_party/apitools/base/py/batch.py | 2 +- .../lib/third_party/dns/rdataset.py | 2 +- .../lib/third_party/dns/rdtypes/ANY/SOA.py | 2 +- google-cloud-sdk/lib/third_party/dns/rrset.py | 2 +- .../lib/third_party/dns/tokenizer.py | 6 +- google-cloud-sdk/lib/third_party/dns/zone.py | 24 +-- .../lib/third_party/dulwich/repo.py | 6 +- .../third_party/ml_sdk/cloud/ml/io/coders.py | 8 +- .../lib/third_party/pkg_resources/__init__.py | 10 +- .../pygments/formatters/_mapping.py | 2 +- .../pygments/lexers/_lasso_builtins.py | 4 +- .../third_party/pygments/lexers/_mapping.py | 2 +- .../pygments/lexers/_php_builtins.py | 14 +- .../third_party/pygments/lexers/esoteric.py | 2 +- .../setuptools/command/easy_install.py | 2 +- .../platform/gsutil/gslib/addlhelp/naming.py | 4 +- .../gsutil/gslib/commands/notification.py | 2 +- .../platform/gsutil/gslib/ui_controller.py | 2 +- .../apitools/apitools/base/py/batch.py | 2 +- .../third_party/argcomplete/docs/conf.py | 4 +- .../boto/boto/elastictranscoder/layer1.py | 6 +- .../third_party/boto/boto/emr/connection.py | 32 ++-- .../gsutil/third_party/boto/boto/emr/step.py | 2 +- .../third_party/boto/boto/kms/layer1.py | 32 ++-- .../third_party/boto/boto/opsworks/layer1.py | 4 +- .../third_party/boto/boto/pyami/bootstrap.py | 2 +- .../third_party/boto/boto/rds/__init__.py | 34 ++-- .../third_party/boto/boto/rds/dbinstance.py | 16 +- .../third_party/boto/boto/rds/dbsnapshot.py | 10 +- .../third_party/boto/boto/rds2/layer1.py | 38 ++--- .../third_party/boto/boto/redshift/layer1.py | 36 ++--- .../integration/rds/test_promote_modify.py | 26 +-- .../tests/integration/rds2/test_connection.py | 4 +- .../tests/integration/redshift/test_layer1.py | 8 +- .../boto/tests/unit/emr/test_connection.py | 32 ++-- .../boto/tests/unit/emr/test_emr_responses.py | 24 +-- .../unit/emr/test_instance_group_args.py | 10 +- .../boto/tests/unit/rds/test_connection.py | 48 +++--- .../boto/tests/unit/rds/test_snapshot.py | 14 +- .../tests/unit/route53/test_connection.py | 2 +- .../third_party/crcmod/docs/source/conf.py | 4 +- .../third_party/fasteners/doc/source/conf.py | 10 +- .../gsutil/third_party/funcsigs/docs/conf.py | 4 +- .../gsutil/third_party/mock/docs/conf.py | 4 +- .../third_party/oauth2client/docs/conf.py | 2 +- .../third_party/pyasn1/docs/source/conf.py | 10 +- .../gsutil/third_party/rsa/doc/conf.py | 4 +- .../third_party/six/documentation/conf.py | 4 +- 106 files changed, 1092 insertions(+), 1092 deletions(-) diff --git a/google-cloud-sdk/data/cli/gcloud_completions.py b/google-cloud-sdk/data/cli/gcloud_completions.py index 7f758ab0..63dd68a6 100644 --- a/google-cloud-sdk/data/cli/gcloud_completions.py +++ b/google-cloud-sdk/data/cli/gcloud_completions.py @@ -6441,7 +6441,7 @@ "--enable-ip-alias": "bool", "--enable-kubernetes-alpha": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-egress-metering": "bool", "--enable-network-policy": "bool", "--enable-peering-route-sharing": "bool", @@ -6460,8 +6460,8 @@ "--local-ssd-volumes": "value", "--machine-type": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", - "--master-ipv4-cidr": "value", + "--main-authorized-networks": "value", + "--main-ipv4-cidr": "value", "--max-accelerator": "value", "--max-cpu": "value", "--max-memory": "value", @@ -6565,7 +6565,7 @@ "--enable-basic-auth": "bool", "--enable-binauthz": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-egress-metering": "bool", "--enable-network-policy": "bool", "--enable-peering-route-sharing": "bool", @@ -6575,7 +6575,7 @@ "--istio-config": "value", "--logging-service": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-accelerator": "value", "--max-cpu": "value", "--max-memory": "value", @@ -6608,7 +6608,7 @@ "--cluster-version": "value", "--concurrent-node-count": "value", "--image-type": "value", - "--master": "bool", + "--main": "bool", "--node-pool": "value", "--region": "value", "--security-profile": "value", @@ -6973,18 +6973,18 @@ "--kerberos-kms-key-project": "dynamic", "--kerberos-root-principal-password-uri": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", - "--master-min-cpu-platform": "value", + "--main-accelerator": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", + "--main-min-cpu-platform": "value", "--max-age": "value", "--max-idle": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-worker-local-ssds": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", @@ -7589,18 +7589,18 @@ "--kerberos-kms-key-project": "dynamic", "--kerberos-root-principal-password-uri": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", - "--master-min-cpu-platform": "value", + "--main-accelerator": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", + "--main-min-cpu-platform": "value", "--max-age": "value", "--max-idle": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-worker-local-ssds": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", @@ -11178,9 +11178,9 @@ "--config": "value", "--job-dir": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-image-uri": "value", - "--master-machine-type": "value", + "--main-accelerator": "value", + "--main-image-uri": "value", + "--main-machine-type": "value", "--module-name": "value", "--package-path": "value", "--packages": "value", @@ -13491,18 +13491,18 @@ "WED" ], "--maintenance-window-hour": "value", - "--master-ca-certificate-path": "value", - "--master-dump-file-path": "value", - "--master-instance-name": "value", - "--master-password": "value", - "--master-username": "value", + "--main-ca-certificate-path": "value", + "--main-dump-file-path": "value", + "--main-instance-name": "value", + "--main-password": "value", + "--main-username": "value", "--memory": "value", "--network": "value", "--pricing-plan": [ "PACKAGE", "PER_USE" ], - "--prompt-for-master-password": "bool", + "--prompt-for-main-password": "bool", "--region": "value", "--replica-type": [ "FAILOVER", @@ -20637,7 +20637,7 @@ "--enable-ip-alias": "bool", "--enable-kubernetes-alpha": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-egress-metering": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", @@ -20653,8 +20653,8 @@ "--local-ssd-count": "value", "--machine-type": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", - "--master-ipv4-cidr": "value", + "--main-authorized-networks": "value", + "--main-ipv4-cidr": "value", "--max-accelerator": "value", "--max-cpu": "value", "--max-memory": "value", @@ -20754,7 +20754,7 @@ "--enable-basic-auth": "bool", "--enable-binauthz": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-egress-metering": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", @@ -20763,7 +20763,7 @@ "--istio-config": "value", "--logging-service": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-accelerator": "value", "--max-cpu": "value", "--max-memory": "value", @@ -20794,7 +20794,7 @@ "--async": "bool", "--cluster-version": "value", "--image-type": "value", - "--master": "bool", + "--main": "bool", "--node-pool": "value", "--region": "value", "--zone": "value" @@ -21170,18 +21170,18 @@ "--kerberos-kms-key-project": "dynamic", "--kerberos-root-principal-password-uri": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", - "--master-min-cpu-platform": "value", + "--main-accelerator": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", + "--main-min-cpu-platform": "value", "--max-age": "value", "--max-idle": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-worker-local-ssds": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", @@ -21786,18 +21786,18 @@ "--kerberos-kms-key-project": "dynamic", "--kerberos-root-principal-password-uri": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", - "--master-min-cpu-platform": "value", + "--main-accelerator": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", + "--main-min-cpu-platform": "value", "--max-age": "value", "--max-idle": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-worker-local-ssds": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", @@ -24855,9 +24855,9 @@ "--config": "value", "--job-dir": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-image-uri": "value", - "--master-machine-type": "value", + "--main-accelerator": "value", + "--main-image-uri": "value", + "--main-machine-type": "value", "--module-name": "value", "--package-path": "value", "--packages": "value", @@ -26666,18 +26666,18 @@ "WED" ], "--maintenance-window-hour": "value", - "--master-ca-certificate-path": "value", - "--master-dump-file-path": "value", - "--master-instance-name": "value", - "--master-password": "value", - "--master-username": "value", + "--main-ca-certificate-path": "value", + "--main-dump-file-path": "value", + "--main-instance-name": "value", + "--main-password": "value", + "--main-username": "value", "--memory": "value", "--network": "value", "--pricing-plan": [ "PACKAGE", "PER_USE" ], - "--prompt-for-master-password": "bool", + "--prompt-for-main-password": "bool", "--region": "value", "--replica-type": [ "FAILOVER", @@ -31849,7 +31849,7 @@ "--enable-ip-alias": "bool", "--enable-kubernetes-alpha": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--enable-private-endpoint": "bool", "--enable-private-nodes": "bool", @@ -31859,8 +31859,8 @@ "--local-ssd-count": "value", "--machine-type": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", - "--master-ipv4-cidr": "value", + "--main-authorized-networks": "value", + "--main-ipv4-cidr": "value", "--max-nodes": "value", "--max-nodes-per-pool": "value", "--metadata": "value", @@ -31940,12 +31940,12 @@ "--enable-autoscaling": "bool", "--enable-basic-auth": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--generate-password": "bool", "--logging-service": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-nodes": "value", "--min-nodes": "value", "--monitoring-service": "value", @@ -31969,7 +31969,7 @@ "--async": "bool", "--cluster-version": "value", "--image-type": "value", - "--master": "bool", + "--main": "bool", "--node-pool": "value", "--region": "value", "--zone": "value" @@ -32243,14 +32243,14 @@ "--initialization-action-timeout": "value", "--initialization-actions": "value", "--labels": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-worker-local-ssds": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", @@ -32781,14 +32781,14 @@ "--initialization-action-timeout": "value", "--initialization-actions": "value", "--labels": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-worker-local-ssds": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", @@ -36757,7 +36757,7 @@ "WED" ], "--maintenance-window-hour": "value", - "--master-instance-name": "value", + "--main-instance-name": "value", "--memory": "value", "--pricing-plan": [ "PACKAGE", diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py index 64870cb6..1f37ca19 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py @@ -64,7 +64,7 @@ class InvalidRepositoryError(exceptions.Error): """Attempted to fetch or clone from a repository missing something basic. This gets raised if we try to fetch or clone from a repo that is either - missing a HEAD or missing both a "latest" tag and a master branch. + missing a HEAD or missing both a "latest" tag and a main branch. """ @@ -149,7 +149,7 @@ def _PullTags(local_repo, client_wrapper, target_dir): Returns: (str, dulwich.objects.Commit) The tag that was actually pulled (we try to - get "latest" but fall back to "master") and the commit object + get "latest" but fall back to "main") and the commit object associated with it. Raises: @@ -166,7 +166,7 @@ def _PullTags(local_repo, client_wrapper, target_dir): # Try to get the "latest" tag (latest released version) revision = None tag = None - for tag in (b'refs/tags/latest', b'refs/heads/master'): + for tag in (b'refs/tags/latest', b'refs/heads/main'): try: log.debug('looking up ref %s', tag) revision = local_repo[tag] @@ -175,7 +175,7 @@ def _PullTags(local_repo, client_wrapper, target_dir): log.warning('Unable to checkout branch %s', tag) else: - raise AssertionError('No "refs/heads/master" tag found in repository.') + raise AssertionError('No "refs/heads/main" tag found in repository.') return tag, revision @@ -260,7 +260,7 @@ def InstallRuntimeDef(url, target_dir): directory. At this time, the runtime definition url must be the URL of a git repository and we identify the tree to checkout based on 1) the presence of a "latest" tag ("refs/tags/latest") 2) if there is no "latest" tag, the - head of the "master" branch ("refs/heads/master"). + head of the "main" branch ("refs/heads/main"). Args: url: (str) A URL identifying a git repository. The HTTP, TCP and local diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/api_adapter.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/api_adapter.py index 9b9bc25d..e4715244 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/api_adapter.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/api_adapter.py @@ -55,8 +55,8 @@ """ MISMATCH_AUTHORIZED_NETWORKS_ERROR_MSG = """\ -Cannot use --master-authorized-networks \ -if --enable-master-authorized-networks is not \ +Cannot use --main-authorized-networks \ +if --enable-main-authorized-networks is not \ specified.""" NO_AUTOPROVISIONING_MSG = """\ @@ -360,8 +360,8 @@ def __init__(self, enable_autorepair=None, enable_autoupgrade=None, service_account=None, - enable_master_authorized_networks=None, - master_authorized_networks=None, + enable_main_authorized_networks=None, + main_authorized_networks=None, enable_legacy_authorization=None, labels=None, disk_type=None, @@ -382,7 +382,7 @@ def __init__(self, enable_private_nodes=None, enable_private_endpoint=None, enable_peering_route_sharing=None, - master_ipv4_cidr=None, + main_ipv4_cidr=None, tpu_ipv4_cidr=None, enable_tpu=None, enable_tpu_service_networking=None, @@ -438,8 +438,8 @@ def __init__(self, self.enable_autorepair = enable_autorepair self.enable_autoupgrade = enable_autoupgrade self.service_account = service_account - self.enable_master_authorized_networks = enable_master_authorized_networks - self.master_authorized_networks = master_authorized_networks + self.enable_main_authorized_networks = enable_main_authorized_networks + self.main_authorized_networks = main_authorized_networks self.enable_legacy_authorization = enable_legacy_authorization self.enable_network_policy = enable_network_policy self.labels = labels @@ -460,7 +460,7 @@ def __init__(self, self.enable_private_nodes = enable_private_nodes self.enable_private_endpoint = enable_private_endpoint self.enable_peering_route_sharing = enable_peering_route_sharing - self.master_ipv4_cidr = master_ipv4_cidr + self.main_ipv4_cidr = main_ipv4_cidr self.tpu_ipv4_cidr = tpu_ipv4_cidr self.enable_tpu_service_networking = enable_tpu_service_networking self.enable_tpu = enable_tpu @@ -484,7 +484,7 @@ class UpdateClusterOptions(object): def __init__(self, version=None, - update_master=None, + update_main=None, update_nodes=None, node_pool=None, monitoring_service=None, @@ -498,8 +498,8 @@ def __init__(self, image=None, image_project=None, locations=None, - enable_master_authorized_networks=None, - master_authorized_networks=None, + enable_main_authorized_networks=None, + main_authorized_networks=None, enable_autoprovisioning=None, enable_pod_security_policy=None, enable_binauthz=None, @@ -508,7 +508,7 @@ def __init__(self, security_profile=None, security_profile_runtime_rules=None): self.version = version - self.update_master = bool(update_master) + self.update_main = bool(update_main) self.update_nodes = bool(update_nodes) self.node_pool = node_pool self.monitoring_service = monitoring_service @@ -522,8 +522,8 @@ def __init__(self, self.image = image self.image_project = image_project self.locations = locations - self.enable_master_authorized_networks = enable_master_authorized_networks - self.master_authorized_networks = master_authorized_networks + self.enable_main_authorized_networks = enable_main_authorized_networks + self.main_authorized_networks = main_authorized_networks self.enable_autoprovisioning = enable_autoprovisioning self.enable_pod_security_policy = enable_pod_security_policy self.enable_binauthz = enable_binauthz @@ -533,8 +533,8 @@ def __init__(self, self.security_profile_runtime_rules = security_profile_runtime_rules -class SetMasterAuthOptions(object): - """Options to pass to SetMasterAuth.""" +class SetMainAuthOptions(object): + """Options to pass to SetMainAuth.""" SET_PASSWORD = 'SetPassword' GENERATE_PASSWORD = 'GeneratePassword' @@ -848,7 +848,7 @@ def CreateClusterCommon(self, cluster_ref, options): NETWORK_POLICY not in options.addons)) cluster.addonsConfig = addons - self.ParseMasterAuthorizedNetworkOptions(options, cluster) + self.ParseMainAuthorizedNetworkOptions(options, cluster) if options.enable_kubernetes_alpha: cluster.enableKubernetesAlpha = options.enable_kubernetes_alpha @@ -912,16 +912,16 @@ def CreateClusterCommon(self, cluster_ref, options): elif options.enable_network_egress_metering is not None: raise util.Error(ENABLE_NETWORK_EGRESS_METERING_ERROR_MSG) - # Only instantiate the masterAuth struct if one or both of `user` or + # Only instantiate the mainAuth struct if one or both of `user` or # `issue_client_certificate` is configured. Server-side Basic auth default - # behavior is dependent on the absence of the MasterAuth struct. For this + # behavior is dependent on the absence of the MainAuth struct. For this # reason, if only `issue_client_certificate` is configured, Basic auth will # be disabled. if options.user is not None or options.issue_client_certificate is not None: - cluster.masterAuth = self.messages.MasterAuth( + cluster.mainAuth = self.messages.MainAuth( username=options.user, password=options.password) if options.issue_client_certificate is not None: - cluster.masterAuth.clientCertificateConfig = ( + cluster.mainAuth.clientCertificateConfig = ( self.messages.ClientCertificateConfig( issueClientCertificate=options.issue_client_certificate)) @@ -1129,16 +1129,16 @@ def ParsePrivateClusterOptions(self, options, cluster): prerequisite='enable-private-nodes', opt='enable-private-endpoint')) - if options.master_ipv4_cidr and not options.enable_private_nodes: + if options.main_ipv4_cidr and not options.enable_private_nodes: raise util.Error( PREREQUISITE_OPTION_ERROR_MSG.format( - prerequisite='enable-private-nodes', opt='master-ipv4-cidr')) + prerequisite='enable-private-nodes', opt='main-ipv4-cidr')) if options.enable_private_nodes: config = self.messages.PrivateClusterConfig( enablePrivateNodes=options.enable_private_nodes, enablePrivateEndpoint=options.enable_private_endpoint, - masterIpv4CidrBlock=options.master_ipv4_cidr) + mainIpv4CidrBlock=options.main_ipv4_cidr) cluster.privateClusterConfig = config return cluster @@ -1166,27 +1166,27 @@ def ParseTpuOptions(self, options, cluster): if options.enable_tpu: cluster.enableTpu = options.enable_tpu - def ParseMasterAuthorizedNetworkOptions(self, options, cluster): - """Parses the options for master authorized networks.""" - if (options.master_authorized_networks and not - options.enable_master_authorized_networks): - # Raise error if use --master-authorized-networks without - # --enable-master-authorized-networks. + def ParseMainAuthorizedNetworkOptions(self, options, cluster): + """Parses the options for main authorized networks.""" + if (options.main_authorized_networks and not + options.enable_main_authorized_networks): + # Raise error if use --main-authorized-networks without + # --enable-main-authorized-networks. raise util.Error(MISMATCH_AUTHORIZED_NETWORKS_ERROR_MSG) - elif options.enable_master_authorized_networks is None: - cluster.masterAuthorizedNetworksConfig = None - elif not options.enable_master_authorized_networks: - authorized_networks = self.messages.MasterAuthorizedNetworksConfig( + elif options.enable_main_authorized_networks is None: + cluster.mainAuthorizedNetworksConfig = None + elif not options.enable_main_authorized_networks: + authorized_networks = self.messages.MainAuthorizedNetworksConfig( enabled=False) - cluster.masterAuthorizedNetworksConfig = authorized_networks + cluster.mainAuthorizedNetworksConfig = authorized_networks else: - authorized_networks = self.messages.MasterAuthorizedNetworksConfig( - enabled=options.enable_master_authorized_networks) - if options.master_authorized_networks: - for network in options.master_authorized_networks: + authorized_networks = self.messages.MainAuthorizedNetworksConfig( + enabled=options.enable_main_authorized_networks) + if options.main_authorized_networks: + for network in options.main_authorized_networks: authorized_networks.cidrBlocks.append( self.messages.CidrBlock(cidrBlock=network)) - cluster.masterAuthorizedNetworksConfig = authorized_networks + cluster.mainAuthorizedNetworksConfig = authorized_networks def CreateCluster(self, cluster_ref, options): cluster = self.CreateClusterCommon(cluster_ref, options) @@ -1215,9 +1215,9 @@ def UpdateClusterCommon(self, options): if options.security_profile is not None: update.securityProfile = self.messages.SecurityProfile( name=options.security_profile) - elif options.update_master: + elif options.update_main: update = self.messages.ClusterUpdate( - desiredMasterVersion=options.version) + desiredMainVersion=options.version) # security_profile may be set in upgrade command if options.security_profile is not None: update.securityProfile = self.messages.SecurityProfile( @@ -1247,16 +1247,16 @@ def UpdateClusterCommon(self, options): desiredNodePoolAutoscaling=autoscaling) elif options.locations: update = self.messages.ClusterUpdate(desiredLocations=options.locations) - elif options.enable_master_authorized_networks is not None: + elif options.enable_main_authorized_networks is not None: # For update, we can either enable or disable. - authorized_networks = self.messages.MasterAuthorizedNetworksConfig( - enabled=options.enable_master_authorized_networks) - if options.master_authorized_networks: - for network in options.master_authorized_networks: + authorized_networks = self.messages.MainAuthorizedNetworksConfig( + enabled=options.enable_main_authorized_networks) + if options.main_authorized_networks: + for network in options.main_authorized_networks: authorized_networks.cidrBlocks.append(self.messages.CidrBlock( cidrBlock=network)) update = self.messages.ClusterUpdate( - desiredMasterAuthorizedNetworksConfig=authorized_networks) + desiredMainAuthorizedNetworksConfig=authorized_networks) elif options.enable_autoprovisioning is not None: autoscaling = self.CreateClusterAutoscalingCommon(options) update = self.messages.ClusterUpdate( @@ -1316,10 +1316,10 @@ def UpdateClusterCommon(self, options): and options.security_profile_runtime_rules is not None): update.securityProfile.disableRuntimeRules = \ not options.security_profile_runtime_rules - if (options.master_authorized_networks - and not options.enable_master_authorized_networks): - # Raise error if use --master-authorized-networks without - # --enable-master-authorized-networks. + if (options.main_authorized_networks + and not options.enable_main_authorized_networks): + # Raise error if use --main-authorized-networks without + # --enable-main-authorized-networks. raise util.Error(MISMATCH_AUTHORIZED_NETWORKS_ERROR_MSG) return update @@ -1450,29 +1450,29 @@ def SetNetworkPolicy(self, cluster_ref, options): self.client.projects_locations_clusters.SetNetworkPolicy(req).name, cluster_ref.zone) - def SetMasterAuthCommon(self, options): - """Returns a SetMasterAuth action.""" - update = self.messages.MasterAuth( + def SetMainAuthCommon(self, options): + """Returns a SetMainAuth action.""" + update = self.messages.MainAuth( username=options.username, password=options.password) - if options.action == SetMasterAuthOptions.SET_PASSWORD: - action = (self.messages.SetMasterAuthRequest. + if options.action == SetMainAuthOptions.SET_PASSWORD: + action = (self.messages.SetMainAuthRequest. ActionValueValuesEnum.SET_PASSWORD) - elif options.action == SetMasterAuthOptions.GENERATE_PASSWORD: - action = (self.messages.SetMasterAuthRequest. + elif options.action == SetMainAuthOptions.GENERATE_PASSWORD: + action = (self.messages.SetMainAuthRequest. ActionValueValuesEnum.GENERATE_PASSWORD) - else: # options.action == SetMasterAuthOptions.SET_USERNAME + else: # options.action == SetMainAuthOptions.SET_USERNAME action = ( - self.messages.SetMasterAuthRequest.ActionValueValuesEnum.SET_USERNAME) + self.messages.SetMainAuthRequest.ActionValueValuesEnum.SET_USERNAME) return update, action - def SetMasterAuth(self, cluster_ref, options): - update, action = self.SetMasterAuthCommon(options) - req = self.messages.SetMasterAuthRequest( + def SetMainAuth(self, cluster_ref, options): + update, action = self.SetMainAuthCommon(options) + req = self.messages.SetMainAuthRequest( name=ProjectLocationCluster(cluster_ref.projectId, cluster_ref.zone, cluster_ref.clusterId), action=action, update=update) - op = self.client.projects_locations_clusters.SetMasterAuth(req) + op = self.client.projects_locations_clusters.SetMainAuth(req) return self.ParseOperation(op.name, cluster_ref.zone) def StartIpRotation(self, cluster_ref, rotate_credentials): diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/kubeconfig.py index 3ed3571a..c79ea79a 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/kubeconfig.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/kubeconfig.py @@ -228,7 +228,7 @@ def _AuthProvider(name='gcp'): Constructs an auth provider config entry readable by kubectl. This tells kubectl to call out to a specific gcloud command and parse the output to - retrieve access tokens to authenticate to the kubernetes master. + retrieve access tokens to authenticate to the kubernetes main. Kubernetes gcp auth provider plugin at https://github.com/kubernetes/kubernetes/tree/master/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/transforms.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/transforms.py index 7b1d41f3..f48e2414 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/transforms.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/transforms.py @@ -68,16 +68,16 @@ def ParseExpireTime(s): return expire_dt - times.Now(expire_dt.tzinfo) -def TransformMasterVersion(r, undefined=''): - """Returns the formatted master version. +def TransformMainVersion(r, undefined=''): + """Returns the formatted main version. Args: r: JSON-serializable object. undefined: Returns this value if the resource cannot be formatted. Returns: - The formatted master version. + The formatted main version. """ - version = r.get('currentMasterVersion', None) + version = r.get('currentMainVersion', None) if version is None: return undefined if r.get('enableKubernetesAlpha', False): @@ -96,7 +96,7 @@ def TransformMasterVersion(r, undefined=''): _TRANSFORMS = { - 'master_version': TransformMasterVersion, + 'main_version': TransformMainVersion, } diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/util.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/util.py index 594eea8d..092078e4 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/util.py @@ -37,7 +37,7 @@ table( name, zone:label=LOCATION, - master_version():label=MASTER_VERSION, + main_version():label=MASTER_VERSION, endpoint:label=MASTER_IP, nodePools[0].config.machineType, currentNodeVersion:label=NODE_VERSION, @@ -281,7 +281,7 @@ def Persist(cls, cluster, project_id, use_internal_ip=False): 'project_id': project_id, 'server': 'https://' + endpoint, } - auth = cluster.masterAuth + auth = cluster.mainAuth if auth and auth.clusterCaCertificate: kwargs['ca_data'] = auth.clusterCaCertificate else: diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/dns/import_util.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/dns/import_util.py index 660c1b62..39adf0da 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/dns/import_util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/dns/import_util.py @@ -99,7 +99,7 @@ def _SOATranslation(rdata, origin): Returns: str, The translation of the given SOA rdata which includes all the required - SOA fields. Note that the master NS name is left in a substitutable form + SOA fields. Note that the main NS name is left in a substitutable form because it is always provided by Cloud DNS. """ return ' '.join( @@ -294,7 +294,7 @@ def RecordSetsFromZoneFile(zone_file, domain, api_version='v1'): A (name, type) keyed dict of ResourceRecordSets that were obtained from the zone file. Note that only A, AAAA, CNAME, MX, PTR, SOA, SPF, SRV, and TXT record-sets are retrieved. Other record-set types are not supported by Cloud - DNS. Also, the master NS field for SOA records is discarded since that is + DNS. Also, the main NS field for SOA records is discarded since that is provided by Cloud DNS. """ zone_contents = zone.from_file(zone_file, domain, check_origin=False) @@ -318,7 +318,7 @@ def RecordSetsFromYamlFile(yaml_file, api_version='v1'): A (name, type) keyed dict of ResourceRecordSets that were obtained from the yaml file. Note that only A, AAAA, CNAME, MX, PTR, SOA, SPF, SRV, and TXT record-sets are retrieved. Other record-set types are not supported by Cloud - DNS. Also, the master NS field for SOA records is discarded since that is + DNS. Also, the main NS field for SOA records is discarded since that is provided by Cloud DNS. """ record_sets = {} @@ -339,7 +339,7 @@ def RecordSetsFromYamlFile(yaml_file, api_version='v1'): record_set.rrdatas = yaml_record_set['rrdatas'] if rdata_type is rdatatype.SOA: - # Make master NS name substitutable. + # Make main NS name substitutable. record_set.rrdatas[0] = re.sub(r'\S+', '{0}', record_set.rrdatas[0], count=1) @@ -369,7 +369,7 @@ def _RecordSetCopy(record_set, api_version='v1'): def _SOAReplacement(current_record, record_to_be_imported, api_version='v1'): - """Returns the replacement SOA record with restored master NS name. + """Returns the replacement SOA record with restored main NS name. Args: current_record: ResourceRecordSet, Current record-set. @@ -377,7 +377,7 @@ def _SOAReplacement(current_record, record_to_be_imported, api_version='v1'): api_version: [str], the api version to use for creating the records. Returns: - ResourceRecordSet, the replacement SOA record with restored master NS name. + ResourceRecordSet, the replacement SOA record with restored main NS name. """ replacement = _RecordSetCopy(record_to_be_imported, api_version=api_version) replacement.rrdatas[0] = replacement.rrdatas[0].format( diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/run/gke.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/run/gke.py index 29392d8e..2a08c7e6 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/run/gke.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/run/gke.py @@ -110,7 +110,7 @@ def _MatchHostname(self, cert, hostname): # A replacement for ssl.match_hostname(cert, hostname) # Since we'll be connecting with hostname as bare IP address, the goal is # to treat that as if it were the hostname `kubernetes.default`, which - # is what the GKE master asserts it is. + # is what the GKE main asserts it is. with self._lock: assert self._ip_to_host is not None if hostname in self._ip_to_host: @@ -123,8 +123,8 @@ def _MatchHostname(self, cert, hostname): def MonkeypatchAddressChecking(hostname, ip): """Manipulate SSL address checking so we can talk to GKE. - GKE provides an IP address for talking to the k8s master, and a - ca_certs that signs the tls certificate the master provides. Unfortunately, + GKE provides an IP address for talking to the k8s main, and a + ca_certs that signs the tls certificate the main provides. Unfortunately, that tls certificate is for `kubernetes`, `kubernetes.default`, `kubernetes.default.svc`, or `kubernetes.default.svc.cluster.local`. @@ -181,7 +181,7 @@ def ClusterConnectionInfo(cluster_ref): cluster_ref: reference to the cluster to connect to. Yields: A tuple of (endpoint, ca_certs), where endpoint is the ip address - of the GKE master, and ca_certs is the absolute path of a temporary file + of the GKE main, and ca_certs is the absolute path of a temporary file (lasting the life of the python process) holding the ca_certs to connect to the GKE cluster. Raises: @@ -190,7 +190,7 @@ def ClusterConnectionInfo(cluster_ref): with _DisableUserProjectQuota(): adapter = api_adapter.NewAPIAdapter('v1') cluster = adapter.GetCluster(cluster_ref) - auth = cluster.masterAuth + auth = cluster.mainAuth if auth and auth.clusterCaCertificate: ca_data = auth.clusterCaCertificate else: diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py index bf5a2766..40fd9134 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py @@ -236,7 +236,7 @@ def MachineType(instance=None, tier=None, memory=None, cpu=None): def OnPremisesConfiguration(sql_messages, source_ip_address, source_port): - """Generates the external master configuration for the instance. + """Generates the external main configuration for the instance. Args: sql_messages: module, The messages module that should be used. @@ -270,21 +270,21 @@ def PrivateNetworkUrl(network): def ReplicaConfiguration(sql_messages, - master_username, - master_password, - master_dump_file_path, - master_ca_certificate_path=None, + main_username, + main_password, + main_dump_file_path, + main_ca_certificate_path=None, client_certificate_path=None, client_key_path=None): - """Generates the config for an external master replica. + """Generates the config for an external main replica. Args: sql_messages: module, The messages module that should be used. - master_username: The username for connecting to the external instance. - master_password: The password for connecting to the external instance. - master_dump_file_path: ObjectReference, a wrapper for the URI of the Cloud + main_username: The username for connecting to the external instance. + main_password: The password for connecting to the external instance. + main_dump_file_path: ObjectReference, a wrapper for the URI of the Cloud Storage path containing the dumpfile to seed the replica with. - master_ca_certificate_path: The path to the CA certificate PEM file. + main_ca_certificate_path: The path to the CA certificate PEM file. client_certificate_path: The path to the client certificate PEM file. client_key_path: The path to the client private key PEM file. @@ -292,12 +292,12 @@ def ReplicaConfiguration(sql_messages, sql_messages.MySqlReplicaConfiguration object. """ mysql_replica_configuration = sql_messages.MySqlReplicaConfiguration( - username=master_username, - password=master_password, - dumpFilePath=master_dump_file_path.ToUrl()) - if master_ca_certificate_path: + username=main_username, + password=main_password, + dumpFilePath=main_dump_file_path.ToUrl()) + if main_ca_certificate_path: mysql_replica_configuration.caCertificate = files.ReadFileContents( - master_ca_certificate_path) + main_ca_certificate_path) if client_certificate_path: mysql_replica_configuration.clientCertificate = files.ReadFileContents( client_certificate_path) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/composer/util.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/composer/util.py index 6d9397a6..787311c2 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/composer/util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/composer/util.py @@ -170,7 +170,7 @@ def TemporaryKubeconfig(location_id, cluster_id): gke_api = gke_api_adapter.NewAPIAdapter(GKE_API_VERSION) cluster_ref = gke_api.ParseCluster(cluster_id, location_id) cluster = gke_api.GetCluster(cluster_ref) - auth = cluster.masterAuth + auth = cluster.mainAuth missing_creds = not (auth and auth.clientCertificate and auth.clientKey) if missing_creds and not gke_util.ClusterConfig.UseGCPAuthProvider(): raise Error('Unable to get cluster credentials. User must have edit ' diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/constants.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/constants.py index c3535b9f..f70ddd1f 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/constants.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/constants.py @@ -32,7 +32,7 @@ "This will create a cluster with all Kubernetes Alpha features enabled.\n" "- This cluster will not be covered by the Kubernetes Engine SLA and should" " not be used for production workloads.\n" - "- You will not be able to upgrade the master or nodes.\n" + "- You will not be able to upgrade the main or nodes.\n" "- The cluster will be deleted after 30 days.\n" ) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/container_command_util.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/container_command_util.py index 7628e7c8..19a9e245 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/container_command_util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/container_command_util.py @@ -43,8 +43,8 @@ def _NodePoolFromCluster(cluster, node_pool_name): node_pool_name)) -def _MasterUpgradeMessage(name, server_conf, cluster, new_version): - """Returns the prompt message during a master upgrade. +def _MainUpgradeMessage(name, server_conf, cluster, new_version): + """Returns the prompt message during a main upgrade. Args: name: str, the name of the cluster being upgraded. @@ -60,7 +60,7 @@ def _MasterUpgradeMessage(name, server_conf, cluster, new_version): to which version. """ if cluster: - version_message = 'version [{}]'.format(cluster.currentMasterVersion) + version_message = 'version [{}]'.format(cluster.currentMainVersion) else: version_message = 'its current version' @@ -72,7 +72,7 @@ def _MasterUpgradeMessage(name, server_conf, cluster, new_version): else: new_version_message = 'the default cluster version' - return ('Master of cluster [{}] will be upgraded from {} to {}.' + return ('Main of cluster [{}] will be upgraded from {} to {}.' .format(name, version_message, new_version_message)) @@ -114,12 +114,12 @@ def _NodeUpgradeMessage(name, cluster, node_pool_name, new_version, version_message = 'its current version' if not new_version and cluster: - new_version = cluster.currentMasterVersion + new_version = cluster.currentMainVersion if new_version: new_version_message = 'version [{}]'.format(new_version) else: - new_version_message = 'the master version' + new_version_message = 'the main version' concurrent_message = '' if concurrent_node_count: @@ -132,7 +132,7 @@ def _NodeUpgradeMessage(name, cluster, node_pool_name, new_version, new_version_message, concurrent_message)) -def ClusterUpgradeMessage(name, server_conf=None, cluster=None, master=False, +def ClusterUpgradeMessage(name, server_conf=None, cluster=None, main=False, node_pool_name=None, new_version=None, concurrent_node_count=None): """Get a message to print during gcloud container clusters upgrade. @@ -141,7 +141,7 @@ def ClusterUpgradeMessage(name, server_conf=None, cluster=None, master=False, name: str, the name of the cluster being upgraded. server_conf: the server config object. cluster: the cluster object. - master: bool, if the upgrade applies to the master version. + main: bool, if the upgrade applies to the main version. node_pool_name: str, the name of the node pool if the upgrade is for a specific node pool. new_version: str, the name of the new version, if given. @@ -154,8 +154,8 @@ def ClusterUpgradeMessage(name, server_conf=None, cluster=None, master=False, str, a message about which nodes in the cluster will be upgraded and to which version. """ - if master: - upgrade_message = _MasterUpgradeMessage(name, server_conf, cluster, + if main: + upgrade_message = _MainUpgradeMessage(name, server_conf, cluster, new_version) else: upgrade_message = _NodeUpgradeMessage(name, cluster, node_pool_name, @@ -252,5 +252,5 @@ def ParseUpdateOptionsBase(args, locations): max_nodes=args.max_nodes, node_pool=args.node_pool, locations=locations, - enable_master_authorized_networks=args.enable_master_authorized_networks, - master_authorized_networks=args.master_authorized_networks) + enable_main_authorized_networks=args.enable_main_authorized_networks, + main_authorized_networks=args.main_authorized_networks) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/flags.py index 2c4b8957..daabf552 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/flags.py @@ -170,7 +170,7 @@ def AddClusterVersionFlag(parser, suppressed=False, help=None): # pylint: disab """Adds a --cluster-version flag to the given parser.""" if help is None: help = """\ -The Kubernetes version to use for the master and nodes. Defaults to +The Kubernetes version to use for the main and nodes. Defaults to server-specified. The default Kubernetes version is available using the following command. @@ -700,51 +700,51 @@ def AddTagsFlag(parser, help_text): help=help_text) -def AddMasterAuthorizedNetworksFlags(parser, enable_group_for_update=None): - """Adds Master Authorized Networks related flags to parser. +def AddMainAuthorizedNetworksFlags(parser, enable_group_for_update=None): + """Adds Main Authorized Networks related flags to parser. - Master Authorized Networks related flags are: - --enable-master-authorized-networks --master-authorized-networks. + Main Authorized Networks related flags are: + --enable-main-authorized-networks --main-authorized-networks. Args: parser: A given parser. enable_group_for_update: An optional group of mutually exclusive flag - options to which an --enable-master-authorized-networks flag is added + options to which an --enable-main-authorized-networks flag is added in an update command. """ if enable_group_for_update is None: # Flags are being added to the same group. - master_flag_group = parser.add_argument_group('Master Authorized Networks') - enable_flag_group = master_flag_group + main_flag_group = parser.add_argument_group('Main Authorized Networks') + enable_flag_group = main_flag_group else: # Flags are being added to different groups, so the new one should have no # help text (has only one arg). - master_flag_group = parser.add_argument_group('') + main_flag_group = parser.add_argument_group('') enable_flag_group = enable_group_for_update enable_flag_group.add_argument( - '--enable-master-authorized-networks', + '--enable-main-authorized-networks', default=None, help="""\ Allow only specified set of CIDR blocks (specified by the -`--master-authorized-networks` flag) to connect to Kubernetes master through +`--main-authorized-networks` flag) to connect to Kubernetes main through HTTPS. Besides these blocks, the following have access as well:\n 1) The private network the cluster connects to if `--enable-private-nodes` is specified. 2) Google Compute Engine Public IPs if `--enable-private-nodes` is not specified.\n -Use `--no-enable-master-authorized-networks` to disable. When disabled, public -internet (0.0.0.0/0) is allowed to connect to Kubernetes master through HTTPS. +Use `--no-enable-main-authorized-networks` to disable. When disabled, public +internet (0.0.0.0/0) is allowed to connect to Kubernetes main through HTTPS. """, action='store_true') - master_flag_group.add_argument( - '--master-authorized-networks', + main_flag_group.add_argument( + '--main-authorized-networks', type=arg_parsers.ArgList(min_length=1), metavar='NETWORK', help='The list of CIDR blocks (up to {max}) that are allowed to connect ' - 'to Kubernetes master through HTTPS. Specified in CIDR notation (e.g. ' + 'to Kubernetes main through HTTPS. Specified in CIDR notation (e.g. ' '1.2.3.4/30). Can not be specified unless ' - '`--enable-master-authorized-networks` is also specified.'.format( + '`--enable-main-authorized-networks` is also specified.'.format( max=api_adapter.MAX_AUTHORIZED_NETWORKS_CIDRS)) @@ -757,7 +757,7 @@ def AddNetworkPolicyFlags(parser, hidden=False): hidden=hidden, help='Enable network policy enforcement for this cluster. If you are ' 'enabling network policy on an existing cluster the network policy ' - 'addon must first be enabled on the master by using ' + 'addon must first be enabled on the main by using ' '--update-addons=NetworkPolicy=ENABLED flag.') @@ -783,15 +783,15 @@ def AddPrivateClusterFlags(parser, with_deprecated=False, with_alpha=False): action='store_true') group.add_argument( '--enable-private-endpoint', - help=('Cluster is managed using the private IP address of the master ' + help=('Cluster is managed using the private IP address of the main ' 'API endpoint.'), default=None, action='store_true') if with_alpha: AddPeeringRouteSharingFlag(group) group.add_argument( - '--master-ipv4-cidr', - help=('IPv4 CIDR range to use for the master network. This should have ' + '--main-ipv4-cidr', + help=('IPv4 CIDR range to use for the main network. This should have ' 'a netmask of size /28 and should be used in conjunction with the ' '--enable-private-nodes flag.'), default=None) @@ -801,7 +801,7 @@ def AddPeeringRouteSharingFlag(group): group.add_argument( '--enable-peering-route-sharing', help=( - 'Enable custom route sharing between the master and node VPCs, which ' + 'Enable custom route sharing between the main and node VPCs, which ' 'ensures clients running in networks connected via a Cloud Router, ' 'VPN, or Interconnect can reach the API server.'), default=None, @@ -1268,7 +1268,7 @@ def AddNodeLocationsFlag(parser): metavar='ZONE', help="""\ The set of zones in which the specified node footprint should be replicated. -All zones must be in the same region as the cluster's master(s), specified by +All zones must be in the same region as the cluster's main(s), specified by the `--zone` or `--region` flag. Additionally, for zonal clusters, `--node-locations` must contain the cluster's primary zone. If not specified, all nodes will be in the cluster's primary zone (for zonal clusters) or spread @@ -1604,7 +1604,7 @@ def AddIssueClientCertificateFlag(parser): Issue a TLS client certificate with admin permissions. When enabled, the certificate and private key pair will be present in -MasterAuth field of the Cluster object. For cluster versions before 1.12, a +MainAuth field of the Cluster object. For cluster versions before 1.12, a client certificate will be issued by default. As of 1.12, client certificates are disabled by default. """ diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/clusters.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/clusters.py index 68f2c9d2..e74623ae 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/clusters.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/clusters.py @@ -78,7 +78,7 @@ def ArgsForClusterRef(parser, beta=False, include_deprecated=True): help="""\ Create a single node cluster. - A single node cluster has all master and worker components. + A single node cluster has all main and worker components. It cannot have any separate worker nodes. If this flag is not specified, a cluster with separate workers is created. """) @@ -95,8 +95,8 @@ def ArgsForClusterRef(parser, beta=False, include_deprecated=True): help='The number of preemptible worker nodes in the cluster.') parser.add_argument( - '--master-machine-type', - help='The type of machine to use for the master. Defaults to ' + '--main-machine-type', + help='The type of machine to use for the main. Defaults to ' 'server-specified.') parser.add_argument( '--worker-machine-type', @@ -139,9 +139,9 @@ def ArgsForClusterRef(parser, beta=False, include_deprecated=True): type=int, help='The number of local SSDs to attach to each worker in a cluster.') parser.add_argument( - '--num-master-local-ssds', + '--num-main-local-ssds', type=int, - help='The number of local SSDs to attach to the master in a cluster.') + help='The number of local SSDs to attach to the main in a cluster.') parser.add_argument( '--num-preemptible-worker-local-ssds', type=int, @@ -163,15 +163,15 @@ def ArgsForClusterRef(parser, beta=False, include_deprecated=True): help=('The maximum duration of each initialization action. See ' '$ gcloud topic datetimes for information on duration formats.')) parser.add_argument( - '--num-masters', + '--num-mains', type=arg_parsers.CustomFunctionValidator( lambda n: int(n) in [1, 3], - 'Number of masters must be 1 (Standard) or 3 (High Availability)', + 'Number of mains must be 1 (Standard) or 3 (High Availability)', parser=arg_parsers.BoundedInt(1, 3)), help="""\ - The number of master nodes in the cluster. + The number of main nodes in the cluster. - Number of Masters | Cluster Mode + Number of Mains | Cluster Mode --- | --- 1 | Standard 3 | High Availability @@ -270,7 +270,7 @@ def ArgsForClusterRef(parser, beta=False, include_deprecated=True): ``pd-ssd''. """ parser.add_argument( - '--master-boot-disk-type', help=boot_disk_type_detailed_help) + '--main-boot-disk-type', help=boot_disk_type_detailed_help) parser.add_argument( '--worker-boot-disk-type', help=boot_disk_type_detailed_help) parser.add_argument( @@ -287,7 +287,7 @@ def _AddDiskArgs(parser): can have is 10 GB. Disk size must be a multiple of 1 GB. """ parser.add_argument( - '--master-boot-disk-size', + '--main-boot-disk-size', type=arg_parsers.BinarySize(lower_bound='10GB'), help=boot_disk_size_detailed_help) parser.add_argument( @@ -302,19 +302,19 @@ def _AddDiskArgs(parser): def _AddDiskArgsDeprecated(parser): """Adds deprecated disk related args to the parser.""" - master_boot_disk_size = parser.add_mutually_exclusive_group() + main_boot_disk_size = parser.add_mutually_exclusive_group() worker_boot_disk_size = parser.add_mutually_exclusive_group() # Deprecated, to be removed at a future date. - master_boot_disk_size.add_argument( - '--master-boot-disk-size-gb', + main_boot_disk_size.add_argument( + '--main-boot-disk-size-gb', action=actions.DeprecationAction( - '--master-boot-disk-size-gb', - warn=('The `--master-boot-disk-size-gb` flag is deprecated. ' - 'Use `--master-boot-disk-size` flag with "GB" after value.')), + '--main-boot-disk-size-gb', + warn=('The `--main-boot-disk-size-gb` flag is deprecated. ' + 'Use `--main-boot-disk-size` flag with "GB" after value.')), type=int, hidden=True, - help='Use `--master-boot-disk-size` flag with "GB" after value.') + help='Use `--main-boot-disk-size` flag with "GB" after value.') worker_boot_disk_size.add_argument( '--worker-boot-disk-size-gb', action=actions.DeprecationAction( @@ -332,8 +332,8 @@ def _AddDiskArgsDeprecated(parser): ``10GB'' will produce a 10 gigabyte disk. The minimum size a boot disk can have is 10 GB. Disk size must be a multiple of 1 GB. """ - master_boot_disk_size.add_argument( - '--master-boot-disk-size', + main_boot_disk_size.add_argument( + '--main-boot-disk-size', type=arg_parsers.BinarySize(lower_bound='10GB'), help=boot_disk_size_detailed_help) worker_boot_disk_size.add_argument( @@ -389,7 +389,7 @@ def BetaArgsForClusterRef(parser): information on time formats. """) - for instance_type in ('master', 'worker'): + for instance_type in ('main', 'worker'): help_msg = """\ Attaches accelerators (e.g. GPUs) to the {instance_type} instance(s). @@ -440,14 +440,14 @@ def GetClusterConfig(args, Returns: cluster_config: Dataproc cluster configuration """ - master_accelerator_type = None + main_accelerator_type = None worker_accelerator_type = None - master_accelerator_count = None + main_accelerator_count = None worker_accelerator_count = None if beta: - if args.master_accelerator: - master_accelerator_type = args.master_accelerator['type'] - master_accelerator_count = args.master_accelerator.get('count', 1) + if args.main_accelerator: + main_accelerator_type = args.main_accelerator['type'] + main_accelerator_count = args.main_accelerator.get('count', 1) if args.worker_accelerator: worker_accelerator_type = args.worker_accelerator['type'] worker_accelerator_count = args.worker_accelerator.get('count', 1) @@ -484,11 +484,11 @@ def GetClusterConfig(args, imageVersion=args.image_version) if include_deprecated: - master_boot_disk_size_gb = args.master_boot_disk_size_gb + main_boot_disk_size_gb = args.main_boot_disk_size_gb else: - master_boot_disk_size_gb = None - if args.master_boot_disk_size: - master_boot_disk_size_gb = (api_utils.BytesToGb(args.master_boot_disk_size)) + main_boot_disk_size_gb = None + if args.main_boot_disk_size: + main_boot_disk_size_gb = (api_utils.BytesToGb(args.main_boot_disk_size)) if include_deprecated: worker_boot_disk_size_gb = args.worker_boot_disk_size_gb @@ -537,12 +537,12 @@ def GetClusterConfig(args, gce_cluster_config.metadata = encoding.DictToAdditionalPropertyMessage( flat_metadata, dataproc.messages.GceClusterConfig.MetadataValue) - master_accelerators = [] - if master_accelerator_type: - master_accelerators.append( + main_accelerators = [] + if main_accelerator_type: + main_accelerators.append( dataproc.messages.AcceleratorConfig( - acceleratorTypeUri=master_accelerator_type, - acceleratorCount=master_accelerator_count)) + acceleratorTypeUri=main_accelerator_type, + acceleratorCount=main_accelerator_count)) worker_accelerators = [] if worker_accelerator_type: worker_accelerators.append( @@ -553,16 +553,16 @@ def GetClusterConfig(args, cluster_config = dataproc.messages.ClusterConfig( configBucket=args.bucket, gceClusterConfig=gce_cluster_config, - masterConfig=dataproc.messages.InstanceGroupConfig( - numInstances=args.num_masters, + mainConfig=dataproc.messages.InstanceGroupConfig( + numInstances=args.num_mains, imageUri=image_ref and image_ref.SelfLink(), - machineTypeUri=args.master_machine_type, - accelerators=master_accelerators, + machineTypeUri=args.main_machine_type, + accelerators=main_accelerators, diskConfig=GetDiskConfig( dataproc, - args.master_boot_disk_type, - master_boot_disk_size_gb, - args.num_master_local_ssds + args.main_boot_disk_type, + main_boot_disk_size_gb, + args.num_main_local_ssds )), workerConfig=dataproc.messages.InstanceGroupConfig( numInstances=args.num_workers, @@ -601,7 +601,7 @@ def GetClusterConfig(args, enableHttpPortAccess=args.enable_component_gateway) if beta: - cluster_config.masterConfig.minCpuPlatform = args.master_min_cpu_platform + cluster_config.mainConfig.minCpuPlatform = args.main_min_cpu_platform cluster_config.workerConfig.minCpuPlatform = args.worker_min_cpu_platform if beta: @@ -921,7 +921,7 @@ def AddKerberosGroup(parser): gs://bucket/cross-realm.password.encrypted # Optional. The Google Cloud Storage URI of a KMS encrypted file - # containing the master key of the KDC database. + # containing the main key of the KDC database. kdc_db_key_uri: gs://bucket/kdc_db_key.encrypted # Optional. The lifetime of the ticket granting ticket, in diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/flags.py index ccc799d8..4d727632 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/flags.py @@ -90,7 +90,7 @@ def AddParametersFlag(parser): def AddMinCpuPlatformArgs(parser, track): - """Add mininum CPU platform flags for both master and worker instances.""" + """Add mininum CPU platform flags for both main and worker instances.""" help_text = """\ When specified, the VM will be scheduled on host with specified CPU architecture or a newer one. To list available CPU platforms in given @@ -106,7 +106,7 @@ def AddMinCpuPlatformArgs(parser, track): https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform """.format(track.prefix + ' ' if track.prefix else '') parser.add_argument( - '--master-min-cpu-platform', + '--main-min-cpu-platform', metavar='PLATFORM', required=False, help=help_text) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py index 519a873c..814884c1 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py @@ -149,7 +149,7 @@ def _AddDefaultBranch(source_archive_url): r'/projects/[^/]+' r'/repos/[^/]+$') if re.match(cloud_repo_pattern, source_archive_url): - return source_archive_url + '/moveable-aliases/master' + return source_archive_url + '/moveable-aliases/main' return source_archive_url diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/flags.py index ba7afb52..00e84b14 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/flags.py @@ -124,9 +124,9 @@ def AddSourceFlag(parser): `https://source.developers.google.com/projects/${PROJECT}/repos/${REPO}` By using the URL above, sources from the root directory of the repository - on the revision tagged `master` will be used. + on the revision tagged `main` will be used. - If you want to deploy from a revision different from `master`, append one + If you want to deploy from a revision different from `main`, append one of the following three sources to the URL: * `/revisions/${REVISION}`, diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/flags.py index 8e0a651b..fccf0690 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/flags.py @@ -60,7 +60,7 @@ pythonModule, parameterServerType:optional, parameterServerCount:optional, - masterType:optional, + mainType:optional, workerType:optional, workerCount:optional, jobDir:optional @@ -587,9 +587,9 @@ def ParseAcceleratorFlag(accelerator): def AddCustomContainerFlags(parser): """Add Custom container flags to parser.""" - GetMasterMachineType().AddToParser(parser) - GetMasterAccelerator().AddToParser(parser) - GetMasterImageUri().AddToParser(parser) + GetMainMachineType().AddToParser(parser) + GetMainAccelerator().AddToParser(parser) + GetMainImageUri().AddToParser(parser) GetParameterServerMachineTypeConfig().AddToParser(parser) GetParameterServerAccelerator().AddToParser(parser) GetParameterServerImageUri().AddToParser(parser) @@ -651,32 +651,32 @@ def _MakeAcceleratorArgConfigArg(arg_name, arg_help, required=False): return arg -def GetMasterMachineType(): - """Build master-machine-type flag.""" +def GetMainMachineType(): + """Build main-machine-type flag.""" help_text = """\ - Specifies the type of virtual machine to use for training job's master worker. + Specifies the type of virtual machine to use for training job's main worker. You must set this value when `scaleTier` is set to `CUSTOM`. """ return base.Argument( - '--master-machine-type', required=False, help=help_text) + '--main-machine-type', required=False, help=help_text) -def GetMasterAccelerator(): - """Build master-accelerator flag.""" - help_text = _ACCELERATOR_TYPE_HELP.format(worker_type='master worker') +def GetMainAccelerator(): + """Build main-accelerator flag.""" + help_text = _ACCELERATOR_TYPE_HELP.format(worker_type='main worker') return _MakeAcceleratorArgConfigArg( - '--master-accelerator', arg_help=help_text) + '--main-accelerator', arg_help=help_text) -def GetMasterImageUri(): - """Build master-image-uri flag.""" +def GetMainImageUri(): + """Build main-image-uri flag.""" return base.Argument( - '--master-image-uri', + '--main-image-uri', required=False, - help=('Docker image to run on each master worker. ' + help=('Docker image to run on each main worker. ' 'This image must be in Google Container Registry. Only one of ' - '`master-image-uri` and `runtimeVersion` must be specified.')) + '`main-image-uri` and `runtimeVersion` must be specified.')) def GetParameterServerMachineTypeConfig(): @@ -717,7 +717,7 @@ def GetParameterServerImageUri(): required=False, help=('Docker image to run on each parameter server. ' 'This image must be in Google Container Registry. If not ' - 'specified, the value of `master-image-uri` is used.')) + 'specified, the value of `main-image-uri` is used.')) def GetWorkerMachineConfig(): @@ -757,4 +757,4 @@ def GetWorkerImageUri(): required=False, help=('Docker image to run on each worker node. ' 'This image must be in Google Container Registry. If not ' - 'specified, the value of `master-image-uri` is used.')) + 'specified, the value of `main-image-uri` is used.')) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py index 6645677b..e0cbc7e2 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py @@ -90,8 +90,8 @@ cluster specification. When you use this tier, set values to configure your processing cluster according to these guidelines (using the `--config` flag): -* You _must_ set `TrainingInput.masterType` to specify the type of machine to - use for your master node. This is the only required setting. +* You _must_ set `TrainingInput.mainType` to specify the type of machine to + use for your main node. This is the only required setting. * You _may_ set `TrainingInput.workerCount` to specify the number of workers to use. If you specify one or more workers, you _must_ also set `TrainingInput.workerType` to specify the type of machine to use for your @@ -101,8 +101,8 @@ _must_ also set `TrainingInput.parameterServerType` to specify the type of machine to use for your parameter servers. Note that all of your workers must use the same machine type, which can be different from your parameter server - type and master type. Your parameter servers must likewise use the same - machine type, which can be different from your worker type and master type.\ + type and main type. Your parameter servers must likewise use the same + machine type, which can be different from your worker type and main type.\ """) } @@ -122,10 +122,10 @@ class TrainingCustomInputServerConfig(object): def __init__(self, runtime_version, scale_tier, - master_machine_type=None, - master_image_uri=None, - master_accelerator_type=None, - master_accelerator_count=None, + main_machine_type=None, + main_image_uri=None, + main_accelerator_type=None, + main_accelerator_count=None, parameter_machine_type=None, parameter_machine_count=None, parameter_image_uri=None, @@ -136,10 +136,10 @@ def __init__(self, worker_image_uri=None, work_accelerator_type=None, work_accelerator_count=None): - self.master_image_uri = master_image_uri - self.master_machine_type = master_machine_type - self.master_accelerator_type = master_accelerator_type - self.master_accelerator_count = master_accelerator_count + self.main_image_uri = main_image_uri + self.main_machine_type = main_machine_type + self.main_accelerator_type = main_accelerator_type + self.main_accelerator_count = main_accelerator_count self.parameter_machine_type = parameter_machine_type self.parameter_machine_count = parameter_machine_count self.parameter_image_uri = parameter_image_uri @@ -155,24 +155,24 @@ def __init__(self, def ValidateConfig(self): """Validate that custom config parameters are set correctly.""" - if self.master_image_uri and self.runtime_version: - raise flags.ArgumentError('Only one of --master-image-uri,' + if self.main_image_uri and self.runtime_version: + raise flags.ArgumentError('Only one of --main-image-uri,' ' --runtime-version can be set.') if self.scale_tier and self.scale_tier.name == 'CUSTOM': - if not self.master_machine_type: - raise flags.ArgumentError('--master-machine-type is required if ' + if not self.main_machine_type: + raise flags.ArgumentError('--main-machine-type is required if ' 'scale-tier is set to `CUSTOM`.') return True def GetFieldMap(self): """Return a mapping of object fields to apitools message fields.""" return { - 'masterConfig': {'imageUri': self.master_image_uri, + 'mainConfig': {'imageUri': self.main_image_uri, 'acceleratorConfig': - {'count': self.master_accelerator_count, - 'type': self.master_accelerator_type} + {'count': self.main_accelerator_count, + 'type': self.main_accelerator_type} }, - 'masterType': self.master_machine_type, + 'mainType': self.main_machine_type, 'parameterServerConfig': { 'imageUri': self.parameter_image_uri, 'acceleratorConfig': @@ -204,13 +204,13 @@ def FromArgs(cls, args): return cls( scale_tier=parsed_tier, runtime_version=args.runtime_version, - master_machine_type=args.master_machine_type, + main_machine_type=args.main_machine_type, - master_image_uri=args.master_image_uri, - master_accelerator_type=(args.master_accelerator.get('type') - if args.master_accelerator else None), - master_accelerator_count=(args.master_accelerator.get('count') - if args.master_accelerator else None), + main_image_uri=args.main_image_uri, + main_accelerator_type=(args.main_accelerator.get('type') + if args.main_accelerator else None), + main_accelerator_count=(args.main_accelerator.get('count') + if args.main_accelerator else None), parameter_machine_type=args.parameter_server_machine_type, parameter_machine_count=args.parameter_server_count, parameter_image_uri=args.parameter_server_image_uri, diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/local_train.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/local_train.py index d8cebb11..d6a5f3d2 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/local_train.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/local_train.py @@ -40,7 +40,7 @@ def MakeProcess(module_name, **extra_popen_args): """Make a Popen object that runs the module, with the correct env. - If task_type is 'master' instead replaces the current process with the + If task_type is 'main' instead replaces the current process with the subprocess via execution_utils.Exec Args: module_name: str. Name of the module to run, e.g. trainer.task @@ -56,7 +56,7 @@ def MakeProcess(module_name, Returns: a subprocess.Popen object corresponding to the subprocesses or an int corresponding to the return value of the subprocess - (if task_type is 'master') + (if task_type is 'main') Raises: RuntimeError: if there is no python executable on the user system """ @@ -83,7 +83,7 @@ def MakeProcess(module_name, # configuration options to the training module. the module specific # arguments are passed as command line arguments. env['TF_CONFIG'] = json.dumps(config) - if task_type == 'master': + if task_type == 'main': return execution_utils.Exec( cmd, env=env, no_exit=True, cwd=package_root, **extra_popen_args) else: @@ -116,18 +116,18 @@ def RunDistributed(module_name, user_args: [str]. Additional user args for the task. Any relative paths will not work. Returns: - int. the retval of 'master' subprocess + int. the retval of 'main' subprocess """ ports = list(range(start_port, start_port + num_ps + num_workers + 1)) cluster = { - 'master': ['localhost:{port}'.format(port=ports[0])], + 'main': ['localhost:{port}'.format(port=ports[0])], 'ps': ['localhost:{port}'.format(port=p) for p in ports[1:num_ps + 1]], 'worker': ['localhost:{port}'.format(port=p) for p in ports[num_ps + 1:]] } for task_type, addresses in cluster.items(): - if task_type != 'master': + if task_type != 'main': for i in range(len(addresses)): MakeProcess(module_name, package_root, @@ -138,6 +138,6 @@ def RunDistributed(module_name, return MakeProcess(module_name, package_root, args=user_args, - task_type='master', + task_type='main', index=0, cluster=cluster) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/flags.py index 69e066f1..a5607870 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/flags.py @@ -313,20 +313,20 @@ def AddEnableBinLog(parser, show_negated_in_help=False): **kwargs) -def AddExternalMasterGroup(parser): - """Add flags to the parser for creating an external master and replica.""" +def AddExternalMainGroup(parser): + """Add flags to the parser for creating an external main and replica.""" # Group for creating external primary instances. - external_master_group = parser.add_group( + external_main_group = parser.add_group( required=False, help='Options for creating a wrapper for an external data source.') - external_master_group.add_argument( + external_main_group.add_argument( '--source-ip-address', required=True, type=compute_utils.IPV4Argument, help=('Public IP address used to connect to and replicate from ' 'the external data source.')) - external_master_group.add_argument( + external_main_group.add_argument( '--source-port', type=arg_parsers.BoundedInt(lower_bound=1, upper_bound=65535), # Default MySQL port number. @@ -340,25 +340,25 @@ def AddExternalMasterGroup(parser): help=('Options for creating an internal replica of an external data ' 'source.')) internal_replica_group.add_argument( - '--master-username', + '--main-username', required=True, help='Name of the replication user on the external data source.') # TODO(b/78648703): Make group required when mutex required status is fixed. # For entering the password of the replication user of an external primary. - master_password_group = internal_replica_group.add_group( + main_password_group = internal_replica_group.add_group( 'Password group.', mutex=True) - master_password_group.add_argument( - '--master-password', + main_password_group.add_argument( + '--main-password', help='Password of the replication user on the external data source.') - master_password_group.add_argument( - '--prompt-for-master-password', + main_password_group.add_argument( + '--prompt-for-main-password', action='store_true', help=('Prompt for the password of the replication user on the ' 'external data source. The password is all typed characters up ' 'to but not including the RETURN or ENTER key.')) internal_replica_group.add_argument( - '--master-dump-file-path', + '--main-dump-file-path', required=True, type=storage_util.ObjectReference.FromArgument, help=('Path to the MySQL dump file in Google Cloud Storage from ' @@ -370,7 +370,7 @@ def AddExternalMasterGroup(parser): credential_group = internal_replica_group.add_group( 'Client and server credentials.', required=False) credential_group.add_argument( - '--master-ca-certificate-path', + '--main-ca-certificate-path', required=True, help=('Path to a file containing the X.509v3 (RFC5280) PEM encoded ' 'certificate of the CA that signed the external data source\'s ' diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/instances.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/instances.py index c45ee212..3a3c5680 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/instances.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/instances.py @@ -359,9 +359,9 @@ def ConstructCreateInstanceFromArgs(cls, instance_resource.region = reducers.Region(args.region, _GetZone(args)) instance_resource.databaseVersion = args.database_version - instance_resource.masterInstanceName = args.master_instance_name + instance_resource.mainInstanceName = args.main_instance_name - # BETA: Set the host port and return early if external master instance. + # BETA: Set the host port and return early if external main instance. if _IsBetaOrNewer(release_track) and args.IsSpecified('source_ip_address'): on_premises_configuration = reducers.OnPremisesConfiguration( sql_messages, args.source_ip_address, args.source_port) @@ -371,7 +371,7 @@ def ConstructCreateInstanceFromArgs(cls, instance_resource.settings = cls._ConstructCreateSettingsFromArgs( sql_messages, args, original, release_track) - if args.master_instance_name: + if args.main_instance_name: replication = 'ASYNCHRONOUS' if args.replica_type == 'FAILOVER': instance_resource.replicaConfiguration = ( @@ -386,30 +386,30 @@ def ConstructCreateInstanceFromArgs(cls, sql_messages.DatabaseInstance.FailoverReplicaValue( name=args.failover_replica_name)) - # BETA: Config for creating a replica of an external master instance. - if _IsBetaOrNewer(release_track) and args.IsSpecified('master_username'): - # Ensure that the master instance name is specified. - if not args.IsSpecified('master_instance_name'): + # BETA: Config for creating a replica of an external main instance. + if _IsBetaOrNewer(release_track) and args.IsSpecified('main_username'): + # Ensure that the main instance name is specified. + if not args.IsSpecified('main_instance_name'): raise exceptions.RequiredArgumentException( - '--master-instance-name', 'To create a read replica of an external ' - 'master instance, [--master-instance-name] must be specified') + '--main-instance-name', 'To create a read replica of an external ' + 'main instance, [--main-instance-name] must be specified') # TODO(b/78648703): Remove when mutex required status is fixed. - # Ensure that the master replication user password is specified. - if not (args.IsSpecified('master_password') or - args.IsSpecified('prompt_for_master_password')): + # Ensure that the main replication user password is specified. + if not (args.IsSpecified('main_password') or + args.IsSpecified('prompt_for_main_password')): raise exceptions.RequiredArgumentException( - '--master-password', 'To create a read replica of an external ' - 'master instance, [--master-password] or ' - '[--prompt-for-master-password] must be specified') + '--main-password', 'To create a read replica of an external ' + 'main instance, [--main-password] or ' + '[--prompt-for-main-password] must be specified') # Get password if not specified on command line. - if args.prompt_for_master_password: - args.master_password = getpass.getpass('Master Instance Password: ') + if args.prompt_for_main_password: + args.main_password = getpass.getpass('Main Instance Password: ') instance_resource.replicaConfiguration = reducers.ReplicaConfiguration( - sql_messages, args.master_username, args.master_password, - args.master_dump_file_path, args.master_ca_certificate_path, + sql_messages, args.main_username, args.main_password, + args.main_dump_file_path, args.main_ca_certificate_path, args.client_certificate_path, args.client_key_path) return instance_resource diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py index 05f5fd33..4b32e9c8 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py @@ -818,7 +818,7 @@ class AuthorizedCertificate(_messages.Message): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via Webmaster Central + of a domain, verify ownership via Webmain Central (https://www.google.com/webmasters/verification/home). Fields: diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py index d4da6c7b..2b88c41a 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py @@ -329,7 +329,7 @@ class AuthorizedCertificate(_messages.Message): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via Webmaster Central + of a domain, verify ownership via Webmain Central (https://www.google.com/webmasters/verification/home). Fields: diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py index 2ccb60d3..c22e728b 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py @@ -818,7 +818,7 @@ class AuthorizedCertificate(_messages.Message): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via Webmaster Central + of a domain, verify ownership via Webmain Central (https://www.google.com/webmasters/verification/home). Fields: diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py index 7f84b02a..5728321f 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py @@ -97,10 +97,10 @@ def Create(self, request, global_params=None): [billing subaccounts](https://cloud.google.com/billing/docs/concepts) by GCP resellers. When creating a subaccount, the current authenticated user must have the -`billing.accounts.update` IAM permission on the master account, which is +`billing.accounts.update` IAM permission on the main account, which is typically given to billing account [administrators](https://cloud.google.com/billing/docs/how-to/billing-access). -This method will return an error if the master account has not been +This method will return an error if the main account has not been provisioned as a reseller account. Args: diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py index 48c22b5d..58692b6d 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py @@ -132,9 +132,9 @@ class BillingAccount(_messages.Message): Fields: displayName: The display name given to the billing account, such as `My Billing Account`. This name is displayed in the GCP Console. - masterBillingAccount: If this account is a + mainBillingAccount: If this account is a [subaccount](https://cloud.google.com/billing/docs/concepts), then this - will be the resource name of the master billing account that it is being + will be the resource name of the main billing account that it is being resold through. Otherwise this will be empty. name: The resource name of the billing account. The resource name has the form `billingAccounts/{billing_account_id}`. For example, @@ -147,7 +147,7 @@ class BillingAccount(_messages.Message): """ displayName = _messages.StringField(1) - masterBillingAccount = _messages.StringField(2) + mainBillingAccount = _messages.StringField(2) name = _messages.StringField(3) open = _messages.BooleanField(4) @@ -232,7 +232,7 @@ class CloudbillingBillingAccountsListRequest(_messages.Message): this only supports filtering for [subaccounts](https://cloud.google.com/billing/docs/concepts) under a single provided reseller billing account. (e.g. - "master_billing_account=billingAccounts/012345-678901-ABCDEF"). Boolean + "main_billing_account=billingAccounts/012345-678901-ABCDEF"). Boolean algebra and other fields are not currently supported. pageSize: Requested page size. The maximum page size is 100; this is also the default. diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py index 8a536818..7c10d925 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py @@ -1067,7 +1067,7 @@ class SourceRepository(_messages.Message): opers.google.com/projects/*/repos/*/revisions/*/paths/*` To refer to a moveable alias (branch): `https://source.developers.google.com/projects/*/repos/*/moveable- - aliases/*/paths/*` In particular, to refer to HEAD use `master` moveable + aliases/*/paths/*` In particular, to refer to HEAD use `main` moveable alias. To refer to a specific fixed alias (tag): `https://source.developers.google.com/projects/*/repos/*/fixed- aliases/*/paths/*` You may omit `paths/*` if you want to use the main diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py index bc94bd5e..c0446913 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py @@ -352,7 +352,7 @@ def __init__(self, client): } def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -672,31 +672,31 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set the password. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth', + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMainAuth', http_method=u'POST', - method_id=u'container.projects.locations.clusters.setMasterAuth', + method_id=u'container.projects.locations.clusters.setMainAuth', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1/{+name}:setMasterAuth', + relative_path=u'v1/{+name}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -783,7 +783,7 @@ def SetResourceLabels(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message @@ -836,29 +836,29 @@ def Update(self, request, global_params=None): supports_download=False, ) - def UpdateMaster(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def UpdateMain(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('UpdateMaster') + config = self.GetMethodConfig('UpdateMain') return self._RunMethod( config, request, global_params=global_params) - UpdateMaster.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster', + UpdateMain.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMain', http_method=u'POST', - method_id=u'container.projects.locations.clusters.updateMaster', + method_id=u'container.projects.locations.clusters.updateMain', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1/{+name}:updateMaster', + relative_path=u'v1/{+name}:updateMain', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1273,7 +1273,7 @@ def Addons(self, request, global_params=None): ) def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -1501,28 +1501,28 @@ def Logging(self, request, global_params=None): supports_download=False, ) - def Master(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def Main(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('Master') + config = self.GetMethodConfig('Main') return self._RunMethod( config, request, global_params=global_params) - Master.method_config = lambda: base_api.ApiMethodInfo( + Main.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.master', + method_id=u'container.projects.zones.clusters.main', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master', + relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/main', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1605,30 +1605,30 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set the password. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.setMasterAuth', + method_id=u'container.projects.zones.clusters.setMainAuth', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth', + relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1660,7 +1660,7 @@ def SetNetworkPolicy(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py index 654d3a68..109d1e99 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py @@ -40,7 +40,7 @@ class AddonsConfig(_messages.Message): services in a cluster. kubernetesDashboard: Configuration for the Kubernetes Dashboard. networkPolicyConfig: Configuration for NetworkPolicy. This only tracks - whether the addon is enabled or not on the Master, it does not track + whether the addon is enabled or not on the Main, it does not track whether network policy is enabled for the nodes. """ @@ -131,8 +131,8 @@ class Cluster(_messages.Message): conditions: Which conditions caused the current cluster state. createTime: [Output only] The time the cluster was created, in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. - currentMasterVersion: [Output only] The current software version of the - master endpoint. + currentMainVersion: [Output only] The current software version of the + main endpoint. currentNodeCount: [Output only] The number of nodes currently in the cluster. Deprecated. Call Kubernetes API directly to retrieve node information. @@ -145,20 +145,20 @@ class Cluster(_messages.Message): description: An optional description of this cluster. enableKubernetesAlpha: Kubernetes alpha features are enabled on this cluster. This includes alpha API groups (e.g. v1alpha1) and features - that may not be production ready in the kubernetes version of the master - and nodes. The cluster has no SLA for uptime and master/node upgrades + that may not be production ready in the kubernetes version of the main + and nodes. The cluster has no SLA for uptime and main/node upgrades are disabled. Alpha enabled clusters are automatically deleted thirty days after creation. - endpoint: [Output only] The IP address of this cluster's master endpoint. + endpoint: [Output only] The IP address of this cluster's main endpoint. The endpoint can be accessed from the internet at - `https://username:password@endpoint/`. See the `masterAuth` property of + `https://username:password@endpoint/`. See the `mainAuth` property of this resource for username and password information. expireTime: [Output only] The time the cluster will be automatically deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. initialClusterVersion: The initial Kubernetes version for this cluster. - Valid versions are those found in validMasterVersions returned by + Valid versions are those found in validMainVersions returned by getServerConfig. The version can be upgraded over time; such upgrades - are reflected in currentMasterVersion and currentNodeVersion. Users may + are reflected in currentMainVersion and currentNodeVersion. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -190,12 +190,12 @@ class Cluster(_messages.Message): cluster. * if left as an empty string,`logging.googleapis.com` will be used. maintenancePolicy: Configure the maintenance policy for this cluster. - masterAuth: The authentication information for accessing the master + mainAuth: The authentication information for accessing the main endpoint. If unspecified, the defaults are used: For clusters before - v1.12, if master_auth is unspecified, `username` will be set to "admin", + v1.12, if main_auth is unspecified, `username` will be set to "admin", a random password will be generated, and a client certificate will be issued. - masterAuthorizedNetworksConfig: The configuration options for master + mainAuthorizedNetworksConfig: The configuration options for main authorized networks feature. monitoringService: The monitoring service the cluster should use to write metrics. Currently available options: * `monitoring.googleapis.com` - @@ -253,7 +253,7 @@ class StatusValueValuesEnum(_messages.Enum): RUNNING: The RUNNING state indicates the cluster has been created and is fully usable. RECONCILING: The RECONCILING state indicates that some work is actively - being done on the cluster, such as upgrading the master or node + being done on the cluster, such as upgrading the main or node software. Details can be found in the `statusMessage` field. STOPPING: The STOPPING state indicates the cluster is being deleted. ERROR: The ERROR state indicates the cluster may be unusable. Details @@ -300,7 +300,7 @@ class AdditionalProperty(_messages.Message): clusterIpv4Cidr = _messages.StringField(2) conditions = _messages.MessageField('StatusCondition', 3, repeated=True) createTime = _messages.StringField(4) - currentMasterVersion = _messages.StringField(5) + currentMainVersion = _messages.StringField(5) currentNodeCount = _messages.IntegerField(6, variant=_messages.Variant.INT32) currentNodeVersion = _messages.StringField(7) description = _messages.StringField(8) @@ -317,8 +317,8 @@ class AdditionalProperty(_messages.Message): locations = _messages.StringField(19, repeated=True) loggingService = _messages.StringField(20) maintenancePolicy = _messages.MessageField('MaintenancePolicy', 21) - masterAuth = _messages.MessageField('MasterAuth', 22) - masterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 23) + mainAuth = _messages.MessageField('MainAuth', 22) + mainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 23) monitoringService = _messages.StringField(24) name = _messages.StringField(25) network = _messages.StringField(26) @@ -359,9 +359,9 @@ class ClusterUpdate(_messages.Message): nodes being either created or removed from the cluster, depending on whether locations are being added or removed. This list must always include the cluster's primary zone. - desiredMasterAuthorizedNetworksConfig: The desired configuration options - for master authorized networks feature. - desiredMasterVersion: The Kubernetes version to change the master to. + desiredMainAuthorizedNetworksConfig: The desired configuration options + for main authorized networks feature. + desiredMainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest @@ -387,7 +387,7 @@ class ClusterUpdate(_messages.Message): version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": - picks the Kubernetes master version + picks the Kubernetes main version """ desiredAddonsConfig = _messages.MessageField('AddonsConfig', 1) @@ -395,8 +395,8 @@ class ClusterUpdate(_messages.Message): desiredImageProject = _messages.StringField(3) desiredImageType = _messages.StringField(4) desiredLocations = _messages.StringField(5, repeated=True) - desiredMasterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 6) - desiredMasterVersion = _messages.StringField(7) + desiredMainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 6) + desiredMainVersion = _messages.StringField(7) desiredMonitoringService = _messages.StringField(8) desiredNodePoolAutoscaling = _messages.MessageField('NodePoolAutoscaling', 9) desiredNodePoolId = _messages.StringField(10) @@ -404,7 +404,7 @@ class ClusterUpdate(_messages.Message): class CompleteIPRotationRequest(_messages.Message): - r"""CompleteIPRotationRequest moves the cluster master back into single-IP + r"""CompleteIPRotationRequest moves the cluster main back into single-IP mode. Fields: @@ -1190,8 +1190,8 @@ class MaintenanceWindow(_messages.Message): dailyMaintenanceWindow = _messages.MessageField('DailyMaintenanceWindow', 1) -class MasterAuth(_messages.Message): - r"""The authentication information for accessing the master endpoint. +class MainAuth(_messages.Message): + r"""The authentication information for accessing the main endpoint. Authentication can be done using HTTP basic auth or using client certificates. @@ -1205,11 +1205,11 @@ class MasterAuth(_messages.Message): authenticate to the cluster endpoint. clusterCaCertificate: [Output only] Base64-encoded public certificate that is the root of trust for the cluster. - password: The password to use for HTTP basic authentication to the master - endpoint. Because the master endpoint is open to the Internet, you + password: The password to use for HTTP basic authentication to the main + endpoint. Because the main endpoint is open to the Internet, you should create a strong password. If a password is provided for cluster creation, username must be non-empty. - username: The username to use for HTTP basic authentication to the master + username: The username to use for HTTP basic authentication to the main endpoint. For clusters v1.6.0 and later, basic authentication can be disabled by leaving username unspecified (or setting it to the empty string). @@ -1223,16 +1223,16 @@ class MasterAuth(_messages.Message): username = _messages.StringField(6) -class MasterAuthorizedNetworksConfig(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworksConfig(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. Fields: cidrBlocks: cidr_blocks define up to 10 external networks that could - access Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + access Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrBlocks = _messages.MessageField('CidrBlock', 1, repeated=True) @@ -1284,7 +1284,7 @@ class ProviderValueValuesEnum(_messages.Enum): class NetworkPolicyConfig(_messages.Message): r"""Configuration for NetworkPolicy. This only tracks whether the addon is - enabled or not on the Master, it does not track whether network policy is + enabled or not on the Main, it does not track whether network policy is enabled for the nodes. Fields: @@ -1501,7 +1501,7 @@ class NodeManagement(_messages.Message): class NodePool(_messages.Message): r"""NodePool contains the name and configuration for a cluster's node pool. Node pools are a set of nodes (i.e. VM's), with a common configuration and - specification, under the control of the cluster master. They may have a set + specification, under the control of the cluster main. They may have a set of Kubernetes labels applied to them, which may be used to reference them during pod scheduling. They may also be resized up or down, to accommodate the workload. @@ -1662,7 +1662,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): TYPE_UNSPECIFIED: Not set. CREATE_CLUSTER: Cluster create. DELETE_CLUSTER: Cluster delete. - UPGRADE_MASTER: A master upgrade. + UPGRADE_MASTER: A main upgrade. UPGRADE_NODES: A node upgrade. REPAIR_CLUSTER: Cluster repair. UPDATE_CLUSTER: Cluster update. @@ -1672,7 +1672,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): AUTO_REPAIR_NODES: Automatic node pool repair. AUTO_UPGRADE_NODES: Automatic node upgrade. SET_LABELS: Set labels. - SET_MASTER_AUTH: Set/generate master auth materials + SET_MASTER_AUTH: Set/generate main auth materials SET_NODE_POOL_SIZE: Set node pool size. SET_NETWORK_POLICY: Updates network policy for a cluster. SET_MAINTENANCE_POLICY: Set the maintenance policy. @@ -1730,25 +1730,25 @@ class PrivateClusterConfig(_messages.Message): r"""Configuration options for private clusters. Fields: - enablePrivateEndpoint: Whether the master's internal IP address is used as + enablePrivateEndpoint: Whether the main's internal IP address is used as the cluster endpoint. enablePrivateNodes: Whether nodes have internal IP addresses only. If enabled, all nodes are given only RFC 1918 private addresses and - communicate with the master via private networking. - masterIpv4CidrBlock: The IP range in CIDR notation to use for the hosted - master network. This range will be used for assigning internal IP - addresses to the master or set of masters, as well as the ILB VIP. This + communicate with the main via private networking. + mainIpv4CidrBlock: The IP range in CIDR notation to use for the hosted + main network. This range will be used for assigning internal IP + addresses to the main or set of mains, as well as the ILB VIP. This range must not overlap with any other ranges in use within the cluster's network. privateEndpoint: Output only. The internal IP address of this cluster's - master endpoint. + main endpoint. publicEndpoint: Output only. The external IP address of this cluster's - master endpoint. + main endpoint. """ enablePrivateEndpoint = _messages.BooleanField(1) enablePrivateNodes = _messages.BooleanField(2) - masterIpv4CidrBlock = _messages.StringField(3) + mainIpv4CidrBlock = _messages.StringField(3) privateEndpoint = _messages.StringField(4) publicEndpoint = _messages.StringField(5) @@ -1789,14 +1789,14 @@ class ServerConfig(_messages.Message): default. defaultImageType: Default image type. validImageTypes: List of valid image types. - validMasterVersions: List of valid master versions. + validMainVersions: List of valid main versions. validNodeVersions: List of valid node upgrade target versions. """ defaultClusterVersion = _messages.StringField(1) defaultImageType = _messages.StringField(2) validImageTypes = _messages.StringField(3, repeated=True) - validMasterVersions = _messages.StringField(4, repeated=True) + validMainVersions = _messages.StringField(4, repeated=True) validNodeVersions = _messages.StringField(5, repeated=True) @@ -1992,15 +1992,15 @@ class SetMaintenancePolicyRequest(_messages.Message): zone = _messages.StringField(5) -class SetMasterAuthRequest(_messages.Message): - r"""SetMasterAuthRequest updates the admin password of a cluster. +class SetMainAuthRequest(_messages.Message): + r"""SetMainAuthRequest updates the admin password of a cluster. Enums: - ActionValueValuesEnum: The exact form of action to be taken on the master + ActionValueValuesEnum: The exact form of action to be taken on the main auth. Fields: - action: The exact form of action to be taken on the master auth. + action: The exact form of action to be taken on the main auth. clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. name: The name (project, location, cluster) of the cluster to set auth. @@ -2015,7 +2015,7 @@ class SetMasterAuthRequest(_messages.Message): """ class ActionValueValuesEnum(_messages.Enum): - r"""The exact form of action to be taken on the master auth. + r"""The exact form of action to be taken on the main auth. Values: UNKNOWN: Operation is unknown and will error out. @@ -2035,7 +2035,7 @@ class ActionValueValuesEnum(_messages.Enum): clusterId = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) - update = _messages.MessageField('MasterAuth', 5) + update = _messages.MessageField('MainAuth', 5) zone = _messages.StringField(6) @@ -2325,13 +2325,13 @@ class UpdateClusterRequest(_messages.Message): zone = _messages.StringField(5) -class UpdateMasterRequest(_messages.Message): - r"""UpdateMasterRequest updates the master of the cluster. +class UpdateMainRequest(_messages.Message): + r"""UpdateMainRequest updates the main of the cluster. Fields: clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. - masterVersion: The Kubernetes version to change the master to. Users may + mainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -2349,7 +2349,7 @@ class UpdateMasterRequest(_messages.Message): """ clusterId = _messages.StringField(1) - masterVersion = _messages.StringField(2) + mainVersion = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) zone = _messages.StringField(5) @@ -2377,7 +2377,7 @@ class UpdateNodePoolRequest(_messages.Message): - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": - picks an explicit Kubernetes version - "-": picks the Kubernetes master + picks an explicit Kubernetes version - "-": picks the Kubernetes main version projectId: Deprecated. The Google Developers Console [project ID or project number](https://support.google.com/cloud/answer/6158840). This diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py index 98a609ad..58ddd1e6 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py @@ -401,7 +401,7 @@ def __init__(self, client): } def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -721,32 +721,32 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth', + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMainAuth', http_method=u'POST', - method_id=u'container.projects.locations.clusters.setMasterAuth', + method_id=u'container.projects.locations.clusters.setMainAuth', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1alpha1/{+name}:setMasterAuth', + relative_path=u'v1alpha1/{+name}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -833,7 +833,7 @@ def SetResourceLabels(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message @@ -886,29 +886,29 @@ def Update(self, request, global_params=None): supports_download=False, ) - def UpdateMaster(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def UpdateMain(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('UpdateMaster') + config = self.GetMethodConfig('UpdateMain') return self._RunMethod( config, request, global_params=global_params) - UpdateMaster.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster', + UpdateMain.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMain', http_method=u'POST', - method_id=u'container.projects.locations.clusters.updateMaster', + method_id=u'container.projects.locations.clusters.updateMain', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1alpha1/{+name}:updateMaster', + relative_path=u'v1alpha1/{+name}:updateMain', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1323,7 +1323,7 @@ def Addons(self, request, global_params=None): ) def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -1551,28 +1551,28 @@ def Logging(self, request, global_params=None): supports_download=False, ) - def Master(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def Main(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('Master') + config = self.GetMethodConfig('Main') return self._RunMethod( config, request, global_params=global_params) - Master.method_config = lambda: base_api.ApiMethodInfo( + Main.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.master', + method_id=u'container.projects.zones.clusters.main', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master', + relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/main', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1655,31 +1655,31 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.setMasterAuth', + method_id=u'container.projects.zones.clusters.setMainAuth', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth', + relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1711,7 +1711,7 @@ def SetNetworkPolicy(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py index 5a268189..36081a1c 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py @@ -47,7 +47,7 @@ class AddonsConfig(_messages.Message): and secure microservices. kubernetesDashboard: Configuration for the Kubernetes Dashboard. networkPolicyConfig: Configuration for NetworkPolicy. This only tracks - whether the addon is enabled or not on the Master, it does not track + whether the addon is enabled or not on the Main, it does not track whether network policy is enabled for the nodes. serverlessConfig: Deprecated: use CloudRunConfig instead (same behavior). """ @@ -211,7 +211,7 @@ class Cluster(_messages.Message): conditions: Which conditions caused the current cluster state. createTime: [Output only] The time the cluster was created, in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. - currentMasterVersion: The current software version of the master endpoint. + currentMainVersion: The current software version of the main endpoint. currentNodeCount: [Output only] The number of nodes currently in the cluster. Deprecated. Call Kubernetes API directly to retrieve node information. @@ -232,21 +232,21 @@ class Cluster(_messages.Message): description: An optional description of this cluster. enableKubernetesAlpha: Kubernetes alpha features are enabled on this cluster. This includes alpha API groups (e.g. v1alpha1) and features - that may not be production ready in the kubernetes version of the master - and nodes. The cluster has no SLA for uptime and master/node upgrades + that may not be production ready in the kubernetes version of the main + and nodes. The cluster has no SLA for uptime and main/node upgrades are disabled. Alpha enabled clusters are automatically deleted thirty days after creation. enableTpu: Enable the ability to use Cloud TPUs in this cluster. - endpoint: [Output only] The IP address of this cluster's master endpoint. + endpoint: [Output only] The IP address of this cluster's main endpoint. The endpoint can be accessed from the internet at - `https://username:password@endpoint/`. See the `masterAuth` property of + `https://username:password@endpoint/`. See the `mainAuth` property of this resource for username and password information. expireTime: [Output only] The time the cluster will be automatically deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. initialClusterVersion: The initial Kubernetes version for this cluster. - Valid versions are those found in validMasterVersions returned by + Valid versions are those found in validMainVersions returned by getServerConfig. The version can be upgraded over time; such upgrades - are reflected in currentMasterVersion and currentNodeVersion. Users may + are reflected in currentMainVersion and currentNodeVersion. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -280,17 +280,17 @@ class Cluster(_messages.Message): maintenancePolicy: Configure the maintenance policy for this cluster. managedPodIdentityConfig: Configuration for the use of GCP IAM Service Accounts in applications in this cluster. - masterAuth: The authentication information for accessing the master + mainAuth: The authentication information for accessing the main endpoint. If unspecified, the defaults are used: For clusters before - v1.12, if master_auth is unspecified, `username` will be set to "admin", + v1.12, if main_auth is unspecified, `username` will be set to "admin", a random password will be generated, and a client certificate will be issued. - masterAuthorizedNetworksConfig: The configuration options for master + mainAuthorizedNetworksConfig: The configuration options for main authorized networks feature. - masterIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted - master network. This prefix will be used for assigning private IP - addresses to the master or set of masters, as well as the ILB VIP. This - field is deprecated, use private_cluster_config.master_ipv4_cidr_block + mainIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted + main network. This prefix will be used for assigning private IP + addresses to the main or set of mains, as well as the ILB VIP. This + field is deprecated, use private_cluster_config.main_ipv4_cidr_block instead. monitoringService: The monitoring service the cluster should use to write metrics. Currently available options: * `monitoring.googleapis.com` - @@ -323,7 +323,7 @@ class Cluster(_messages.Message): podSecurityPolicyConfig: Configuration for the PodSecurityPolicy feature. privateCluster: If this is a private cluster setup. Private clusters are clusters that, by default have no external IP addresses on the nodes and - where nodes and the master communicate over private IP addresses. This + where nodes and the main communicate over private IP addresses. This field is deprecated, use private_cluster_config.enable_private_nodes instead. privateClusterConfig: Configuration for private cluster. @@ -380,7 +380,7 @@ class StatusValueValuesEnum(_messages.Enum): RUNNING: The RUNNING state indicates the cluster has been created and is fully usable. RECONCILING: The RECONCILING state indicates that some work is actively - being done on the cluster, such as upgrading the master or node + being done on the cluster, such as upgrading the main or node software. Details can be found in the `statusMessage` field. STOPPING: The STOPPING state indicates the cluster is being deleted. ERROR: The ERROR state indicates the cluster may be unusable. Details @@ -430,7 +430,7 @@ class AdditionalProperty(_messages.Message): clusterIpv4Cidr = _messages.StringField(5) conditions = _messages.MessageField('StatusCondition', 6, repeated=True) createTime = _messages.StringField(7) - currentMasterVersion = _messages.StringField(8) + currentMainVersion = _messages.StringField(8) currentNodeCount = _messages.IntegerField(9, variant=_messages.Variant.INT32) currentNodeVersion = _messages.StringField(10) databaseEncryption = _messages.MessageField('DatabaseEncryption', 11) @@ -452,9 +452,9 @@ class AdditionalProperty(_messages.Message): loggingService = _messages.StringField(27) maintenancePolicy = _messages.MessageField('MaintenancePolicy', 28) managedPodIdentityConfig = _messages.MessageField('ManagedPodIdentityConfig', 29) - masterAuth = _messages.MessageField('MasterAuth', 30) - masterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 31) - masterIpv4CidrBlock = _messages.StringField(32) + mainAuth = _messages.MessageField('MainAuth', 30) + mainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 31) + mainIpv4CidrBlock = _messages.StringField(32) monitoringService = _messages.StringField(33) name = _messages.StringField(34) network = _messages.StringField(35) @@ -533,9 +533,9 @@ class ClusterUpdate(_messages.Message): with Kubernetes-native resource model in Stackdriver * "logging.googleapis.com" - the Google Cloud Logging service * "none" - no logs will be exported from the cluster - desiredMasterAuthorizedNetworksConfig: The desired configuration options - for master authorized networks feature. - desiredMasterVersion: The Kubernetes version to change the master to. + desiredMainAuthorizedNetworksConfig: The desired configuration options + for main authorized networks feature. + desiredMainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest @@ -563,7 +563,7 @@ class ClusterUpdate(_messages.Message): version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": - picks the Kubernetes master version + picks the Kubernetes main version desiredPodSecurityPolicyConfig: The desired configuration options for the PodSecurityPolicy feature. desiredPrivateClusterConfig: The desired private cluster configuration. @@ -588,8 +588,8 @@ class ClusterUpdate(_messages.Message): desiredIntraNodeFlowLogsStatus = _messages.MessageField('IntraNodeFlowLogsStatus', 10) desiredLocations = _messages.StringField(11, repeated=True) desiredLoggingService = _messages.StringField(12) - desiredMasterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 13) - desiredMasterVersion = _messages.StringField(14) + desiredMainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 13) + desiredMainVersion = _messages.StringField(14) desiredMonitoringService = _messages.StringField(15) desiredNodePoolAutoscaling = _messages.MessageField('NodePoolAutoscaling', 16) desiredNodePoolId = _messages.StringField(17) @@ -603,7 +603,7 @@ class ClusterUpdate(_messages.Message): class CompleteIPRotationRequest(_messages.Message): - r"""CompleteIPRotationRequest moves the cluster master back into single-IP + r"""CompleteIPRotationRequest moves the cluster main back into single-IP mode. Fields: @@ -1766,8 +1766,8 @@ class ManagedPodIdentityConfig(_messages.Message): federatingServiceAccount = _messages.StringField(2) -class MasterAuth(_messages.Message): - r"""The authentication information for accessing the master endpoint. +class MainAuth(_messages.Message): + r"""The authentication information for accessing the main endpoint. Authentication can be done using HTTP basic auth or using client certificates. @@ -1781,11 +1781,11 @@ class MasterAuth(_messages.Message): authenticate to the cluster endpoint. clusterCaCertificate: [Output only] Base64-encoded public certificate that is the root of trust for the cluster. - password: The password to use for HTTP basic authentication to the master - endpoint. Because the master endpoint is open to the Internet, you + password: The password to use for HTTP basic authentication to the main + endpoint. Because the main endpoint is open to the Internet, you should create a strong password. If a password is provided for cluster creation, username must be non-empty. - username: The username to use for HTTP basic authentication to the master + username: The username to use for HTTP basic authentication to the main endpoint. For clusters v1.6.0 and later, basic authentication can be disabled by leaving username unspecified (or setting it to the empty string). @@ -1799,16 +1799,16 @@ class MasterAuth(_messages.Message): username = _messages.StringField(6) -class MasterAuthorizedNetworksConfig(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworksConfig(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. Fields: cidrBlocks: cidr_blocks define up to 10 external networks that could - access Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + access Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrBlocks = _messages.MessageField('CidrBlock', 1, repeated=True) @@ -1901,7 +1901,7 @@ class ProviderValueValuesEnum(_messages.Enum): class NetworkPolicyConfig(_messages.Message): r"""Configuration for NetworkPolicy. This only tracks whether the addon is - enabled or not on the Master, it does not track whether network policy is + enabled or not on the Main, it does not track whether network policy is enabled for the nodes. Fields: @@ -2125,7 +2125,7 @@ class NodeManagement(_messages.Message): class NodePool(_messages.Message): r"""NodePool contains the name and configuration for a cluster's node pool. Node pools are a set of nodes (i.e. VM's), with a common configuration and - specification, under the control of the cluster master. They may have a set + specification, under the control of the cluster main. They may have a set of Kubernetes labels applied to them, which may be used to reference them during pod scheduling. They may also be resized up or down, to accommodate the workload. @@ -2299,7 +2299,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): TYPE_UNSPECIFIED: Not set. CREATE_CLUSTER: Cluster create. DELETE_CLUSTER: Cluster delete. - UPGRADE_MASTER: A master upgrade. + UPGRADE_MASTER: A main upgrade. UPGRADE_NODES: A node upgrade. REPAIR_CLUSTER: Cluster repair. UPDATE_CLUSTER: Cluster update. @@ -2309,7 +2309,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): AUTO_REPAIR_NODES: Automatic node pool repair. AUTO_UPGRADE_NODES: Automatic node upgrade. SET_LABELS: Set labels. - SET_MASTER_AUTH: Set/generate master auth materials + SET_MASTER_AUTH: Set/generate main auth materials SET_NODE_POOL_SIZE: Set node pool size. SET_NETWORK_POLICY: Updates network policy for a cluster. SET_MAINTENANCE_POLICY: Set the maintenance policy. @@ -2423,14 +2423,14 @@ class PrivateClusterConfig(_messages.Message): Fields: enablePeeringRouteSharing: Whether to enable route sharing over the network peering. - enablePrivateEndpoint: Whether the master's internal IP address is used as + enablePrivateEndpoint: Whether the main's internal IP address is used as the cluster endpoint. enablePrivateNodes: Whether nodes have internal IP addresses only. If enabled, all nodes are given only RFC 1918 private addresses and - communicate with the master via private networking. - masterIpv4CidrBlock: The IP range in CIDR notation to use for the hosted - master network. This range will be used for assigning internal IP - addresses to the master or set of masters, as well as the ILB VIP. This + communicate with the main via private networking. + mainIpv4CidrBlock: The IP range in CIDR notation to use for the hosted + main network. This range will be used for assigning internal IP + addresses to the main or set of mains, as well as the ILB VIP. This range must not overlap with any other ranges in use within the cluster's network. privateEndpoint: Output only. The internal IP address of this cluster's @@ -2442,7 +2442,7 @@ class PrivateClusterConfig(_messages.Message): enablePeeringRouteSharing = _messages.BooleanField(1) enablePrivateEndpoint = _messages.BooleanField(2) enablePrivateNodes = _messages.BooleanField(3) - masterIpv4CidrBlock = _messages.StringField(4) + mainIpv4CidrBlock = _messages.StringField(4) privateEndpoint = _messages.StringField(5) publicEndpoint = _messages.StringField(6) @@ -2553,14 +2553,14 @@ class ServerConfig(_messages.Message): default. defaultImageType: Default image type. validImageTypes: List of valid image types. - validMasterVersions: List of valid master versions. + validMainVersions: List of valid main versions. validNodeVersions: List of valid node upgrade target versions. """ defaultClusterVersion = _messages.StringField(1) defaultImageType = _messages.StringField(2) validImageTypes = _messages.StringField(3, repeated=True) - validMasterVersions = _messages.StringField(4, repeated=True) + validMainVersions = _messages.StringField(4, repeated=True) validNodeVersions = _messages.StringField(5, repeated=True) @@ -2766,15 +2766,15 @@ class SetMaintenancePolicyRequest(_messages.Message): zone = _messages.StringField(5) -class SetMasterAuthRequest(_messages.Message): - r"""SetMasterAuthRequest updates the admin password of a cluster. +class SetMainAuthRequest(_messages.Message): + r"""SetMainAuthRequest updates the admin password of a cluster. Enums: - ActionValueValuesEnum: The exact form of action to be taken on the master + ActionValueValuesEnum: The exact form of action to be taken on the main auth. Fields: - action: The exact form of action to be taken on the master auth. + action: The exact form of action to be taken on the main auth. clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. name: The name (project, location, cluster) of the cluster to set auth. @@ -2789,7 +2789,7 @@ class SetMasterAuthRequest(_messages.Message): """ class ActionValueValuesEnum(_messages.Enum): - r"""The exact form of action to be taken on the master auth. + r"""The exact form of action to be taken on the main auth. Values: UNKNOWN: Operation is unknown and will error out. @@ -2809,7 +2809,7 @@ class ActionValueValuesEnum(_messages.Enum): clusterId = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) - update = _messages.MessageField('MasterAuth', 5) + update = _messages.MessageField('MainAuth', 5) zone = _messages.StringField(6) @@ -3101,13 +3101,13 @@ class UpdateClusterRequest(_messages.Message): zone = _messages.StringField(6) -class UpdateMasterRequest(_messages.Message): - r"""UpdateMasterRequest updates the master of the cluster. +class UpdateMainRequest(_messages.Message): + r"""UpdateMainRequest updates the main of the cluster. Fields: clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. - masterVersion: The Kubernetes version to change the master to. Users may + mainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -3124,7 +3124,7 @@ class UpdateMasterRequest(_messages.Message): """ clusterId = _messages.StringField(1) - masterVersion = _messages.StringField(2) + mainVersion = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) zone = _messages.StringField(5) @@ -3157,7 +3157,7 @@ class UpdateNodePoolRequest(_messages.Message): - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": - picks an explicit Kubernetes version - "-": picks the Kubernetes master + picks an explicit Kubernetes version - "-": picks the Kubernetes main version projectId: Deprecated. The Google Developers Console [project ID or project number](https://support.google.com/cloud/answer/6158840). This diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py index 2422df21..95f33140 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py @@ -401,7 +401,7 @@ def __init__(self, client): } def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -721,32 +721,32 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth', + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMainAuth', http_method=u'POST', - method_id=u'container.projects.locations.clusters.setMasterAuth', + method_id=u'container.projects.locations.clusters.setMainAuth', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1beta1/{+name}:setMasterAuth', + relative_path=u'v1beta1/{+name}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -833,7 +833,7 @@ def SetResourceLabels(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message @@ -886,29 +886,29 @@ def Update(self, request, global_params=None): supports_download=False, ) - def UpdateMaster(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def UpdateMain(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('UpdateMaster') + config = self.GetMethodConfig('UpdateMain') return self._RunMethod( config, request, global_params=global_params) - UpdateMaster.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster', + UpdateMain.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMain', http_method=u'POST', - method_id=u'container.projects.locations.clusters.updateMaster', + method_id=u'container.projects.locations.clusters.updateMain', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1beta1/{+name}:updateMaster', + relative_path=u'v1beta1/{+name}:updateMain', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1350,7 +1350,7 @@ def Addons(self, request, global_params=None): ) def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -1578,28 +1578,28 @@ def Logging(self, request, global_params=None): supports_download=False, ) - def Master(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def Main(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('Master') + config = self.GetMethodConfig('Main') return self._RunMethod( config, request, global_params=global_params) - Master.method_config = lambda: base_api.ApiMethodInfo( + Main.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.master', + method_id=u'container.projects.zones.clusters.main', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master', + relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/main', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1682,31 +1682,31 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.setMasterAuth', + method_id=u'container.projects.zones.clusters.setMainAuth', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth', + relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1738,7 +1738,7 @@ def SetNetworkPolicy(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py index 2b3344f0..6b8e759b 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py @@ -45,7 +45,7 @@ class AddonsConfig(_messages.Message): and secure microservices. kubernetesDashboard: Configuration for the Kubernetes Dashboard. networkPolicyConfig: Configuration for NetworkPolicy. This only tracks - whether the addon is enabled or not on the Master, it does not track + whether the addon is enabled or not on the Main, it does not track whether network policy is enabled for the nodes. """ @@ -188,8 +188,8 @@ class Cluster(_messages.Message): conditions: Which conditions caused the current cluster state. createTime: [Output only] The time the cluster was created, in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. - currentMasterVersion: [Output only] The current software version of the - master endpoint. + currentMainVersion: [Output only] The current software version of the + main endpoint. currentNodeCount: [Output only] The number of nodes currently in the cluster. Deprecated. Call Kubernetes API directly to retrieve node information. @@ -206,21 +206,21 @@ class Cluster(_messages.Message): description: An optional description of this cluster. enableKubernetesAlpha: Kubernetes alpha features are enabled on this cluster. This includes alpha API groups (e.g. v1beta1) and features that - may not be production ready in the kubernetes version of the master and - nodes. The cluster has no SLA for uptime and master/node upgrades are + may not be production ready in the kubernetes version of the main and + nodes. The cluster has no SLA for uptime and main/node upgrades are disabled. Alpha enabled clusters are automatically deleted thirty days after creation. enableTpu: Enable the ability to use Cloud TPUs in this cluster. - endpoint: [Output only] The IP address of this cluster's master endpoint. + endpoint: [Output only] The IP address of this cluster's main endpoint. The endpoint can be accessed from the internet at - `https://username:password@endpoint/`. See the `masterAuth` property of + `https://username:password@endpoint/`. See the `mainAuth` property of this resource for username and password information. expireTime: [Output only] The time the cluster will be automatically deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. initialClusterVersion: The initial Kubernetes version for this cluster. - Valid versions are those found in validMasterVersions returned by + Valid versions are those found in validMainVersions returned by getServerConfig. The version can be upgraded over time; such upgrades - are reflected in currentMasterVersion and currentNodeVersion. Users may + are reflected in currentMainVersion and currentNodeVersion. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -252,17 +252,17 @@ class Cluster(_messages.Message): cluster. * if left as an empty string,`logging.googleapis.com` will be used. maintenancePolicy: Configure the maintenance policy for this cluster. - masterAuth: The authentication information for accessing the master + mainAuth: The authentication information for accessing the main endpoint. If unspecified, the defaults are used: For clusters before - v1.12, if master_auth is unspecified, `username` will be set to "admin", + v1.12, if main_auth is unspecified, `username` will be set to "admin", a random password will be generated, and a client certificate will be issued. - masterAuthorizedNetworksConfig: The configuration options for master + mainAuthorizedNetworksConfig: The configuration options for main authorized networks feature. - masterIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted - master network. This prefix will be used for assigning private IP - addresses to the master or set of masters, as well as the ILB VIP. This - field is deprecated, use private_cluster_config.master_ipv4_cidr_block + mainIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted + main network. This prefix will be used for assigning private IP + addresses to the main or set of mains, as well as the ILB VIP. This + field is deprecated, use private_cluster_config.main_ipv4_cidr_block instead. monitoringService: The monitoring service the cluster should use to write metrics. Currently available options: * `monitoring.googleapis.com` - @@ -295,7 +295,7 @@ class Cluster(_messages.Message): podSecurityPolicyConfig: Configuration for the PodSecurityPolicy feature. privateCluster: If this is a private cluster setup. Private clusters are clusters that, by default have no external IP addresses on the nodes and - where nodes and the master communicate over private IP addresses. This + where nodes and the main communicate over private IP addresses. This field is deprecated, use private_cluster_config.enable_private_nodes instead. privateClusterConfig: Configuration for private cluster. @@ -334,7 +334,7 @@ class StatusValueValuesEnum(_messages.Enum): RUNNING: The RUNNING state indicates the cluster has been created and is fully usable. RECONCILING: The RECONCILING state indicates that some work is actively - being done on the cluster, such as upgrading the master or node + being done on the cluster, such as upgrading the main or node software. Details can be found in the `statusMessage` field. STOPPING: The STOPPING state indicates the cluster is being deleted. ERROR: The ERROR state indicates the cluster may be unusable. Details @@ -384,7 +384,7 @@ class AdditionalProperty(_messages.Message): clusterIpv4Cidr = _messages.StringField(5) conditions = _messages.MessageField('StatusCondition', 6, repeated=True) createTime = _messages.StringField(7) - currentMasterVersion = _messages.StringField(8) + currentMainVersion = _messages.StringField(8) currentNodeCount = _messages.IntegerField(9, variant=_messages.Variant.INT32) currentNodeVersion = _messages.StringField(10) databaseEncryption = _messages.MessageField('DatabaseEncryption', 11) @@ -404,9 +404,9 @@ class AdditionalProperty(_messages.Message): locations = _messages.StringField(25, repeated=True) loggingService = _messages.StringField(26) maintenancePolicy = _messages.MessageField('MaintenancePolicy', 27) - masterAuth = _messages.MessageField('MasterAuth', 28) - masterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 29) - masterIpv4CidrBlock = _messages.StringField(30) + mainAuth = _messages.MessageField('MainAuth', 28) + mainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 29) + mainIpv4CidrBlock = _messages.StringField(30) monitoringService = _messages.StringField(31) name = _messages.StringField(32) network = _messages.StringField(33) @@ -476,9 +476,9 @@ class ClusterUpdate(_messages.Message): with Kubernetes-native resource model in Stackdriver * "logging.googleapis.com" - the Google Cloud Logging service * "none" - no logs will be exported from the cluster - desiredMasterAuthorizedNetworksConfig: The desired configuration options - for master authorized networks feature. - desiredMasterVersion: The Kubernetes version to change the master to. The + desiredMainAuthorizedNetworksConfig: The desired configuration options + for main authorized networks feature. + desiredMainVersion: The Kubernetes version to change the main to. The only valid value is the latest supported version. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the @@ -507,7 +507,7 @@ class ClusterUpdate(_messages.Message): version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": - picks the Kubernetes master version + picks the Kubernetes main version desiredPodSecurityPolicyConfig: The desired configuration options for the PodSecurityPolicy feature. desiredResourceUsageExportConfig: The desired configuration for exporting @@ -525,8 +525,8 @@ class ClusterUpdate(_messages.Message): desiredImageType = _messages.StringField(7) desiredLocations = _messages.StringField(8, repeated=True) desiredLoggingService = _messages.StringField(9) - desiredMasterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 10) - desiredMasterVersion = _messages.StringField(11) + desiredMainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 10) + desiredMainVersion = _messages.StringField(11) desiredMonitoringService = _messages.StringField(12) desiredNodePoolAutoscaling = _messages.MessageField('NodePoolAutoscaling', 13) desiredNodePoolId = _messages.StringField(14) @@ -537,7 +537,7 @@ class ClusterUpdate(_messages.Message): class CompleteIPRotationRequest(_messages.Message): - r"""CompleteIPRotationRequest moves the cluster master back into single-IP + r"""CompleteIPRotationRequest moves the cluster main back into single-IP mode. Fields: @@ -1504,8 +1504,8 @@ class MaintenanceWindow(_messages.Message): dailyMaintenanceWindow = _messages.MessageField('DailyMaintenanceWindow', 1) -class MasterAuth(_messages.Message): - r"""The authentication information for accessing the master endpoint. +class MainAuth(_messages.Message): + r"""The authentication information for accessing the main endpoint. Authentication can be done using HTTP basic auth or using client certificates. @@ -1519,11 +1519,11 @@ class MasterAuth(_messages.Message): authenticate to the cluster endpoint. clusterCaCertificate: [Output only] Base64-encoded public certificate that is the root of trust for the cluster. - password: The password to use for HTTP basic authentication to the master - endpoint. Because the master endpoint is open to the Internet, you + password: The password to use for HTTP basic authentication to the main + endpoint. Because the main endpoint is open to the Internet, you should create a strong password. If a password is provided for cluster creation, username must be non-empty. - username: The username to use for HTTP basic authentication to the master + username: The username to use for HTTP basic authentication to the main endpoint. For clusters v1.6.0 and later, basic authentication can be disabled by leaving username unspecified (or setting it to the empty string). @@ -1537,16 +1537,16 @@ class MasterAuth(_messages.Message): username = _messages.StringField(6) -class MasterAuthorizedNetworksConfig(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworksConfig(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. Fields: cidrBlocks: cidr_blocks define up to 10 external networks that could - access Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + access Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrBlocks = _messages.MessageField('CidrBlock', 1, repeated=True) @@ -1625,7 +1625,7 @@ class ProviderValueValuesEnum(_messages.Enum): class NetworkPolicyConfig(_messages.Message): r"""Configuration for NetworkPolicy. This only tracks whether the addon is - enabled or not on the Master, it does not track whether network policy is + enabled or not on the Main, it does not track whether network policy is enabled for the nodes. Fields: @@ -1839,7 +1839,7 @@ class NodeManagement(_messages.Message): class NodePool(_messages.Message): r"""NodePool contains the name and configuration for a cluster's node pool. Node pools are a set of nodes (i.e. VM's), with a common configuration and - specification, under the control of the cluster master. They may have a set + specification, under the control of the cluster main. They may have a set of Kubernetes labels applied to them, which may be used to reference them during pod scheduling. They may also be resized up or down, to accommodate the workload. @@ -2006,7 +2006,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): TYPE_UNSPECIFIED: Not set. CREATE_CLUSTER: Cluster create. DELETE_CLUSTER: Cluster delete. - UPGRADE_MASTER: A master upgrade. + UPGRADE_MASTER: A main upgrade. UPGRADE_NODES: A node upgrade. REPAIR_CLUSTER: Cluster repair. UPDATE_CLUSTER: Cluster update. @@ -2016,7 +2016,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): AUTO_REPAIR_NODES: Automatic node pool repair. AUTO_UPGRADE_NODES: Automatic node upgrade. SET_LABELS: Set labels. - SET_MASTER_AUTH: Set/generate master auth materials + SET_MASTER_AUTH: Set/generate main auth materials SET_NODE_POOL_SIZE: Set node pool size. SET_NETWORK_POLICY: Updates network policy for a cluster. SET_MAINTENANCE_POLICY: Set the maintenance policy. @@ -2126,25 +2126,25 @@ class PrivateClusterConfig(_messages.Message): r"""Configuration options for private clusters. Fields: - enablePrivateEndpoint: Whether the master's internal IP address is used as + enablePrivateEndpoint: Whether the main's internal IP address is used as the cluster endpoint. enablePrivateNodes: Whether nodes have internal IP addresses only. If enabled, all nodes are given only RFC 1918 private addresses and - communicate with the master via private networking. - masterIpv4CidrBlock: The IP range in CIDR notation to use for the hosted - master network. This range will be used for assigning internal IP - addresses to the master or set of masters, as well as the ILB VIP. This + communicate with the main via private networking. + mainIpv4CidrBlock: The IP range in CIDR notation to use for the hosted + main network. This range will be used for assigning internal IP + addresses to the main or set of mains, as well as the ILB VIP. This range must not overlap with any other ranges in use within the cluster's network. privateEndpoint: Output only. The internal IP address of this cluster's - master endpoint. + main endpoint. publicEndpoint: Output only. The external IP address of this cluster's - master endpoint. + main endpoint. """ enablePrivateEndpoint = _messages.BooleanField(1) enablePrivateNodes = _messages.BooleanField(2) - masterIpv4CidrBlock = _messages.StringField(3) + mainIpv4CidrBlock = _messages.StringField(3) privateEndpoint = _messages.StringField(4) publicEndpoint = _messages.StringField(5) @@ -2215,14 +2215,14 @@ class ServerConfig(_messages.Message): default. defaultImageType: Default image type. validImageTypes: List of valid image types. - validMasterVersions: List of valid master versions. + validMainVersions: List of valid main versions. validNodeVersions: List of valid node upgrade target versions. """ defaultClusterVersion = _messages.StringField(1) defaultImageType = _messages.StringField(2) validImageTypes = _messages.StringField(3, repeated=True) - validMasterVersions = _messages.StringField(4, repeated=True) + validMainVersions = _messages.StringField(4, repeated=True) validNodeVersions = _messages.StringField(5, repeated=True) @@ -2418,15 +2418,15 @@ class SetMaintenancePolicyRequest(_messages.Message): zone = _messages.StringField(5) -class SetMasterAuthRequest(_messages.Message): - r"""SetMasterAuthRequest updates the admin password of a cluster. +class SetMainAuthRequest(_messages.Message): + r"""SetMainAuthRequest updates the admin password of a cluster. Enums: - ActionValueValuesEnum: The exact form of action to be taken on the master + ActionValueValuesEnum: The exact form of action to be taken on the main auth. Fields: - action: The exact form of action to be taken on the master auth. + action: The exact form of action to be taken on the main auth. clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. name: The name (project, location, cluster) of the cluster to set auth. @@ -2441,7 +2441,7 @@ class SetMasterAuthRequest(_messages.Message): """ class ActionValueValuesEnum(_messages.Enum): - r"""The exact form of action to be taken on the master auth. + r"""The exact form of action to be taken on the main auth. Values: UNKNOWN: Operation is unknown and will error out. @@ -2461,7 +2461,7 @@ class ActionValueValuesEnum(_messages.Enum): clusterId = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) - update = _messages.MessageField('MasterAuth', 5) + update = _messages.MessageField('MainAuth', 5) zone = _messages.StringField(6) @@ -2751,13 +2751,13 @@ class UpdateClusterRequest(_messages.Message): zone = _messages.StringField(5) -class UpdateMasterRequest(_messages.Message): - r"""UpdateMasterRequest updates the master of the cluster. +class UpdateMainRequest(_messages.Message): + r"""UpdateMainRequest updates the main of the cluster. Fields: clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. - masterVersion: The Kubernetes version to change the master to. Users may + mainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -2775,7 +2775,7 @@ class UpdateMasterRequest(_messages.Message): """ clusterId = _messages.StringField(1) - masterVersion = _messages.StringField(2) + mainVersion = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) zone = _messages.StringField(5) @@ -2803,7 +2803,7 @@ class UpdateNodePoolRequest(_messages.Message): - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": - picks an explicit Kubernetes version - "-": picks the Kubernetes master + picks an explicit Kubernetes version - "-": picks the Kubernetes main version projectId: Deprecated. The Google Developers Console [project ID or project number](https://support.google.com/cloud/answer/6158840). This diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py index e74b5ffa..b7f8b816 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py @@ -155,14 +155,14 @@ class ClusterConfig(_messages.Message): gceClusterConfig: Required. The shared Compute Engine config settings for all instances in a cluster. initializationActions: Optional. Commands to execute on each node after - config is completed. By default, executables are run on master and all + config is completed. By default, executables are run on main and all worker nodes. You can test a node's role metadata to run an executable - on a master or worker node, as shown below using curl (you can also use + on a main or worker node, as shown below using curl (you can also use wget): ROLE=$(curl -H Metadata-Flavor:Google http://metadata/computeMetadata/v1/instance/attributes/dataproc-role) if - [[ "${ROLE}" == 'Master' ]]; then ... master specific actions ... else + [[ "${ROLE}" == 'Main' ]]; then ... main specific actions ... else ... worker specific actions ... fi - masterConfig: Optional. The Compute Engine config settings for the master + mainConfig: Optional. The Compute Engine config settings for the main instance in a cluster. secondaryWorkerConfig: Optional. The Compute Engine config settings for additional worker instances in a cluster. @@ -176,7 +176,7 @@ class ClusterConfig(_messages.Message): encryptionConfig = _messages.MessageField('EncryptionConfig', 2) gceClusterConfig = _messages.MessageField('GceClusterConfig', 3) initializationActions = _messages.MessageField('NodeInitializationAction', 4, repeated=True) - masterConfig = _messages.MessageField('InstanceGroupConfig', 5) + mainConfig = _messages.MessageField('InstanceGroupConfig', 5) secondaryWorkerConfig = _messages.MessageField('InstanceGroupConfig', 6) softwareConfig = _messages.MessageField('SoftwareConfig', 7) workerConfig = _messages.MessageField('InstanceGroupConfig', 8) @@ -1615,7 +1615,7 @@ class AdditionalProperty(_messages.Message): class InstanceGroupConfig(_messages.Message): r"""Optional. The config settings for Compute Engine resources in an - instance group, such as a master or worker group. + instance group, such as a main or worker group. Fields: accelerators: Optional. The Compute Engine accelerator configuration for @@ -1642,7 +1642,7 @@ class InstanceGroupConfig(_messages.Message): Group Manager that manages this group. This is only used for preemptible instance groups. numInstances: Optional. The number of VM instances in the instance group. - For master instance groups, must be set to 1. + For main instance groups, must be set to 1. """ accelerators = _messages.MessageField('AcceleratorConfig', 1, repeated=True) @@ -3369,7 +3369,7 @@ class YarnApplication(_messages.Message): progress: Required. The numerical progress of the application, from 1 to 100. state: Required. The application state. - trackingUrl: Optional. The HTTP URL of the ApplicationMaster, + trackingUrl: Optional. The HTTP URL of the ApplicationMain, HistoryServer, or TimelineServer that provides application-specific information. The URL uses the internal hostname, and requires a proxy server for resolution and, possibly, access. diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py index a40225ac..a5cbec8c 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py @@ -269,16 +269,16 @@ class ClusterConfig(_messages.Message): gceClusterConfig: Required. The shared Compute Engine config settings for all instances in a cluster. initializationActions: Optional. Commands to execute on each node after - config is completed. By default, executables are run on master and all + config is completed. By default, executables are run on main and all worker nodes. You can test a node's role metadata to run an - executable on a master or worker node, as shown below using curl (you + executable on a main or worker node, as shown below using curl (you can also use wget): ROLE=$(curl -H Metadata-Flavor:Google http://metadata/computeMetadata/v1beta2/instance/attributes/dataproc- - role) if [[ "${ROLE}" == 'Master' ]]; then ... master specific actions + role) if [[ "${ROLE}" == 'Main' ]]; then ... main specific actions ... else ... worker specific actions ... fi lifecycleConfig: Optional. The config setting for auto delete cluster schedule. - masterConfig: Optional. The Compute Engine config settings for the master + mainConfig: Optional. The Compute Engine config settings for the main instance in a cluster. secondaryWorkerConfig: Optional. The Compute Engine config settings for additional worker instances in a cluster. @@ -296,7 +296,7 @@ class ClusterConfig(_messages.Message): gceClusterConfig = _messages.MessageField('GceClusterConfig', 5) initializationActions = _messages.MessageField('NodeInitializationAction', 6, repeated=True) lifecycleConfig = _messages.MessageField('LifecycleConfig', 7) - masterConfig = _messages.MessageField('InstanceGroupConfig', 8) + mainConfig = _messages.MessageField('InstanceGroupConfig', 8) secondaryWorkerConfig = _messages.MessageField('InstanceGroupConfig', 9) securityConfig = _messages.MessageField('SecurityConfig', 10) softwareConfig = _messages.MessageField('SoftwareConfig', 11) @@ -1920,7 +1920,7 @@ class InstanceGroupAutoscalingPolicyConfig(_messages.Message): class InstanceGroupConfig(_messages.Message): r"""Optional. The config settings for Compute Engine resources in an - instance group, such as a master or worker group. + instance group, such as a main or worker group. Fields: accelerators: Optional. The Compute Engine accelerator configuration for @@ -1949,7 +1949,7 @@ class InstanceGroupConfig(_messages.Message): minCpuPlatform: Optional. Specifies the minimum cpu platform for the Instance Group. See Cloud Dataproc→Minimum CPU Platform. numInstances: Optional. The number of VM instances in the instance group. - For master instance groups, must be set to 1. + For main instance groups, must be set to 1. """ accelerators = _messages.MessageField('AcceleratorConfig', 1, repeated=True) @@ -2256,7 +2256,7 @@ class KerberosConfig(_messages.Message): enableKerberos: Optional. Flag to indicate whether to Kerberize the cluster. kdcDbKeyUri: Optional. The GCS uri of a KMS encrypted file containing the - master key of the KDC database. + main key of the KDC database. keyPasswordUri: Optional. The GCS uri of a KMS encrypted file containing the password to the user provided key. For the self-signed certificate, this password is generated by Dataproc. @@ -3846,7 +3846,7 @@ class YarnApplication(_messages.Message): progress: Required. The numerical progress of the application, from 1 to 100. state: Required. The application state. - trackingUrl: Optional. The HTTP URL of the ApplicationMaster, + trackingUrl: Optional. The HTTP URL of the ApplicationMain, HistoryServer, or TimelineServer that provides application-specific information. The URL uses the internal hostname, and requires a proxy server for resolution and, possibly, access. diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py index 69f21f7c..f9f48c95 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py @@ -1523,8 +1523,8 @@ class FormatValueValuesEnum(_messages.Enum): this reason, uncompressed VCF is currently recommended for imports with more than 1GB combined uncompressed size, or for time sensitive imports. - FORMAT_COMPLETE_GENOMICS: Complete Genomics masterVarBeta format. The - masterVarBeta files may be bzip2 compressed. + FORMAT_COMPLETE_GENOMICS: Complete Genomics mainVarBeta format. The + mainVarBeta files may be bzip2 compressed. """ FORMAT_UNSPECIFIED = 0 FORMAT_VCF = 1 diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/healthcare/v1alpha2/healthcare_v1alpha2_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/healthcare/v1alpha2/healthcare_v1alpha2_messages.py index ddae0200..4f000ce5 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/healthcare/v1alpha2/healthcare_v1alpha2_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/healthcare/v1alpha2/healthcare_v1alpha2_messages.py @@ -378,7 +378,7 @@ class ExportResourcesRequest(_messages.Message): changes to the output schema may be introduced in the future as a result of continuous collaboration with the FHIR community to refine the [desired SQL projection of FHIR resources](https://github.com/rbrush - /sql-on-fhir/blob/master/sql-on-fhir.md). + /sql-on-fhir/blob/main/sql-on-fhir.md). gcsDestination: The Cloud Storage output destination. The Cloud Storage location requires the `roles/storage.objectAdmin` Cloud IAM role. The exported outputs are organized by FHIR resource types. The server will diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py index e647e7c6..f15f6ee5 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py @@ -962,16 +962,16 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): TensorFlow program as the '--job-dir' command-line argument. The benefit of specifying this field is that Cloud ML validates the path for use in training. - masterConfig: Optional. The configuration for master. Only one of - `masterConfig.imageUri` and `runtimeVersion` should be set. - masterType: Optional. Specifies the type of virtual machine to use for - your training job's master worker. The following types are supported: + mainConfig: Optional. The configuration for main. Only one of + `mainConfig.imageUri` and `runtimeVersion` should be set. + mainType: Optional. Specifies the type of virtual machine to use for + your training job's main worker. The following types are supported:
standard
A basic machine configuration suitable for training simple models with small to moderate datasets.
large_model
A machine with a lot of memory, specially suited for parameter servers when your model is large (having many hidden layers or layers with very large numbers of nodes).
-
complex_model_s
A machine suitable for the master and +
complex_model_s
A machine suitable for the main and workers of the cluster when your model requires more computation than the standard machine can handle satisfactorily.
complex_model_m
A machine with roughly twice the @@ -1007,7 +1007,7 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): number of package URIs is 100. parameterServerConfig: Optional. The config of parameter servers. If `parameterServerConfig.imageUri` has not been set, the value of - `masterConfig.imageUri` will be used. + `mainConfig.imageUri` will be used. parameterServerCount: Optional. The number of parameter server replicas to use for the training job. Each replica in the cluster will be of the type specified in `parameter_server_type`. This value can only be used @@ -1015,7 +1015,7 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): also set `parameter_server_type`. The default value is zero. parameterServerType: Optional. Specifies the type of virtual machine to use for your training job's parameter server. The supported values are - the same as those described in the entry for `master_type`. This value + the same as those described in the entry for `main_type`. This value must be present when `scaleTier` is set to `CUSTOM` and `parameter_server_count` is greater than zero. pythonModule: Required. The Python module name to run after installing the @@ -1037,7 +1037,7 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): for workers and parameter servers. workerConfig: Optional. The configrations for workers. If `workerConfig.imageUri` has not been set, the value of - `masterConfig.imageUri` will be used. + `mainConfig.imageUri` will be used. workerCount: Optional. The number of worker replicas to use for the training job. Each replica in the cluster will be of the type specified in `worker_type`. This value can only be used when `scale_tier` is set @@ -1045,7 +1045,7 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): The default value is zero. workerType: Optional. Specifies the type of virtual machine to use for your training job's worker nodes. The supported values are the same as - those described in the entry for `masterType`. This value must be + those described in the entry for `mainType`. This value must be present when `scaleTier` is set to `CUSTOM` and `workerCount` is greater than zero. """ @@ -1067,8 +1067,8 @@ class ScaleTierValueValuesEnum(_messages.Enum): CUSTOM: The CUSTOM tier is not a set tier, but rather enables you to use your own cluster specification. When you use this tier, set values to configure your processing cluster according to these guidelines: * - You _must_ set `TrainingInput.masterType` to specify the type of - machine to use for your master node. This is the only required + You _must_ set `TrainingInput.mainType` to specify the type of + machine to use for your main node. This is the only required setting. * You _may_ set `TrainingInput.workerCount` to specify the number of workers to use. If you specify one or more workers, you _must_ also set `TrainingInput.workerType` to specify the type of @@ -1078,9 +1078,9 @@ class ScaleTierValueValuesEnum(_messages.Enum): servers, you _must_ also set `TrainingInput.parameterServerType` to specify the type of machine to use for your parameter servers. Note that all of your workers must use the same machine type, which - can be different from your parameter server type and master type. Your + can be different from your parameter server type and main type. Your parameter servers must likewise use the same machine type, which can - be different from your worker type and master type. + be different from your worker type and main type. """ BASIC = 0 STANDARD_1 = 1 @@ -1092,8 +1092,8 @@ class ScaleTierValueValuesEnum(_messages.Enum): args = _messages.StringField(1, repeated=True) hyperparameters = _messages.MessageField('GoogleCloudMlV1HyperparameterSpec', 2) jobDir = _messages.StringField(3) - masterConfig = _messages.MessageField('GoogleCloudMlV1ReplicaConfig', 4) - masterType = _messages.StringField(5) + mainConfig = _messages.MessageField('GoogleCloudMlV1ReplicaConfig', 4) + mainType = _messages.StringField(5) packageUris = _messages.StringField(6, repeated=True) parameterServerConfig = _messages.MessageField('GoogleCloudMlV1ReplicaConfig', 7) parameterServerCount = _messages.IntegerField(8) diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/run/v1alpha1/run_v1alpha1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/run/v1alpha1/run_v1alpha1_messages.py index e98f59b3..bcb759bb 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/run/v1alpha1/run_v1alpha1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/run/v1alpha1/run_v1alpha1_messages.py @@ -93,7 +93,7 @@ class LogTypeValueValuesEnum(_messages.Enum): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via [Webmaster + of a domain, verify ownership via [Webmain Central](https://www.google.com/webmasters/verification/home). Fields: @@ -169,7 +169,7 @@ class Configuration(_messages.Message): built. Users create new Revisions by updating the Configuration's spec. The "latest created" revision's name is available under status, as is the "latest ready" revision's name. See also: https://github.com/knative/serving - /blob/master/docs/spec/overview.md#configuration + /blob/main/docs/spec/overview.md#configuration Fields: apiVersion: The API version for this call such as "v1alpha1". diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/serverless/v1alpha1/serverless_v1alpha1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/serverless/v1alpha1/serverless_v1alpha1_messages.py index 3393c08d..c0bcd3e1 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/serverless/v1alpha1/serverless_v1alpha1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/serverless/v1alpha1/serverless_v1alpha1_messages.py @@ -93,7 +93,7 @@ class LogTypeValueValuesEnum(_messages.Enum): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via [Webmaster + of a domain, verify ownership via [Webmain Central](https://www.google.com/webmasters/verification/home). Fields: @@ -169,7 +169,7 @@ class Configuration(_messages.Message): built. Users create new Revisions by updating the Configuration's spec. The "latest created" revision's name is available under status, as is the "latest ready" revision's name. See also: https://github.com/knative/serving - /blob/master/docs/spec/overview.md#configuration + /blob/main/docs/spec/overview.md#configuration Fields: apiVersion: The API version for this call such as "v1alpha1". diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py index c7fab2a0..b6d809df 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py @@ -161,7 +161,7 @@ class DatabaseInstance(_messages.Message): ipAddresses: The assigned IP addresses for the instance. ipv6Address: The IPv6 address assigned to the instance. kind: This is always sql#instance. - masterInstanceName: The name of the instance which will act as master in + mainInstanceName: The name of the instance which will act as main in the replication setup. maxDiskSize: The maximum disk size of the instance in bytes. project: The project ID of the project containing the Cloud SQL instance. @@ -191,7 +191,7 @@ class DatabaseInstance(_messages.Message): ipAddresses = _messages.MessageField('IpMapping', 7, repeated=True) ipv6Address = _messages.StringField(8) kind = _messages.StringField(9, default=u'sql#instance') - masterInstanceName = _messages.StringField(10) + mainInstanceName = _messages.StringField(10) maxDiskSize = _messages.IntegerField(11) project = _messages.StringField(12) region = _messages.StringField(13) diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py index 9d14efaf..c1eb3f6d 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py @@ -232,14 +232,14 @@ class DatabaseInstance(_messages.Message): secondary zone. instanceType: The instance type. This can be one of the following. CLOUD_SQL_INSTANCE: A Cloud SQL instance that is not replicating from a - master. ON_PREMISES_INSTANCE: An instance running on the customer's + main. ON_PREMISES_INSTANCE: An instance running on the customer's premises. READ_REPLICA_INSTANCE: A Cloud SQL instance configured as a read-replica. ipAddresses: The assigned IP addresses for the instance. ipv6Address: The IPv6 address assigned to the instance. This property is applicable only to First Generation instances. kind: This is always sql#instance. - masterInstanceName: The name of the instance which will act as master in + mainInstanceName: The name of the instance which will act as main in the replication setup. maxDiskSize: The maximum disk size of the instance in bytes. name: Name of the Cloud SQL instance. This does not include the project @@ -278,7 +278,7 @@ class FailoverReplicaValue(_messages.Message): Fields: available: The availability status of the failover replica. A false - status indicates that the failover replica is out of sync. The master + status indicates that the failover replica is out of sync. The main can only failover to the falover replica when the status is true. name: The name of the failover replica. If specified at instance creation, a failover replica is created for the instance. The name @@ -300,7 +300,7 @@ class FailoverReplicaValue(_messages.Message): ipAddresses = _messages.MessageField('IpMapping', 9, repeated=True) ipv6Address = _messages.StringField(10) kind = _messages.StringField(11, default=u'sql#instance') - masterInstanceName = _messages.StringField(12) + mainInstanceName = _messages.StringField(12) maxDiskSize = _messages.IntegerField(13) name = _messages.StringField(14) onPremisesConfiguration = _messages.MessageField('OnPremisesConfiguration', 15) @@ -328,57 +328,57 @@ class DatabasesListResponse(_messages.Message): kind = _messages.StringField(2, default=u'sql#databasesList') -class DemoteMasterConfiguration(_messages.Message): - r"""Read-replica configuration for connecting to the on-premises master. +class DemoteMainConfiguration(_messages.Message): + r"""Read-replica configuration for connecting to the on-premises main. Fields: - kind: This is always sql#demoteMasterConfiguration. + kind: This is always sql#demoteMainConfiguration. mysqlReplicaConfiguration: MySQL specific configuration when replicating - from a MySQL on-premises master. Replication configuration information + from a MySQL on-premises main. Replication configuration information such as the username, password, certificates, and keys are not stored in the instance metadata. The configuration information is used only to set up the replication connection and is stored by MySQL in a file named - master.info in the data directory. + main.info in the data directory. """ - kind = _messages.StringField(1, default=u'sql#demoteMasterConfiguration') - mysqlReplicaConfiguration = _messages.MessageField('DemoteMasterMySqlReplicaConfiguration', 2) + kind = _messages.StringField(1, default=u'sql#demoteMainConfiguration') + mysqlReplicaConfiguration = _messages.MessageField('DemoteMainMySqlReplicaConfiguration', 2) -class DemoteMasterContext(_messages.Message): - r"""Database instance demote master context. +class DemoteMainContext(_messages.Message): + r"""Database instance demote main context. Fields: - kind: This is always sql#demoteMasterContext. - masterInstanceName: The name of the instance which will act as on-premises - master in the replication setup. + kind: This is always sql#demoteMainContext. + mainInstanceName: The name of the instance which will act as on-premises + main in the replication setup. replicaConfiguration: Configuration specific to read-replicas replicating - from the on-premises master. + from the on-premises main. verifyGtidConsistency: Verify GTID consistency for demote operation. Default value: True. Second Generation instances only. Setting this flag to false enables you to bypass GTID consistency check between on- - premises master and Cloud SQL instance during the demotion operation but + premises main and Cloud SQL instance during the demotion operation but also exposes you to the risk of future replication failures. Change the value only if you know the reason for the GTID divergence and are confident that doing so will not cause any replication issues. """ - kind = _messages.StringField(1, default=u'sql#demoteMasterContext') - masterInstanceName = _messages.StringField(2) - replicaConfiguration = _messages.MessageField('DemoteMasterConfiguration', 3) + kind = _messages.StringField(1, default=u'sql#demoteMainContext') + mainInstanceName = _messages.StringField(2) + replicaConfiguration = _messages.MessageField('DemoteMainConfiguration', 3) verifyGtidConsistency = _messages.BooleanField(4) -class DemoteMasterMySqlReplicaConfiguration(_messages.Message): +class DemoteMainMySqlReplicaConfiguration(_messages.Message): r"""Read-replica configuration specific to MySQL databases. Fields: caCertificate: PEM representation of the trusted CA's x509 certificate. - clientCertificate: PEM representation of the slave's x509 certificate. - clientKey: PEM representation of the slave's private key. The + clientCertificate: PEM representation of the subordinate's x509 certificate. + clientKey: PEM representation of the subordinate's private key. The corresponsing public key is encoded in the client's certificate. The - format of the slave's private key can be either PKCS #1 or PKCS #8. - kind: This is always sql#demoteMasterMysqlReplicaConfiguration. + format of the subordinate's private key can be either PKCS #1 or PKCS #8. + kind: This is always sql#demoteMainMysqlReplicaConfiguration. password: The password for the replication connection. username: The username for the replication connection. """ @@ -386,7 +386,7 @@ class DemoteMasterMySqlReplicaConfiguration(_messages.Message): caCertificate = _messages.StringField(1) clientCertificate = _messages.StringField(2) clientKey = _messages.StringField(3) - kind = _messages.StringField(4, default=u'sql#demoteMasterMysqlReplicaConfiguration') + kind = _messages.StringField(4, default=u'sql#demoteMainMysqlReplicaConfiguration') password = _messages.StringField(5) username = _messages.StringField(6) @@ -446,14 +446,14 @@ class MysqlExportOptionsValue(_messages.Message): r"""Options for exporting from MySQL. Fields: - masterData: Option to include SQL statement required to set up + mainData: Option to include SQL statement required to set up replication. If set to 1, the dump file includes a CHANGE MASTER TO statement with the binary log coordinates. If set to 2, the CHANGE MASTER TO statement is written as a SQL comment, and has no effect. All other values are ignored. """ - masterData = _messages.IntegerField(1, variant=_messages.Variant.INT32) + mainData = _messages.IntegerField(1, variant=_messages.Variant.INT32) mysqlExportOptions = _messages.MessageField('MysqlExportOptionsValue', 1) schemaOnly = _messages.BooleanField(2) @@ -579,14 +579,14 @@ class InstancesCloneRequest(_messages.Message): cloneContext = _messages.MessageField('CloneContext', 1) -class InstancesDemoteMasterRequest(_messages.Message): - r"""Database demote master request. +class InstancesDemoteMainRequest(_messages.Message): + r"""Database demote main request. Fields: - demoteMasterContext: Contains details about the demoteMaster operation. + demoteMainContext: Contains details about the demoteMain operation. """ - demoteMasterContext = _messages.MessageField('DemoteMasterContext', 1) + demoteMainContext = _messages.MessageField('DemoteMainContext', 1) class InstancesExportRequest(_messages.Message): @@ -765,24 +765,24 @@ class MySqlReplicaConfiguration(_messages.Message): Fields: caCertificate: PEM representation of the trusted CA's x509 certificate. - clientCertificate: PEM representation of the slave's x509 certificate. - clientKey: PEM representation of the slave's private key. The + clientCertificate: PEM representation of the subordinate's x509 certificate. + clientKey: PEM representation of the subordinate's private key. The corresponsing public key is encoded in the client's certificate. connectRetryInterval: Seconds to wait between connect retries. MySQL's default is 60 seconds. dumpFilePath: Path to a SQL dump file in Google Cloud Storage from which - the slave instance is to be created. The URI is in the form + the subordinate instance is to be created. The URI is in the form gs://bucketName/fileName. Compressed gzip files (.gz) are also supported. Dumps should have the binlog co-ordinates from which - replication should begin. This can be accomplished by setting --master- + replication should begin. This can be accomplished by setting --main- data to 1 when using mysqldump. kind: This is always sql#mysqlReplicaConfiguration. - masterHeartbeatPeriod: Interval in milliseconds between replication + mainHeartbeatPeriod: Interval in milliseconds between replication heartbeats. password: The password for the replication connection. sslCipher: A list of permissible ciphers to use for SSL encryption. username: The username for the replication connection. - verifyServerCertificate: Whether or not to check the master's Common Name + verifyServerCertificate: Whether or not to check the main's Common Name value in the certificate that it sends during the SSL handshake. """ @@ -792,7 +792,7 @@ class MySqlReplicaConfiguration(_messages.Message): connectRetryInterval = _messages.IntegerField(4, variant=_messages.Variant.INT32) dumpFilePath = _messages.StringField(5) kind = _messages.StringField(6, default=u'sql#mysqlReplicaConfiguration') - masterHeartbeatPeriod = _messages.IntegerField(7) + mainHeartbeatPeriod = _messages.IntegerField(7) password = _messages.StringField(8) sslCipher = _messages.StringField(9) username = _messages.StringField(10) @@ -905,22 +905,22 @@ class OperationsListResponse(_messages.Message): class ReplicaConfiguration(_messages.Message): - r"""Read-replica configuration for connecting to the master. + r"""Read-replica configuration for connecting to the main. Fields: failoverTarget: Specifies if the replica is the failover target. If the field is set to true the replica will be designated as a failover - replica. In case the master instance fails, the replica instance will be - promoted as the new master instance. Only one replica can be specified + replica. In case the main instance fails, the replica instance will be + promoted as the new main instance. Only one replica can be specified as failover target, and the replica has to be in different zone with the - master instance. + main instance. kind: This is always sql#replicaConfiguration. mysqlReplicaConfiguration: MySQL specific configuration when replicating - from a MySQL on-premises master. Replication configuration information + from a MySQL on-premises main. Replication configuration information such as the username, password, certificates, and keys are not stored in the instance metadata. The configuration information is used only to set up the replication connection and is stored by MySQL in a file named - master.info in the data directory. + main.info in the data directory. """ failoverTarget = _messages.BooleanField(1) @@ -1261,18 +1261,18 @@ class SqlInstancesDeleteRequest(_messages.Message): project = _messages.StringField(2, required=True) -class SqlInstancesDemoteMasterRequest(_messages.Message): - r"""A SqlInstancesDemoteMasterRequest object. +class SqlInstancesDemoteMainRequest(_messages.Message): + r"""A SqlInstancesDemoteMainRequest object. Fields: instance: Cloud SQL instance name. - instancesDemoteMasterRequest: A InstancesDemoteMasterRequest resource to + instancesDemoteMainRequest: A InstancesDemoteMainRequest resource to be passed as the request body. project: ID of the project that contains the instance. """ instance = _messages.StringField(1, required=True) - instancesDemoteMasterRequest = _messages.MessageField('InstancesDemoteMasterRequest', 2) + instancesDemoteMainRequest = _messages.MessageField('InstancesDemoteMainRequest', 2) project = _messages.StringField(3, required=True) diff --git a/google-cloud-sdk/lib/surface/auth/application_default/login.py b/google-cloud-sdk/lib/surface/auth/application_default/login.py index 6afe7057..e15224f2 100644 --- a/google-cloud-sdk/lib/surface/auth/application_default/login.py +++ b/google-cloud-sdk/lib/surface/auth/application_default/login.py @@ -54,7 +54,7 @@ class Login(base.Command): instructions at https://developers.google.com/identity/protocols/application-default-credentials#calling. - API enablement and quotas are managed by the master Application Default + API enablement and quotas are managed by the main Application Default Credentials project. In the case of errors related to the API not being enabled or quota limitations, use the `--client-id-file` flag. You can create the client-id-file at https://console.cloud.google.com/apis/credentials. diff --git a/google-cloud-sdk/lib/surface/billing/accounts/list.py b/google-cloud-sdk/lib/surface/billing/accounts/list.py index 912ab9f2..50f7acde 100644 --- a/google-cloud-sdk/lib/surface/billing/accounts/list.py +++ b/google-cloud-sdk/lib/surface/billing/accounts/list.py @@ -48,7 +48,7 @@ def Args(parser): name.basename():label=ACCOUNT_ID, displayName:label=NAME, open, - masterBillingAccount.basename():label=MASTER_ACCOUNT_ID + mainBillingAccount.basename():label=MASTER_ACCOUNT_ID ) """) parser.display_info.AddUriFunc(List.ToSelfLink) diff --git a/google-cloud-sdk/lib/surface/compute/images/import.py b/google-cloud-sdk/lib/surface/compute/images/import.py index 45d93f4b..bd090a10 100644 --- a/google-cloud-sdk/lib/surface/compute/images/import.py +++ b/google-cloud-sdk/lib/surface/compute/images/import.py @@ -91,7 +91,7 @@ _IMPORT_FROM_IMAGE_WORKFLOW = _WORKFLOW_DIR + 'import_from_image.wf.json' _IMPORT_AND_TRANSLATE_WORKFLOW = _WORKFLOW_DIR + 'import_and_translate.wf.json' _WORKFLOWS_URL = ('https://github.com/GoogleCloudPlatform/compute-image-tools/' - 'tree/master/daisy_workflows/image_import') + 'tree/main/daisy_workflows/image_import') _OUTPUT_FILTER = ['[Daisy', '[import-', 'starting build', ' import', 'ERROR'] diff --git a/google-cloud-sdk/lib/surface/container/binauthz/attestors/public_keys/__init__.py b/google-cloud-sdk/lib/surface/container/binauthz/attestors/public_keys/__init__.py index 4620e7dd..93a4ffa4 100644 --- a/google-cloud-sdk/lib/surface/container/binauthz/attestors/public_keys/__init__.py +++ b/google-cloud-sdk/lib/surface/container/binauthz/attestors/public_keys/__init__.py @@ -35,8 +35,8 @@ class PublicKeys(base.Group): ## PGP KEY STRUCTURE An important feature of PGP keys is that they are hierarchical: Every "PGP - key" is composed of a "master" key pair and zero or more "subkey" pairs - certified by the master. These key pairs are collectively known as the "PGP + key" is composed of a "main" key pair and zero or more "subkey" pairs + certified by the main. These key pairs are collectively known as the "PGP key." The "public" part of this PGP key contains the public keys of all the constituent keys as well as all associated metadata (e.g. an email address). And, as might be expected, the "private" part of the PGP key contains all @@ -45,11 +45,11 @@ class PublicKeys(base.Group): One property of subkeys is that they may be marked as "revoked" if they are compromised or otherwise need to be retired. This does not remove the subkey from the PGP key but simply adds metadata indicating this revocation. The - master key pair cannot be revoked by this same mechanism. + main key pair cannot be revoked by this same mechanism. ### COMMON KEY STRUCTURE - The most common key structure is to have the master key pair only used to + The most common key structure is to have the main key pair only used to certify subkey pairs while the subkeys are used to encrypt and sign as necessary. This allows the PGP key as a whole to act as a durable identity even if an encryption key is used improperly or a signing key is compromised. diff --git a/google-cloud-sdk/lib/surface/container/clusters/create.py b/google-cloud-sdk/lib/surface/container/clusters/create.py index 7bd748b3..e492808f 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/create.py +++ b/google-cloud-sdk/lib/surface/container/clusters/create.py @@ -251,7 +251,7 @@ def ParseCreateOptionsBase(args): enable_ip_alias=args.enable_ip_alias, enable_kubernetes_alpha=args.enable_kubernetes_alpha, enable_legacy_authorization=args.enable_legacy_authorization, - enable_master_authorized_networks=args.enable_master_authorized_networks, + enable_main_authorized_networks=args.enable_main_authorized_networks, enable_network_policy=args.enable_network_policy, enable_private_nodes=args.enable_private_nodes, enable_private_endpoint=args.enable_private_endpoint, @@ -263,8 +263,8 @@ def ParseCreateOptionsBase(args): labels=args.labels, local_ssd_count=args.local_ssd_count, maintenance_window=args.maintenance_window, - master_authorized_networks=args.master_authorized_networks, - master_ipv4_cidr=args.master_ipv4_cidr, + main_authorized_networks=args.main_authorized_networks, + main_ipv4_cidr=args.main_ipv4_cidr, max_nodes=args.max_nodes, max_nodes_per_pool=args.max_nodes_per_pool, min_cpu_platform=args.min_cpu_platform, @@ -306,7 +306,7 @@ def Args(parser): flags.AddLabelsFlag(parser) flags.AddLocalSSDFlag(parser) flags.AddMaintenanceWindowFlag(parser) - flags.AddMasterAuthorizedNetworksFlags(parser) + flags.AddMainAuthorizedNetworksFlags(parser) flags.AddMinCpuPlatformFlag(parser) flags.AddNetworkPolicyFlags(parser) flags.AddNodeTaintsFlag(parser) @@ -344,12 +344,12 @@ def Run(self, args): options = self.ParseCreateOptions(args) if options.private_cluster and not ( - options.enable_master_authorized_networks or - options.master_authorized_networks): + options.enable_main_authorized_networks or + options.main_authorized_networks): log.warning( - '`--private-cluster` makes the master inaccessible from ' + '`--private-cluster` makes the main inaccessible from ' 'cluster-external IP addresses, by design. To allow limited ' - 'access to the master, see the `--master-authorized-networks` flags ' + 'access to the main, see the `--main-authorized-networks` flags ' 'and our documentation on setting up private clusters: ' 'https://cloud.google.com' '/kubernetes-engine/docs/how-to/private-clusters') @@ -436,7 +436,7 @@ def Args(parser): flags.AddLabelsFlag(parser) flags.AddLocalSSDFlag(parser) flags.AddMaintenanceWindowFlag(parser) - flags.AddMasterAuthorizedNetworksFlags(parser) + flags.AddMainAuthorizedNetworksFlags(parser) flags.AddMinCpuPlatformFlag(parser) flags.AddWorkloadMetadataFromNodeFlag(parser) flags.AddNetworkPolicyFlags(parser) @@ -526,7 +526,7 @@ def Args(parser): flags.AddLabelsFlag(parser) flags.AddLocalSSDAndLocalSSDVolumeConfigsFlag(parser) flags.AddMaintenanceWindowFlag(parser) - flags.AddMasterAuthorizedNetworksFlags(parser) + flags.AddMainAuthorizedNetworksFlags(parser) flags.AddMinCpuPlatformFlag(parser) flags.AddWorkloadMetadataFromNodeFlag(parser) flags.AddNetworkPolicyFlags(parser) @@ -573,7 +573,7 @@ def ParseCreateOptions(self, args): ops.private_cluster = args.private_cluster ops.enable_private_nodes = args.enable_private_nodes ops.enable_private_endpoint = args.enable_private_endpoint - ops.master_ipv4_cidr = args.master_ipv4_cidr + ops.main_ipv4_cidr = args.main_ipv4_cidr ops.new_scopes_behavior = True ops.enable_tpu = args.enable_tpu ops.tpu_ipv4_cidr = args.tpu_ipv4_cidr diff --git a/google-cloud-sdk/lib/surface/container/clusters/delete.py b/google-cloud-sdk/lib/surface/container/clusters/delete.py index 4080670d..309ae7ac 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/delete.py +++ b/google-cloud-sdk/lib/surface/container/clusters/delete.py @@ -35,7 +35,7 @@ class Delete(base.DeleteCommand): When you delete a cluster, the following resources are deleted: - - The master resources + - The main resources - All of the node instances in the cluster - Any Pods that are running on those instances - Any firewalls and routes created by Kubernetes Engine at the time of cluster diff --git a/google-cloud-sdk/lib/surface/container/clusters/get_credentials.py b/google-cloud-sdk/lib/surface/container/clusters/get_credentials.py index 5a9ca536..0b630910 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/get_credentials.py +++ b/google-cloud-sdk/lib/surface/container/clusters/get_credentials.py @@ -100,7 +100,7 @@ def Run(self, args): log.status.Print('Fetching cluster endpoint and auth data.') # Call DescribeCluster to get auth info and cache for next time cluster = adapter.GetCluster(cluster_ref) - auth = cluster.masterAuth + auth = cluster.mainAuth # TODO(b/70856999) Make this consistent with the checks in # api_lib/container/kubeconfig.py. missing_creds = not (auth and auth.clientCertificate and auth.clientKey) diff --git a/google-cloud-sdk/lib/surface/container/clusters/update.py b/google-cloud-sdk/lib/surface/container/clusters/update.py index 67708909..1ae6fa24 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/update.py +++ b/google-cloud-sdk/lib/surface/container/clusters/update.py @@ -183,7 +183,7 @@ def Args(parser): _AddMutuallyExclusiveArgs(group, base.ReleaseTrack.GA) flags.AddNodeLocationsFlag(group_locations) flags.AddClusterAutoscalingFlags(parser, group) - flags.AddMasterAuthorizedNetworksFlags( + flags.AddMainAuthorizedNetworksFlags( parser, enable_group_for_update=group) flags.AddEnableLegacyAuthorizationFlag(group) flags.AddStartIpRotationFlag(group) @@ -246,32 +246,32 @@ def Run(self, args): if args.IsSpecified('username') or args.IsSpecified('enable_basic_auth'): flags.MungeBasicAuthFlags(args) - options = api_adapter.SetMasterAuthOptions( - action=api_adapter.SetMasterAuthOptions.SET_USERNAME, + options = api_adapter.SetMainAuthOptions( + action=api_adapter.SetMainAuthOptions.SET_USERNAME, username=args.username, password=args.password) try: - op_ref = adapter.SetMasterAuth(cluster_ref, options) + op_ref = adapter.SetMainAuth(cluster_ref, options) except apitools_exceptions.HttpError as error: raise exceptions.HttpException(error, util.HTTP_ERROR_FORMAT) elif (args.generate_password or args.set_password or args.IsSpecified('password')): if args.generate_password: password = '' - options = api_adapter.SetMasterAuthOptions( - action=api_adapter.SetMasterAuthOptions.GENERATE_PASSWORD, + options = api_adapter.SetMainAuthOptions( + action=api_adapter.SetMainAuthOptions.GENERATE_PASSWORD, password=password) else: password = args.password if not args.IsSpecified('password'): password = input('Please enter the new password:') - options = api_adapter.SetMasterAuthOptions( - action=api_adapter.SetMasterAuthOptions.SET_PASSWORD, + options = api_adapter.SetMainAuthOptions( + action=api_adapter.SetMainAuthOptions.SET_PASSWORD, password=password) try: - op_ref = adapter.SetMasterAuth(cluster_ref, options) + op_ref = adapter.SetMainAuth(cluster_ref, options) del password del options except apitools_exceptions.HttpError as error: @@ -295,7 +295,7 @@ def Run(self, args): elif args.start_ip_rotation or args.start_credential_rotation: if args.start_ip_rotation: msg_tmpl = """This will start an IP Rotation on cluster [{name}]. The \ -master will be updated to serve on a new IP address in addition to the current \ +main will be updated to serve on a new IP address in addition to the current \ IP address. Kubernetes Engine will then recreate all nodes ({num_nodes} nodes) \ to point to the new IP address. This operation is long-running and will block \ other operations on the cluster (including delete) until it has run to \ @@ -303,7 +303,7 @@ def Run(self, args): rotate_credentials = False elif args.start_credential_rotation: msg_tmpl = """This will start an IP and Credentials Rotation on cluster\ - [{name}]. The master will be updated to serve on a new IP address in addition \ + [{name}]. The main will be updated to serve on a new IP address in addition \ to the current IP address, and cluster credentials will be rotated. Kubernetes \ Engine will then recreate all nodes ({num_nodes} nodes) to point to the new IP \ address. This operation is long-running and will block other operations on the \ @@ -322,7 +322,7 @@ def Run(self, args): elif args.complete_ip_rotation or args.complete_credential_rotation: if args.complete_ip_rotation: msg_tmpl = """This will complete the in-progress IP Rotation on \ -cluster [{name}]. The master will be updated to stop serving on the old IP \ +cluster [{name}]. The main will be updated to stop serving on the old IP \ address and only serve on the new IP address. Make sure all API clients have \ been updated to communicate with the new IP address (e.g. by running `gcloud \ container clusters get-credentials --project {project} --zone {zone} {name}`). \ @@ -330,7 +330,7 @@ def Run(self, args): (including delete) until it has run to completion.""" elif args.complete_credential_rotation: msg_tmpl = """This will complete the in-progress Credential Rotation on\ - cluster [{name}]. The master will be updated to stop serving on the old IP \ + cluster [{name}]. The main will be updated to stop serving on the old IP \ address and only serve on the new IP address. Old cluster credentials will be \ invalidated. Make sure all API clients have been updated to communicate with \ the new IP address (e.g. by running `gcloud container clusters get-credentials \ @@ -413,7 +413,7 @@ def Args(parser): group_logging_monitoring, enable_kubernetes=True) flags.AddMonitoringServiceFlag( group_logging_monitoring, enable_kubernetes=True) - flags.AddMasterAuthorizedNetworksFlags( + flags.AddMainAuthorizedNetworksFlags( parser, enable_group_for_update=group) flags.AddEnableLegacyAuthorizationFlag(group) flags.AddStartIpRotationFlag(group) @@ -472,7 +472,7 @@ def Args(parser): group_logging_monitoring, enable_kubernetes=True) flags.AddMonitoringServiceFlag( group_logging_monitoring, enable_kubernetes=True) - flags.AddMasterAuthorizedNetworksFlags( + flags.AddMainAuthorizedNetworksFlags( parser, enable_group_for_update=group) flags.AddEnableLegacyAuthorizationFlag(group) flags.AddStartIpRotationFlag(group) diff --git a/google-cloud-sdk/lib/surface/container/clusters/upgrade.py b/google-cloud-sdk/lib/surface/container/clusters/upgrade.py index bbe1bb87..026d8eb9 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/upgrade.py +++ b/google-cloud-sdk/lib/surface/container/clusters/upgrade.py @@ -53,19 +53,19 @@ class UpgradeHelpText(object): class VersionVerifier(object): - """Compares the cluster and master versions for upgrade availablity.""" + """Compares the cluster and main versions for upgrade availablity.""" UP_TO_DATE = 0 UPGRADE_AVAILABLE = 1 SUPPORT_ENDING = 2 UNSUPPORTED = 3 - def Compare(self, current_master_version, current_cluster_version): - """Compares the cluster and master versions and returns an enum.""" - if current_master_version == current_cluster_version: + def Compare(self, current_main_version, current_cluster_version): + """Compares the cluster and main versions and returns an enum.""" + if current_main_version == current_cluster_version: return self.UP_TO_DATE - master_version = SemVer(current_master_version) + main_version = SemVer(current_main_version) cluster_version = SemVer(current_cluster_version) - major, minor, _ = master_version.Distance(cluster_version) + major, minor, _ = main_version.Distance(cluster_version) if major != 0 or minor > 2: return self.UNSUPPORTED elif minor > 1: @@ -78,8 +78,8 @@ def ParseUpgradeOptionsBase(args): """Parses the flags provided with the cluster upgrade command.""" return api_adapter.UpdateClusterOptions( version=args.cluster_version, - update_master=args.master, - update_nodes=(not args.master), + update_main=args.main, + update_nodes=(not args.main), node_pool=args.node_pool, image_type=args.image_type, image=args.image, @@ -102,7 +102,7 @@ def _Args(parser): The Kubernetes release version to which to upgrade the cluster's nodes. If desired cluster version is omitted, *node* upgrades default to the current -*master* version and *master* upgrades default to the default cluster version, +*main* version and *main* upgrades default to the default cluster version, which can be found in the server config. You can find the list of allowed versions for upgrades by running: @@ -111,10 +111,10 @@ def _Args(parser): """) parser.add_argument('--node-pool', help='The node pool to upgrade.') parser.add_argument( - '--master', - help='Upgrade the cluster\'s master to the latest version of Kubernetes' + '--main', + help='Upgrade the cluster\'s main to the latest version of Kubernetes' ' supported on Kubernetes Engine. Nodes cannot be upgraded at the same' - ' time as the master.', + ' time as the main.', action='store_true') # Timeout in seconds for the operation, default 2700 seconds (45 minutes) parser.add_argument( @@ -179,7 +179,7 @@ def Run(self, args): name=args.name, server_conf=server_conf, cluster=cluster, - master=args.master, + main=args.main, node_pool_name=args.node_pool, new_version=args.cluster_version, concurrent_node_count=concurrent_node_count) @@ -208,12 +208,12 @@ def Run(self, args): """\ Upgrades the Kubernetes version of an existing container cluster. - This command upgrades the Kubernetes version of the *nodes* or *master* of - a cluster. Note that the Kubernetes version of the cluster's *master* is + This command upgrades the Kubernetes version of the *nodes* or *main* of + a cluster. Note that the Kubernetes version of the cluster's *main* is also periodically upgraded automatically as new releases are available. If desired cluster version is omitted, *node* upgrades default to the - current *master* version and *master* upgrades default to the default + current *main* version and *main* upgrades default to the default cluster version, which can be found in the server config. *By running this command, all of the cluster's nodes will be deleted and* @@ -231,7 +231,7 @@ def Run(self, args): 'EXAMPLES': """\ Upgrade the nodes of to the Kubernetes version of the cluster's - master. + main. $ {command} @@ -239,9 +239,9 @@ def Run(self, args): $ {command} --cluster-version "x.y.z" - Upgrade the master of to the default cluster version: + Upgrade the main of to the default cluster version: - $ {command} --master" + $ {command} --main" """, } diff --git a/google-cloud-sdk/lib/surface/dataproc/clusters/create.py b/google-cloud-sdk/lib/surface/dataproc/clusters/create.py index 3f41cced..e41067d9 100644 --- a/google-cloud-sdk/lib/surface/dataproc/clusters/create.py +++ b/google-cloud-sdk/lib/surface/dataproc/clusters/create.py @@ -122,10 +122,10 @@ def Args(parser): @staticmethod def ValidateArgs(args): super(CreateBeta, CreateBeta).ValidateArgs(args) - if args.master_accelerator and 'type' not in args.master_accelerator: + if args.main_accelerator and 'type' not in args.main_accelerator: raise exceptions.InvalidArgumentException( - '--master-accelerator', 'accelerator type must be specified. ' - 'e.g. --master-accelerator type=nvidia-tesla-k80,count=2') + '--main-accelerator', 'accelerator type must be specified. ' + 'e.g. --main-accelerator type=nvidia-tesla-k80,count=2') if args.worker_accelerator and 'type' not in args.worker_accelerator: raise exceptions.InvalidArgumentException( '--worker-accelerator', 'accelerator type must be specified. ' diff --git a/google-cloud-sdk/lib/surface/dataproc/workflow_templates/__init__.py b/google-cloud-sdk/lib/surface/dataproc/workflow_templates/__init__.py index d5bbf89e..69e305ef 100644 --- a/google-cloud-sdk/lib/surface/dataproc/workflow_templates/__init__.py +++ b/google-cloud-sdk/lib/surface/dataproc/workflow_templates/__init__.py @@ -61,7 +61,7 @@ class WorkflowTemplates(base.Group): To update managed cluster in a workflow template, run: - $ {command} set-managed-cluster my_template --num-masters 5 + $ {command} set-managed-cluster my_template --num-mains 5 To update cluster selector in a workflow template, run: @@ -111,7 +111,7 @@ class WorkflowTemplatesBeta(base.Group): To update managed cluster in a workflow template, run: - $ {command} set-managed-cluster my_template --num-masters 5 + $ {command} set-managed-cluster my_template --num-mains 5 To update cluster selector in a workflow template, run: diff --git a/google-cloud-sdk/lib/surface/ml_engine/local/train.py b/google-cloud-sdk/lib/surface/ml_engine/local/train.py index 74e76ed7..3a8ad740 100644 --- a/google-cloud-sdk/lib/surface/ml_engine/local/train.py +++ b/google-cloud-sdk/lib/surface/ml_engine/local/train.py @@ -102,7 +102,7 @@ def Run(self, args): retval = local_train.MakeProcess(args.module_name, package_root, args=user_args, - task_type='master') + task_type='main') # Don't raise an exception because the users will already see the message. # We want this to mimic calling the script directly as much as possible. self.exit_code = retval diff --git a/google-cloud-sdk/lib/surface/source/repos/clone.py b/google-cloud-sdk/lib/surface/source/repos/clone.py index 0fb70781..4a533d0d 100644 --- a/google-cloud-sdk/lib/surface/source/repos/clone.py +++ b/google-cloud-sdk/lib/surface/source/repos/clone.py @@ -52,7 +52,7 @@ class CloneGA(base.Command): $ {command} REPOSITORY_NAME DIRECTORY_NAME $ cd DIRECTORY_NAME ... create/edit files and create one or more commits ... - $ git push origin master + $ git push origin main """, } @@ -136,7 +136,7 @@ class CloneAlpha(CloneGA): $ {command} REPOSITORY_NAME DIRECTORY_NAME $ cd DIRECTORY_NAME ... create/edit files and create one or more commits ... - $ git push origin master + $ git push origin main """ @staticmethod diff --git a/google-cloud-sdk/lib/surface/sql/instances/create.py b/google-cloud-sdk/lib/surface/sql/instances/create.py index 71f66da0..87683806 100644 --- a/google-cloud-sdk/lib/surface/sql/instances/create.py +++ b/google-cloud-sdk/lib/surface/sql/instances/create.py @@ -75,11 +75,11 @@ def AddBaseArgs(parser): flags.AddMaintenanceWindowDay(parser) flags.AddMaintenanceWindowHour(parser) parser.add_argument( - '--master-instance-name', + '--main-instance-name', required=False, - help=('Name of the instance which will act as master in the ' + help=('Name of the instance which will act as main in the ' 'replication setup. The newly created instance will be a read ' - 'replica of the specified master instance.')) + 'replica of the specified main instance.')) flags.AddMemory(parser) parser.add_argument( '--pricing-plan', @@ -126,7 +126,7 @@ def AddBaseArgs(parser): def AddBetaArgs(parser): """Declare beta flag and positional arguments for this command parser.""" - flags.AddExternalMasterGroup(parser) + flags.AddExternalMainGroup(parser) flags.AddInstanceResizeLimit(parser) flags.AddNetwork(parser) labels_util.AddCreateLabelsFlags(parser) @@ -157,36 +157,36 @@ def RunBaseCreateCommand(args, release_track): params={'project': properties.VALUES.core.project.GetOrFail}, collection='sql.instances') - # Get the region, tier, and database version from the master if these fields + # Get the region, tier, and database version from the main if these fields # are not specified. # TODO(b/64266672): Remove once API does not require these fields. - if args.IsSpecified('master_instance_name'): - master_instance_ref = client.resource_parser.Parse( - args.master_instance_name, + if args.IsSpecified('main_instance_name'): + main_instance_ref = client.resource_parser.Parse( + args.main_instance_name, params={'project': properties.VALUES.core.project.GetOrFail}, collection='sql.instances') try: - master_instance_resource = sql_client.instances.Get( + main_instance_resource = sql_client.instances.Get( sql_messages.SqlInstancesGetRequest( project=instance_ref.project, - instance=master_instance_ref.instance)) + instance=main_instance_ref.instance)) except apitools_exceptions.HttpError as error: # TODO(b/64292220): Remove once API gives helpful error message. - log.debug('operation : %s', str(master_instance_ref)) + log.debug('operation : %s', str(main_instance_ref)) exc = exceptions.HttpException(error) if resource_property.Get(exc.payload.content, resource_lex.ParseKey('error.errors[0].reason'), None) == 'notAuthorized': - msg = ('You are either not authorized to access the master instance or ' + msg = ('You are either not authorized to access the main instance or ' 'it does not exist.') raise exceptions.HttpException(msg) raise if not args.IsSpecified('region'): - args.region = master_instance_resource.region + args.region = main_instance_resource.region if not args.IsSpecified('database_version'): - args.database_version = master_instance_resource.databaseVersion - if not args.IsSpecified('tier') and master_instance_resource.settings: - args.tier = master_instance_resource.settings.tier + args.database_version = main_instance_resource.databaseVersion + if not args.IsSpecified('tier') and main_instance_resource.settings: + args.tier = main_instance_resource.settings.tier instance_resource = ( command_util.InstancesV1Beta4.ConstructCreateInstanceFromArgs( diff --git a/google-cloud-sdk/lib/surface/sql/instances/failover.py b/google-cloud-sdk/lib/surface/sql/instances/failover.py index 4e06b6a9..0e6f5322 100644 --- a/google-cloud-sdk/lib/surface/sql/instances/failover.py +++ b/google-cloud-sdk/lib/surface/sql/instances/failover.py @@ -68,7 +68,7 @@ def Run(self, args): console_io.PromptContinue( message='Failover will be initiated. Existing connections to the ' - 'master instance will break and no new connection can be established ' + 'main instance will break and no new connection can be established ' 'during the failover.', default=True, cancel_on_no=True) diff --git a/google-cloud-sdk/lib/third_party/apitools/base/py/batch.py b/google-cloud-sdk/lib/third_party/apitools/base/py/batch.py index ecb1ce01..e1739aaf 100644 --- a/google-cloud-sdk/lib/third_party/apitools/base/py/batch.py +++ b/google-cloud-sdk/lib/third_party/apitools/base/py/batch.py @@ -176,7 +176,7 @@ def Add(self, service, method, request, global_params=None): method_config, request, global_params=global_params, upload_config=upload_config) - # Create the request and add it to our master list. + # Create the request and add it to our main list. api_request = self.ApiCall( http_request, self.retryable_codes, service, method_config) self.api_requests.append(api_request) diff --git a/google-cloud-sdk/lib/third_party/dns/rdataset.py b/google-cloud-sdk/lib/third_party/dns/rdataset.py index db266f2f..403996c0 100644 --- a/google-cloud-sdk/lib/third_party/dns/rdataset.py +++ b/google-cloud-sdk/lib/third_party/dns/rdataset.py @@ -174,7 +174,7 @@ def __ne__(self, other): def to_text(self, name=None, origin=None, relativize=True, override_rdclass=None, **kw): - """Convert the rdataset into DNS master file format. + """Convert the rdataset into DNS main file format. @see: L{dns.name.Name.choose_relativity} for more information on how I{origin} and I{relativize} determine the way names diff --git a/google-cloud-sdk/lib/third_party/dns/rdtypes/ANY/SOA.py b/google-cloud-sdk/lib/third_party/dns/rdtypes/ANY/SOA.py index cc0098e8..b363af51 100644 --- a/google-cloud-sdk/lib/third_party/dns/rdtypes/ANY/SOA.py +++ b/google-cloud-sdk/lib/third_party/dns/rdtypes/ANY/SOA.py @@ -24,7 +24,7 @@ class SOA(dns.rdata.Rdata): """SOA record - @ivar mname: the SOA MNAME (master name) field + @ivar mname: the SOA MNAME (main name) field @type mname: dns.name.Name object @ivar rname: the SOA RNAME (responsible name) field @type rname: dns.name.Name object diff --git a/google-cloud-sdk/lib/third_party/dns/rrset.py b/google-cloud-sdk/lib/third_party/dns/rrset.py index d0f8f937..e2dbc5d1 100644 --- a/google-cloud-sdk/lib/third_party/dns/rrset.py +++ b/google-cloud-sdk/lib/third_party/dns/rrset.py @@ -88,7 +88,7 @@ def match(self, name, rdclass, rdtype, covers, deleting=None): return True def to_text(self, origin=None, relativize=True, **kw): - """Convert the RRset into DNS master file format. + """Convert the RRset into DNS main file format. @see: L{dns.name.Name.choose_relativity} for more information on how I{origin} and I{relativize} determine the way names diff --git a/google-cloud-sdk/lib/third_party/dns/tokenizer.py b/google-cloud-sdk/lib/third_party/dns/tokenizer.py index 04b98254..966111ea 100644 --- a/google-cloud-sdk/lib/third_party/dns/tokenizer.py +++ b/google-cloud-sdk/lib/third_party/dns/tokenizer.py @@ -13,7 +13,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -"""Tokenize DNS master file format""" +"""Tokenize DNS main file format""" from io import StringIO import sys @@ -50,7 +50,7 @@ class UngetBufferFull(dns.exception.DNSException): class Token(object): - """A DNS master file format token. + """A DNS main file format token. @ivar ttype: The token type @type ttype: int @@ -161,7 +161,7 @@ def __getitem__(self, i): class Tokenizer(object): - """A DNS master file format tokenizer. + """A DNS main file format tokenizer. A token is a (type, value) tuple, where I{type} is an int, and I{value} is a string. The valid types are EOF, EOL, WHITESPACE, diff --git a/google-cloud-sdk/lib/third_party/dns/zone.py b/google-cloud-sdk/lib/third_party/dns/zone.py index 468618f6..dee22797 100644 --- a/google-cloud-sdk/lib/third_party/dns/zone.py +++ b/google-cloud-sdk/lib/third_party/dns/zone.py @@ -583,9 +583,9 @@ def check_origin(self): raise NoNS -class _MasterReader(object): +class _MainReader(object): - """Read a DNS master file + """Read a DNS main file @ivar tok: The tokenizer @type tok: dns.tokenizer.Tokenizer object @@ -633,7 +633,7 @@ def _eat_line(self): break def _rr_line(self): - """Process one line from a DNS master file.""" + """Process one line from a DNS main file.""" # Name if self.current_origin is None: raise UnknownOrigin @@ -752,7 +752,7 @@ def _parse_modify(self, side): def _generate_line(self): # range lhs [ttl] [class] type rhs [ comment ] """Process one line containing the GENERATE statement from a DNS - master file.""" + main file.""" if self.current_origin is None: raise UnknownOrigin @@ -867,7 +867,7 @@ def _generate_line(self): rds.add(rd, ttl) def read(self): - """Read a DNS master file and build a zone object. + """Read a DNS main file and build a zone object. @raises dns.zone.NoSOA: No SOA RR was found at the zone origin @raises dns.zone.NoNS: No NS RRset was found at the zone origin @@ -932,7 +932,7 @@ def read(self): self._generate_line() else: raise dns.exception.SyntaxError( - "Unknown master file directive '" + c + "'") + "Unknown main file directive '" + c + "'") continue self.tok.unget(token) self._rr_line() @@ -951,12 +951,12 @@ def read(self): def from_text(text, origin=None, rdclass=dns.rdataclass.IN, relativize=True, zone_factory=Zone, filename=None, allow_include=False, check_origin=True): - """Build a zone object from a master file format string. + """Build a zone object from a main file format string. - @param text: the master file format input + @param text: the main file format input @type text: string. @param origin: The origin of the zone; if not specified, the first - $ORIGIN statement in the master file will determine the origin of the + $ORIGIN statement in the main file will determine the origin of the zone. @type origin: dns.name.Name object or string @param rdclass: The zone's rdata class; the default is class IN. @@ -985,7 +985,7 @@ def from_text(text, origin=None, rdclass=dns.rdataclass.IN, if filename is None: filename = '' tok = dns.tokenizer.Tokenizer(text, filename) - reader = _MasterReader(tok, origin, rdclass, relativize, zone_factory, + reader = _MainReader(tok, origin, rdclass, relativize, zone_factory, allow_include=allow_include, check_origin=check_origin) reader.read() @@ -995,12 +995,12 @@ def from_text(text, origin=None, rdclass=dns.rdataclass.IN, def from_file(f, origin=None, rdclass=dns.rdataclass.IN, relativize=True, zone_factory=Zone, filename=None, allow_include=True, check_origin=True): - """Read a master file and build a zone object. + """Read a main file and build a zone object. @param f: file or string. If I{f} is a string, it is treated as the name of a file to open. @param origin: The origin of the zone; if not specified, the first - $ORIGIN statement in the master file will determine the origin of the + $ORIGIN statement in the main file will determine the origin of the zone. @type origin: dns.name.Name object or string @param rdclass: The zone's rdata class; the default is class IN. diff --git a/google-cloud-sdk/lib/third_party/dulwich/repo.py b/google-cloud-sdk/lib/third_party/dulwich/repo.py index d4f252bd..03b0609e 100644 --- a/google-cloud-sdk/lib/third_party/dulwich/repo.py +++ b/google-cloud-sdk/lib/third_party/dulwich/repo.py @@ -790,8 +790,8 @@ def clone(self, target_path, mkdir=True, bare=False, b'refs/tags', self.refs.as_dict(b'refs/tags')) try: target.refs.add_if_new( - b'refs/heads/master', - self.refs[b'refs/heads/master']) + b'refs/heads/main', + self.refs[b'refs/heads/main']) except KeyError: pass @@ -876,7 +876,7 @@ def _init_maybe_bare(cls, path, bare): os.mkdir(os.path.join(path, *d)) DiskObjectStore.init(os.path.join(path, OBJECTDIR)) ret = cls(path) - ret.refs.set_symbolic_ref(b'HEAD', b"refs/heads/master") + ret.refs.set_symbolic_ref(b'HEAD', b"refs/heads/main") ret._init_files(bare) return ret diff --git a/google-cloud-sdk/lib/third_party/ml_sdk/cloud/ml/io/coders.py b/google-cloud-sdk/lib/third_party/ml_sdk/cloud/ml/io/coders.py index aa284b2f..8a2d3eeb 100644 --- a/google-cloud-sdk/lib/third_party/ml_sdk/cloud/ml/io/coders.py +++ b/google-cloud-sdk/lib/third_party/ml_sdk/cloud/ml/io/coders.py @@ -380,7 +380,7 @@ def __init__(self, scale_tier=None, hyperparameters=None, region=None, - master_type=None, + main_type=None, worker_type=None, ps_type=None, worker_count=None, @@ -405,7 +405,7 @@ def __init__(self, scale_tier: Google Cloud ML tier to run in. hyperparameters: (Optional) Hyperparameter config to use for the job. region: (Optional) Google Cloud region in which to run. - master_type: Master type to use with a CUSTOM scale tier. + main_type: Main type to use with a CUSTOM scale tier. worker_type: Worker type to use with a CUSTOM scale tier. ps_type: Parameter Server type to use with a CUSTOM scale tier. worker_count: Worker count to use with a CUSTOM scale tier. @@ -422,7 +422,7 @@ def __init__(self, self.scale_tier = scale_tier self.hyperparameters = hyperparameters self.region = region - self.master_type = master_type + self.main_type = main_type self.worker_type = worker_type self.ps_type = ps_type self.worker_count = worker_count @@ -446,7 +446,7 @@ def copy(self): def __eq__(self, o): for f in ['parent', 'job_name', 'job_args', 'package_uris', 'python_module', 'timeout', 'polling_interval', 'endpoint', 'hyperparameters', - 'scale_tier', 'worker_type', 'ps_type', 'master_type', 'region', + 'scale_tier', 'worker_type', 'ps_type', 'main_type', 'region', 'ps_count', 'worker_count', 'runtime_version']: if getattr(self, f) != getattr(o, f): return False diff --git a/google-cloud-sdk/lib/third_party/pkg_resources/__init__.py b/google-cloud-sdk/lib/third_party/pkg_resources/__init__.py index e33de0e7..a389aa29 100644 --- a/google-cloud-sdk/lib/third_party/pkg_resources/__init__.py +++ b/google-cloud-sdk/lib/third_party/pkg_resources/__init__.py @@ -638,9 +638,9 @@ def __init__(self, entries=None): self.add_entry(entry) @classmethod - def _build_master(cls): + def _build_main(cls): """ - Prepare the master working set. + Prepare the main working set. """ ws = cls() try: @@ -3028,9 +3028,9 @@ def _initialize(g=globals()): @_call_aside -def _initialize_master_working_set(): +def _initialize_main_working_set(): """ - Prepare the master working set and make the ``require()`` + Prepare the main working set and make the ``require()`` API available. This function has explicit effects on the global state @@ -3040,7 +3040,7 @@ def _initialize_master_working_set(): Invocation by other packages is unsupported and done at their own risk. """ - working_set = WorkingSet._build_master() + working_set = WorkingSet._build_main() _declare_state('object', working_set=working_set) require = working_set.require diff --git a/google-cloud-sdk/lib/third_party/pygments/formatters/_mapping.py b/google-cloud-sdk/lib/third_party/pygments/formatters/_mapping.py index 7bb3e71c..08f703d6 100644 --- a/google-cloud-sdk/lib/third_party/pygments/formatters/_mapping.py +++ b/google-cloud-sdk/lib/third_party/pygments/formatters/_mapping.py @@ -68,7 +68,7 @@ content = fp.read() # replace crnl to nl for Windows. # - # Note that, originally, contributers should keep nl of master + # Note that, originally, contributers should keep nl of main # repository, for example by using some kind of automatic # management EOL, like `EolExtension # `. diff --git a/google-cloud-sdk/lib/third_party/pygments/lexers/_lasso_builtins.py b/google-cloud-sdk/lib/third_party/pygments/lexers/_lasso_builtins.py index d950cbe8..5bf0df72 100644 --- a/google-cloud-sdk/lib/third_party/pygments/lexers/_lasso_builtins.py +++ b/google-cloud-sdk/lib/third_party/pygments/lexers/_lasso_builtins.py @@ -1325,7 +1325,7 @@ 'mongo_query_none', 'mongo_query_oplog_replay', 'mongo_query_partial', - 'mongo_query_slave_ok', + 'mongo_query_subordinate_ok', 'mongo_query_tailable_cursor', 'mongo_remove_none', 'mongo_remove_single_remove', @@ -1534,7 +1534,7 @@ 'sys_listunboundmethods', 'sys_loadlibrary', 'sys_lrand48', - 'sys_masterhomepath', + 'sys_mainhomepath', 'sys_mrand48', 'sys_nrand48', 'sys_pid_exec', diff --git a/google-cloud-sdk/lib/third_party/pygments/lexers/_mapping.py b/google-cloud-sdk/lib/third_party/pygments/lexers/_mapping.py index ea54241c..de7de2c7 100644 --- a/google-cloud-sdk/lib/third_party/pygments/lexers/_mapping.py +++ b/google-cloud-sdk/lib/third_party/pygments/lexers/_mapping.py @@ -483,7 +483,7 @@ content = fp.read() # replace crnl to nl for Windows. # - # Note that, originally, contributers should keep nl of master + # Note that, originally, contributers should keep nl of main # repository, for example by using some kind of automatic # management EOL, like `EolExtension # `. diff --git a/google-cloud-sdk/lib/third_party/pygments/lexers/_php_builtins.py b/google-cloud-sdk/lib/third_party/pygments/lexers/_php_builtins.py index fec3286a..dd484e44 100644 --- a/google-cloud-sdk/lib/third_party/pygments/lexers/_php_builtins.py +++ b/google-cloud-sdk/lib/third_party/pygments/lexers/_php_builtins.py @@ -59,20 +59,20 @@ 'mysqli_client_encoding', 'mysqli_connect', 'mysqli_disable_rpl_parse', - 'mysqli_enable_reads_from_master', + 'mysqli_enable_reads_from_main', 'mysqli_enable_rpl_parse', 'mysqli_escape_string', 'mysqli_execute', 'mysqli_fetch', 'mysqli_get_cache_stats', 'mysqli_get_metadata', - 'mysqli_master_query', + 'mysqli_main_query', 'mysqli_param_count', 'mysqli_report', 'mysqli_rpl_parse_enabled', 'mysqli_rpl_probe', 'mysqli_send_long_data', - 'mysqli_slave_query'), + 'mysqli_subordinate_query'), 'Apache': ('apache_child_terminate', 'apache_get_modules', 'apache_get_version', @@ -1950,11 +1950,11 @@ 'maxdb_connect', 'maxdb_data_seek', 'maxdb_debug', - 'maxdb_disable_reads_from_master', + 'maxdb_disable_reads_from_main', 'maxdb_disable_rpl_parse', 'maxdb_dump_debug_info', 'maxdb_embedded_connect', - 'maxdb_enable_reads_from_master', + 'maxdb_enable_reads_from_main', 'maxdb_enable_rpl_parse', 'maxdb_errno', 'maxdb_error', @@ -1984,7 +1984,7 @@ 'maxdb_init', 'maxdb_insert_id', 'maxdb_kill', - 'maxdb_master_query', + 'maxdb_main_query', 'maxdb_more_results', 'maxdb_multi_query', 'maxdb_next_result', @@ -4371,7 +4371,7 @@ 'yp_errno', 'yp_first', 'yp_get_default_domain', - 'yp_master', + 'yp_main', 'yp_match', 'yp_next', 'yp_order'), diff --git a/google-cloud-sdk/lib/third_party/pygments/lexers/esoteric.py b/google-cloud-sdk/lib/third_party/pygments/lexers/esoteric.py index 793c28be..97dec67e 100644 --- a/google-cloud-sdk/lib/third_party/pygments/lexers/esoteric.py +++ b/google-cloud-sdk/lib/third_party/pygments/lexers/esoteric.py @@ -186,7 +186,7 @@ class CapDLLexer(RegexLexer): (words(('asid', 'addr', 'badge', 'cached', 'dom', 'domainID', 'elf', 'fault_ep', 'G', 'guard', 'guard_size', 'init', 'ip', 'prio', 'sp', 'R', 'RG', 'RX', 'RW', 'RWG', 'RWX', 'W', - 'WG', 'WX', 'level', 'masked', 'master_reply', 'paddr', + 'WG', 'WX', 'level', 'masked', 'main_reply', 'paddr', 'ports', 'reply', 'uncached'), suffix=r'\b'), Keyword.Reserved), diff --git a/google-cloud-sdk/lib/third_party/setuptools/command/easy_install.py b/google-cloud-sdk/lib/third_party/setuptools/command/easy_install.py index d3eabfc3..4d562940 100644 --- a/google-cloud-sdk/lib/third_party/setuptools/command/easy_install.py +++ b/google-cloud-sdk/lib/third_party/setuptools/command/easy_install.py @@ -1733,7 +1733,7 @@ def update_dist_caches(dist_path, fix_zipimporter_caches): # There are several other known sources of stale zipimport.zipimporter # instances that we do not clear here, but might if ever given a reason to # do so: - # * Global setuptools pkg_resources.working_set (a.k.a. 'master working + # * Global setuptools pkg_resources.working_set (a.k.a. 'main working # set') may contain distributions which may in turn contain their # zipimport.zipimporter loaders. # * Several zipimport.zipimporter loaders held by local variables further diff --git a/google-cloud-sdk/platform/gsutil/gslib/addlhelp/naming.py b/google-cloud-sdk/platform/gsutil/gslib/addlhelp/naming.py index 8f278cd8..9b109219 100644 --- a/google-cloud-sdk/platform/gsutil/gslib/addlhelp/naming.py +++ b/google-cloud-sdk/platform/gsutil/gslib/addlhelp/naming.py @@ -94,8 +94,8 @@ user who creates the bucket, so the user who creates the bucket must also be verified as an owner or manager of the domain. - To verify as the owner or manager of a domain, use the Google Webmaster - Tools verification process. The Webmaster Tools verification process + To verify as the owner or manager of a domain, use the Google Webmain + Tools verification process. The Webmain Tools verification process provides three methods for verifying an owner or manager of a domain: 1. Adding a special Meta tag to a site's homepage. diff --git a/google-cloud-sdk/platform/gsutil/gslib/commands/notification.py b/google-cloud-sdk/platform/gsutil/gslib/commands/notification.py index 06218fb7..fa51bef5 100644 --- a/google-cloud-sdk/platform/gsutil/gslib/commands/notification.py +++ b/google-cloud-sdk/platform/gsutil/gslib/commands/notification.py @@ -341,7 +341,7 @@ Service Account authentication and that the Service Account's project is authorized for the application URL. Notification endpoint URLs must also be whitelisted in your Cloud Console project. To do that, the domain must also be -verified using Google Webmaster Tools. For instructions, please see +verified using Google Webmain Tools. For instructions, please see `Notification Authorization `_. """ diff --git a/google-cloud-sdk/platform/gsutil/gslib/ui_controller.py b/google-cloud-sdk/platform/gsutil/gslib/ui_controller.py index f09987b9..5f14a276 100644 --- a/google-cloud-sdk/platform/gsutil/gslib/ui_controller.py +++ b/google-cloud-sdk/platform/gsutil/gslib/ui_controller.py @@ -1048,7 +1048,7 @@ def Call(self, status_message, stream, cur_time=None): class MainThreadUIQueue(object): - """Handles status display and processing in the main thread / master process. + """Handles status display and processing in the main thread / main process. This class emulates a queue to cover main-thread activity before or after Apply, as well as for the single-threaded, single-process case, i.e., diff --git a/google-cloud-sdk/platform/gsutil/third_party/apitools/apitools/base/py/batch.py b/google-cloud-sdk/platform/gsutil/third_party/apitools/apitools/base/py/batch.py index ecb1ce01..e1739aaf 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/apitools/apitools/base/py/batch.py +++ b/google-cloud-sdk/platform/gsutil/third_party/apitools/apitools/base/py/batch.py @@ -176,7 +176,7 @@ def Add(self, service, method, request, global_params=None): method_config, request, global_params=global_params, upload_config=upload_config) - # Create the request and add it to our master list. + # Create the request and add it to our main list. api_request = self.ApiCall( http_request, self.retryable_codes, service, method_config) self.api_requests.append(api_request) diff --git a/google-cloud-sdk/platform/gsutil/third_party/argcomplete/docs/conf.py b/google-cloud-sdk/platform/gsutil/third_party/argcomplete/docs/conf.py index ea2ca4a3..67d2bf72 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/argcomplete/docs/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/argcomplete/docs/conf.py @@ -36,8 +36,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'argcomplete' diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py index 0f4dc9c7..3a5ce45e 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py @@ -118,10 +118,10 @@ def create_job(self, pipeline_id=None, input_name=None, output=None, :type playlists: list :param playlists: If you specify a preset in `PresetId` for which the value of `Container` is ts (MPEG-TS), Playlists contains - information about the master playlists that you want Elastic + information about the main playlists that you want Elastic Transcoder to create. - We recommend that you create only one master playlist. The maximum - number of master playlists in a job is 30. + We recommend that you create only one main playlist. The maximum + number of main playlists in a job is 30. """ uri = '/2012-09-25/jobs' diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/connection.py index 7afc4e07..870a9bdc 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/connection.py @@ -408,8 +408,8 @@ def modify_instance_groups(self, instance_group_ids, new_sizes): def run_jobflow(self, name, log_uri=None, ec2_keyname=None, availability_zone=None, - master_instance_type='m1.small', - slave_instance_type='m1.small', num_instances=1, + main_instance_type='m1.small', + subordinate_instance_type='m1.small', num_instances=1, action_on_failure='TERMINATE_JOB_FLOW', keep_alive=False, enable_debugging=False, hadoop_version=None, @@ -436,11 +436,11 @@ def run_jobflow(self, name, log_uri=None, ec2_keyname=None, :type availability_zone: str :param availability_zone: EC2 availability zone of the cluster - :type master_instance_type: str - :param master_instance_type: EC2 instance type of the master + :type main_instance_type: str + :param main_instance_type: EC2 instance type of the main - :type slave_instance_type: str - :param slave_instance_type: EC2 instance type of the slave nodes + :type subordinate_instance_type: str + :param subordinate_instance_type: EC2 instance type of the subordinate nodes :type num_instances: int :param num_instances: Number of instances in the Hadoop cluster @@ -471,7 +471,7 @@ def run_jobflow(self, name, log_uri=None, ec2_keyname=None, :param instance_groups: Optional list of instance groups to use when creating this job. NB: When provided, this argument supersedes num_instances - and master/slave_instance_type. + and main/subordinate_instance_type. :type ami_version: str :param ami_version: Amazon Machine Image (AMI) version to use @@ -526,15 +526,15 @@ def run_jobflow(self, name, log_uri=None, ec2_keyname=None, params.update(common_params) # NB: according to the AWS API's error message, we must - # "configure instances either using instance count, master and - # slave instance type or instance groups but not both." + # "configure instances either using instance count, main and + # subordinate instance type or instance groups but not both." # # Thus we switch here on the truthiness of instance_groups. if not instance_groups: # Instance args (the common case) instance_params = self._build_instance_count_and_type_args( - master_instance_type, - slave_instance_type, + main_instance_type, + subordinate_instance_type, num_instances) params.update(instance_params) else: @@ -721,15 +721,15 @@ def _build_instance_common_args(self, ec2_keyname, availability_zone, return params - def _build_instance_count_and_type_args(self, master_instance_type, - slave_instance_type, num_instances): + def _build_instance_count_and_type_args(self, main_instance_type, + subordinate_instance_type, num_instances): """ - Takes a master instance type (string), a slave instance type + Takes a main instance type (string), a subordinate instance type (string), and a number of instances. Returns a comparable dict for use in making a RunJobFlow request. """ - params = {'Instances.MasterInstanceType': master_instance_type, - 'Instances.SlaveInstanceType': slave_instance_type, + params = {'Instances.MainInstanceType': main_instance_type, + 'Instances.SubordinateInstanceType': subordinate_instance_type, 'Instances.InstanceCount': num_instances} return params diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/step.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/step.py index de6835fb..35cb8bbf 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/step.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/step.py @@ -132,7 +132,7 @@ def __init__(self, name, mapper, reducer=None, combiner=None, :param output: The output uri :type jar: str :param jar: The hadoop streaming jar. This can be either a local - path on the master node, or an s3:// URI. + path on the main node, or an s3:// URI. """ self.name = name self.mapper = mapper diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/kms/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/kms/layer1.py index 88ea2e0f..3fbc059d 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/kms/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/kms/layer1.py @@ -130,7 +130,7 @@ def _required_auth_capability(self): def create_alias(self, alias_name, target_key_id): """ - Creates a display name for a customer master key. An alias can + Creates a display name for a customer main key. An alias can be used to identify a key and should be unique. The console enforces a one-to-one mapping between the alias and a key. An alias name can contain only alphanumeric characters, forward @@ -174,7 +174,7 @@ def create_grant(self, key_id, grantee_principal, #. RevokeGrant :type key_id: string - :param key_id: A unique key identifier for a customer master key. This + :param key_id: A unique key identifier for a customer main key. This value can be a globally unique identifier, an ARN, or an alias. :type grantee_principal: string @@ -222,7 +222,7 @@ def create_grant(self, key_id, grantee_principal, def create_key(self, policy=None, description=None, key_usage=None): """ - Creates a customer master key. Customer master keys can be + Creates a customer main key. Customer main keys can be used to encrypt small amounts of data (less than 4K) directly, but they are most commonly used to encrypt or envelope data keys that are then used to encrypt customer data. For more @@ -306,10 +306,10 @@ def delete_alias(self, alias_name): def describe_key(self, key_id): """ Provides detailed information about the specified customer - master key. + main key. :type key_id: string - :param key_id: Unique identifier of the customer master key to be + :param key_id: Unique identifier of the customer main key to be described. This can be an ARN, an alias, or a globally unique identifier. @@ -323,7 +323,7 @@ def disable_key(self, key_id): Marks a key as disabled, thereby preventing its use. :type key_id: string - :param key_id: Unique identifier of the customer master key to be + :param key_id: Unique identifier of the customer main key to be disabled. This can be an ARN, an alias, or a globally unique identifier. @@ -337,7 +337,7 @@ def disable_key_rotation(self, key_id): Disables rotation of the specified key. :type key_id: string - :param key_id: Unique identifier of the customer master key for which + :param key_id: Unique identifier of the customer main key for which rotation is to be disabled. This can be an ARN, an alias, or a globally unique identifier. @@ -352,7 +352,7 @@ def enable_key(self, key_id): have up to 25 enabled keys at one time. :type key_id: string - :param key_id: Unique identifier of the customer master key to be + :param key_id: Unique identifier of the customer main key to be enabled. This can be an ARN, an alias, or a globally unique identifier. @@ -363,10 +363,10 @@ def enable_key(self, key_id): def enable_key_rotation(self, key_id): """ - Enables rotation of the specified customer master key. + Enables rotation of the specified customer main key. :type key_id: string - :param key_id: Unique identifier of the customer master key for which + :param key_id: Unique identifier of the customer main key for which rotation is to be enabled. This can be an ARN, an alias, or a globally unique identifier. @@ -378,11 +378,11 @@ def enable_key_rotation(self, key_id): def encrypt(self, key_id, plaintext, encryption_context=None, grant_tokens=None): """ - Encrypts plaintext into ciphertext by using a customer master + Encrypts plaintext into ciphertext by using a customer main key. :type key_id: string - :param key_id: Unique identifier of the customer master. This can be an + :param key_id: Unique identifier of the customer main. This can be an ARN, an alias, or the Key ID. :type plaintext: blob @@ -420,7 +420,7 @@ def generate_data_key(self, key_id, encryption_context=None, grant_tokens=None): """ Generates a secure data key. Data keys are used to encrypt and - decrypt data. They are wrapped by customer master keys. + decrypt data. They are wrapped by customer main keys. :type key_id: string :param key_id: Unique identifier of the key. This can be an ARN, an @@ -472,7 +472,7 @@ def generate_data_key_without_plaintext(self, key_id, number_of_bytes=None, grant_tokens=None): """ - Returns a key wrapped by a customer master key without the + Returns a key wrapped by a customer main key without the plaintext copy of that key. To retrieve the plaintext, see GenerateDataKey. @@ -651,7 +651,7 @@ def list_key_policies(self, key_id, limit=None, marker=None): def list_keys(self, limit=None, marker=None): """ - Lists the customer master keys. + Lists the customer main keys. :type limit: integer :param limit: Specify this parameter only when paginating results to @@ -702,7 +702,7 @@ def re_encrypt(self, ciphertext_blob, destination_key_id, source_encryption_context=None, destination_encryption_context=None, grant_tokens=None): """ - Encrypts data on the server side with a new customer master + Encrypts data on the server side with a new customer main key without exposing the plaintext of the data on the client side. The data is first decrypted and then encrypted. This operation can also be used to change the encryption context of diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/opsworks/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/opsworks/layer1.py index 8894d1c3..e007856c 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/opsworks/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/opsworks/layer1.py @@ -2124,7 +2124,7 @@ def register_rds_db_instance(self, stack_id, rds_db_instance_arn, :param rds_db_instance_arn: The Amazon RDS instance's ARN. :type db_user: string - :param db_user: The database's master user name. + :param db_user: The database's main user name. :type db_password: string :param db_password: The database password. @@ -2785,7 +2785,7 @@ def update_rds_db_instance(self, rds_db_instance_arn, db_user=None, :param rds_db_instance_arn: The Amazon RDS instance's ARN. :type db_user: string - :param db_user: The master user name. + :param db_user: The main user name. :type db_password: string :param db_password: The database password. diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py index 82c2822e..21fafd24 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py @@ -88,7 +88,7 @@ def load_boto(self): if update.find(':') >= 0: method, version = update.split(':') else: - version = 'master' + version = 'main' self.run('git checkout %s' % version, cwd=location) else: # first remove the symlink needed when running from subversion diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/__init__.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/__init__.py index 9e9132c9..14ed7fa8 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/__init__.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/__init__.py @@ -138,8 +138,8 @@ def create_dbinstance(self, id, allocated_storage, instance_class, - master_username, - master_password, + main_username, + main_password, port=3306, engine='MySQL5.1', db_name=None, @@ -168,8 +168,8 @@ def create_dbinstance(self, # security_groups should be db_security_groups according to API docs but has been left # security_groups for backwards compatibility # - # master_password should be master_user_password according to API docs but has been left - # master_password for backwards compatibility + # main_password should be main_user_password according to API docs but has been left + # main_password for backwards compatibility # # instance_class should be db_instance_class according to API docs but has been left # instance_class for backwards compatibility @@ -222,8 +222,8 @@ def create_dbinstance(self, * sqlserver-web * postgres - :type master_username: str - :param master_username: Name of master user for the DBInstance. + :type main_username: str + :param main_username: Name of main user for the DBInstance. * MySQL must be; - 1--16 alphanumeric characters @@ -240,8 +240,8 @@ def create_dbinstance(self, - first character must be a letter - cannot be a reserver SQL Server word - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. * MySQL must be 8--41 alphanumeric characters @@ -398,8 +398,8 @@ def create_dbinstance(self, # engine => Engine # engine_version => EngineVersion # license_model => LicenseModel - # master_username => MasterUsername - # master_user_password => MasterUserPassword + # main_username => MainUsername + # main_user_password => MainUserPassword # multi_az => MultiAZ # option_group_name => OptionGroupName # port => Port @@ -423,8 +423,8 @@ def create_dbinstance(self, 'EngineVersion': engine_version, 'Iops': iops, 'LicenseModel': license_model, - 'MasterUsername': master_username, - 'MasterUserPassword': master_password, + 'MainUsername': main_username, + 'MainUserPassword': main_password, 'MultiAZ': str(multi_az).lower() if multi_az else None, 'OptionGroupName': option_group_name, 'Port': port, @@ -562,7 +562,7 @@ def promote_read_replica(self, id, def modify_dbinstance(self, id, param_group=None, security_groups=None, preferred_maintenance_window=None, - master_password=None, allocated_storage=None, + main_password=None, allocated_storage=None, instance_class=None, backup_retention_period=None, preferred_backup_window=None, @@ -593,8 +593,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None, occur. Default is Sun:05:00-Sun:09:00 - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. Must be 4-15 alphanumeric characters. :type allocated_storage: int @@ -680,8 +680,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None, self.build_list_params(params, l, 'VpcSecurityGroupIds.member') if preferred_maintenance_window: params['PreferredMaintenanceWindow'] = preferred_maintenance_window - if master_password: - params['MasterUserPassword'] = master_password + if main_password: + params['MainUserPassword'] = main_password if allocated_storage: params['AllocatedStorage'] = allocated_storage if instance_class: diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbinstance.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbinstance.py index 6a638510..e0acf277 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbinstance.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbinstance.py @@ -47,7 +47,7 @@ class DBInstance(object): in status "available". :ivar instance_class: Contains the name of the compute and memory capacity class of the DB Instance. - :ivar master_username: The username that is set as master username + :ivar main_username: The username that is set as main username at creation time. :ivar parameter_groups: Provides the list of DB Parameter Groups applied to this DB Instance. @@ -98,7 +98,7 @@ def __init__(self, connection=None, id=None): self.auto_minor_version_upgrade = None self.endpoint = None self.instance_class = None - self.master_username = None + self.main_username = None self.parameter_groups = [] self.security_groups = [] self.read_replica_dbinstance_identifiers = [] @@ -172,8 +172,8 @@ def endElement(self, name, value, connection): self.auto_minor_version_upgrade = value.lower() == 'true' elif name == 'DBInstanceClass': self.instance_class = value - elif name == 'MasterUsername': - self.master_username = value + elif name == 'MainUsername': + self.main_username = value elif name == 'Port': if self._in_endpoint: self._port = int(value) @@ -293,7 +293,7 @@ def stop(self, skip_final_snapshot=False, final_snapshot_id=''): def modify(self, param_group=None, security_groups=None, preferred_maintenance_window=None, - master_password=None, allocated_storage=None, + main_password=None, allocated_storage=None, instance_class=None, backup_retention_period=None, preferred_backup_window=None, @@ -318,8 +318,8 @@ def modify(self, param_group=None, security_groups=None, UTC) during which maintenance can occur. Default is Sun:05:00-Sun:09:00 - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. Must be 4-15 alphanumeric characters. :type allocated_storage: int @@ -386,7 +386,7 @@ def modify(self, param_group=None, security_groups=None, param_group, security_groups, preferred_maintenance_window, - master_password, + main_password, allocated_storage, instance_class, backup_retention_period, diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py index 16d8125b..35ecbd52 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py @@ -34,10 +34,10 @@ class DBSnapshot(object): :ivar id: Specifies the identifier for the DB Snapshot (DBSnapshotIdentifier) :ivar instance_create_time: Specifies the time (UTC) when the snapshot was taken :ivar instance_id: Specifies the the DBInstanceIdentifier of the DB Instance this DB Snapshot was created from (DBInstanceIdentifier) - :ivar master_username: Provides the master username for the DB Instance + :ivar main_username: Provides the main username for the DB Instance :ivar port: Specifies the port that the database engine was listening on at the time of the snapshot :ivar snapshot_create_time: Provides the time (UTC) when the snapshot was taken - :ivar status: Specifies the status of this DB Snapshot. Possible values are [ available, backing-up, creating, deleted, deleting, failed, modifying, rebooting, resetting-master-credentials ] + :ivar status: Specifies the status of this DB Snapshot. Possible values are [ available, backing-up, creating, deleted, deleting, failed, modifying, rebooting, resetting-main-credentials ] :ivar iops: Specifies the Provisioned IOPS (I/O operations per second) value of the DB instance at the time of the snapshot. :ivar option_group_name: Provides the option group name for the DB snapshot. :ivar percent_progress: The percentage of the estimated data that has been transferred. @@ -56,7 +56,7 @@ def __init__(self, connection=None, id=None): self.port = None self.status = None self.availability_zone = None - self.master_username = None + self.main_username = None self.allocated_storage = None self.instance_id = None self.availability_zone = None @@ -93,8 +93,8 @@ def endElement(self, name, value, connection): self.status = value elif name == 'AvailabilityZone': self.availability_zone = value - elif name == 'MasterUsername': - self.master_username = value + elif name == 'MainUsername': + self.main_username = value elif name == 'AllocatedStorage': self.allocated_storage = int(value) elif name == 'SnapshotTime': diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds2/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds2/layer1.py index bbe5a778..9ad772f8 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds2/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds2/layer1.py @@ -321,8 +321,8 @@ def copy_db_snapshot(self, source_db_snapshot_identifier, path='/', params=params) def create_db_instance(self, db_instance_identifier, allocated_storage, - db_instance_class, engine, master_username, - master_user_password, db_name=None, + db_instance_class, engine, main_username, + main_user_password, db_name=None, db_security_groups=None, vpc_security_group_ids=None, availability_zone=None, db_subnet_group_name=None, @@ -417,9 +417,9 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, Valid Values: `MySQL` | `oracle-se1` | `oracle-se` | `oracle-ee` | `sqlserver-ee` | `sqlserver-se` | `sqlserver-ex` | `sqlserver-web` - :type master_username: string - :param master_username: - The name of master user for the client DB instance. + :type main_username: string + :param main_username: + The name of main user for the client DB instance. **MySQL** @@ -452,8 +452,8 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, + First character must be a letter. + Cannot be a reserved word for the chosen database engine. - :type master_user_password: string - :param master_user_password: The password for the master database user. + :type main_user_password: string + :param main_user_password: The password for the main database user. Can be any printable ASCII character except "/", '"', or "@". Type: String @@ -536,7 +536,7 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, + Must be a value from 0 to 8 - + Cannot be set to 0 if the DB instance is a master instance with read + + Cannot be set to 0 if the DB instance is a main instance with read replicas :type preferred_backup_window: string @@ -656,8 +656,8 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, 'AllocatedStorage': allocated_storage, 'DBInstanceClass': db_instance_class, 'Engine': engine, - 'MasterUsername': master_username, - 'MasterUserPassword': master_user_password, + 'MainUsername': main_username, + 'MainUserPassword': main_user_password, } if db_name is not None: params['DBName'] = db_name @@ -2488,7 +2488,7 @@ def modify_db_instance(self, db_instance_identifier, allocated_storage=None, db_instance_class=None, db_security_groups=None, vpc_security_group_ids=None, - apply_immediately=None, master_user_password=None, + apply_immediately=None, main_user_password=None, db_parameter_group_name=None, backup_retention_period=None, preferred_backup_window=None, @@ -2616,14 +2616,14 @@ def modify_db_instance(self, db_instance_identifier, Default: `False` - :type master_user_password: string - :param master_user_password: - The new password for the DB instance master user. Can be any printable + :type main_user_password: string + :param main_user_password: + The new password for the DB instance main user. Can be any printable ASCII character except "/", '"', or "@". Changing this parameter does not result in an outage and the change is asynchronously applied as soon as possible. Between the time of the - request and the completion of the request, the `MasterUserPassword` + request and the completion of the request, the `MainUserPassword` element exists in the `PendingModifiedValues` element of the operation response. @@ -2634,7 +2634,7 @@ def modify_db_instance(self, db_instance_identifier, characters (SQL Server). Amazon RDS API actions never return the password, so this action - provides a way to regain access to a master instance user if the + provides a way to regain access to a main instance user if the password is lost. :type db_parameter_group_name: string @@ -2668,7 +2668,7 @@ def modify_db_instance(self, db_instance_identifier, + Must be a value from 0 to 8 - + Cannot be set to 0 if the DB instance is a master instance with read + + Cannot be set to 0 if the DB instance is a main instance with read replicas or if the DB instance is a read replica :type preferred_backup_window: string @@ -2820,8 +2820,8 @@ def modify_db_instance(self, db_instance_identifier, if apply_immediately is not None: params['ApplyImmediately'] = str( apply_immediately).lower() - if master_user_password is not None: - params['MasterUserPassword'] = master_user_password + if main_user_password is not None: + params['MainUserPassword'] = main_user_password if db_parameter_group_name is not None: params['DBParameterGroupName'] = db_parameter_group_name if backup_retention_period is not None: diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/redshift/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/redshift/layer1.py index be1529fd..46390418 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/redshift/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/redshift/layer1.py @@ -310,8 +310,8 @@ def copy_cluster_snapshot(self, source_snapshot_identifier, verb='POST', path='/', params=params) - def create_cluster(self, cluster_identifier, node_type, master_username, - master_user_password, db_name=None, cluster_type=None, + def create_cluster(self, cluster_identifier, node_type, main_username, + main_user_password, db_name=None, cluster_type=None, cluster_security_groups=None, vpc_security_group_ids=None, cluster_subnet_group_name=None, @@ -391,9 +391,9 @@ def create_cluster(self, cluster_identifier, node_type, master_username, Valid Values: `dw1.xlarge` | `dw1.8xlarge` | `dw2.large` | `dw2.8xlarge`. - :type master_username: string - :param master_username: - The user name associated with the master user account for the cluster + :type main_username: string + :param main_username: + The user name associated with the main user account for the cluster that is being created. Constraints: @@ -404,9 +404,9 @@ def create_cluster(self, cluster_identifier, node_type, master_username, + Cannot be a reserved word. A list of reserved words can be found in `Reserved Words`_ in the Amazon Redshift Database Developer Guide. - :type master_user_password: string - :param master_user_password: - The password associated with the master user account for the cluster + :type main_user_password: string + :param main_user_password: + The password associated with the main user account for the cluster that is being created. Constraints: @@ -573,8 +573,8 @@ def create_cluster(self, cluster_identifier, node_type, master_username, params = { 'ClusterIdentifier': cluster_identifier, 'NodeType': node_type, - 'MasterUsername': master_username, - 'MasterUserPassword': master_user_password, + 'MainUsername': main_username, + 'MainUserPassword': main_user_password, } if db_name is not None: params['DBName'] = db_name @@ -2253,7 +2253,7 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, node_type=None, number_of_nodes=None, cluster_security_groups=None, vpc_security_group_ids=None, - master_user_password=None, + main_user_password=None, cluster_parameter_group_name=None, automated_snapshot_retention_period=None, preferred_maintenance_window=None, @@ -2264,7 +2264,7 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, """ Modifies the settings for a cluster. For example, you can add another security or parameter group, update the preferred - maintenance window, or change the master user password. + maintenance window, or change the main user password. Resetting a cluster password or modifying the security groups associated with a cluster do not need a reboot. However, modifying a parameter group requires a reboot for parameters @@ -2345,11 +2345,11 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, :param vpc_security_group_ids: A list of virtual private cloud (VPC) security groups to be associated with the cluster. - :type master_user_password: string - :param master_user_password: - The new password for the cluster master user. This change is + :type main_user_password: string + :param main_user_password: + The new password for the cluster main user. This change is asynchronously applied as soon as possible. Between the time of the - request and the completion of the request, the `MasterUserPassword` + request and the completion of the request, the `MainUserPassword` element exists in the `PendingModifiedValues` element of the operation response. @@ -2464,8 +2464,8 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, self.build_list_params(params, vpc_security_group_ids, 'VpcSecurityGroupIds.member') - if master_user_password is not None: - params['MasterUserPassword'] = master_user_password + if main_user_password is not None: + params['MainUserPassword'] = main_user_password if cluster_parameter_group_name is not None: params['ClusterParameterGroupName'] = cluster_parameter_group_name if automated_snapshot_retention_period is not None: diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py index 20963ed2..6d417e62 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py @@ -22,38 +22,38 @@ class PromoteReadReplicaTest(unittest.TestCase): def setUp(self): self.conn = RDSConnection() - self.masterDB_name = "boto-db-%s" % str(int(time.time())) - self.replicaDB_name = "replica-%s" % self.masterDB_name - self.renamedDB_name = "renamed-replica-%s" % self.masterDB_name + self.mainDB_name = "boto-db-%s" % str(int(time.time())) + self.replicaDB_name = "replica-%s" % self.mainDB_name + self.renamedDB_name = "renamed-replica-%s" % self.mainDB_name def tearDown(self): instances = self.conn.get_all_dbinstances() - for db in [self.masterDB_name, self.replicaDB_name, self.renamedDB_name]: + for db in [self.mainDB_name, self.replicaDB_name, self.renamedDB_name]: for i in instances: if i.id == db: self.conn.delete_dbinstance(db, skip_final_snapshot=True) def test_promote(self): print '--- running RDS promotion & renaming tests ---' - self.masterDB = self.conn.create_dbinstance(self.masterDB_name, 5, 'db.t1.micro', 'root', 'bototestpw') + self.mainDB = self.conn.create_dbinstance(self.mainDB_name, 5, 'db.t1.micro', 'root', 'bototestpw') - # Wait up to 15 minutes for the masterDB to become available - print '--- waiting for "%s" to become available ---' % self.masterDB_name + # Wait up to 15 minutes for the mainDB to become available + print '--- waiting for "%s" to become available ---' % self.mainDB_name wait_timeout = time.time() + (15 * 60) time.sleep(60) - instances = self.conn.get_all_dbinstances(self.masterDB_name) + instances = self.conn.get_all_dbinstances(self.mainDB_name) inst = instances[0] while wait_timeout > time.time() and inst.status != 'available': time.sleep(15) - instances = self.conn.get_all_dbinstances(self.masterDB_name) + instances = self.conn.get_all_dbinstances(self.mainDB_name) inst = instances[0] self.assertTrue(inst.status == 'available') - self.replicaDB = self.conn.create_dbinstance_read_replica(self.replicaDB_name, self.masterDB_name) + self.replicaDB = self.conn.create_dbinstance_read_replica(self.replicaDB_name, self.mainDB_name) # Wait up to 15 minutes for the replicaDB to become available print '--- waiting for "%s" to become available ---' % self.replicaDB_name @@ -92,8 +92,8 @@ def test_promote(self): self.assertTrue(inst.status == 'available') self.assertFalse(inst.status_infos) - # Verify that the master no longer has any read replicas - instances = self.conn.get_all_dbinstances(self.masterDB_name) + # Verify that the main no longer has any read replicas + instances = self.conn.get_all_dbinstances(self.mainDB_name) inst = instances[0] self.assertFalse(inst.read_replica_dbinstance_identifiers) @@ -101,7 +101,7 @@ def test_promote(self): self.renamedDB = self.conn.modify_dbinstance(self.replicaDB_name, new_instance_id=self.renamedDB_name, apply_immediately=True) - # Wait up to 15 minutes for the masterDB to become available + # Wait up to 15 minutes for the mainDB to become available print '--- waiting for "%s" to exist ---' % self.renamedDB_name wait_timeout = time.time() + (15 * 60) diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py index 82d8193b..7830636d 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py @@ -44,8 +44,8 @@ def test_integration(self): allocated_storage=5, db_instance_class='db.t1.micro', engine='postgres', - master_username='bototestuser', - master_user_password='testtestt3st', + main_username='bototestuser', + main_user_password='testtestt3st', # Try to limit the impact & test options. multi_az=False, backup_retention_period=0 diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py index 490618e1..61685081 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py @@ -36,8 +36,8 @@ def setUp(self): self.api = RedshiftConnection() self.cluster_prefix = 'boto-redshift-cluster-%s' self.node_type = 'dw.hs1.xlarge' - self.master_username = 'mrtest' - self.master_password = 'P4ssword' + self.main_username = 'mrtest' + self.main_password = 'P4ssword' self.db_name = 'simon' # Redshift was taking ~20 minutes to bring clusters up in testing. self.wait_time = 60 * 20 @@ -50,7 +50,7 @@ def create_cluster(self): cluster_id = self.cluster_id() self.api.create_cluster( cluster_id, self.node_type, - self.master_username, self.master_password, + self.main_username, self.main_password, db_name=self.db_name, number_of_nodes=3 ) @@ -71,7 +71,7 @@ def test_create_delete_cluster(self): cluster_id = self.cluster_id() self.api.create_cluster( cluster_id, self.node_type, - self.master_username, self.master_password, + self.main_username, self.main_password, db_name=self.db_name, number_of_nodes=3 ) diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py index ca13d1c0..68637ca3 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py @@ -193,7 +193,7 @@ def default_body(self): 2014-01-24T02:19:46Z - Master instance group + Main instance group 1 0 MASTER @@ -253,7 +253,7 @@ def test_list_instance_groups(self): self.assertEqual(response.instancegroups[0].instancetype, "m1.large") self.assertEqual(response.instancegroups[0].market, "ON_DEMAND") self.assertEqual( - response.instancegroups[0].name, "Master instance group") + response.instancegroups[0].name, "Main instance group") self.assertEqual( response.instancegroups[0].requestedinstancecount, '1') self.assertEqual(response.instancegroups[0].runninginstancecount, '0') @@ -587,7 +587,7 @@ def default_body(self): false - ec2-184-0-0-1.us-west-1.compute.amazonaws.com + ec2-184-0-0-1.us-west-1.compute.amazonaws.com 10 my-service-role @@ -622,7 +622,7 @@ def test_describe_cluster(self): self.assertEqual(response.applications[0].name, 'hadoop') self.assertEqual(response.applications[0].version, '1.0.3') self.assertEqual( - response.masterpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') + response.mainpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') self.assertEqual(response.normalizedinstancehours, '10') self.assertEqual(response.servicerole, 'my-service-role') @@ -862,7 +862,7 @@ def default_body(self): us-west-1c - m1.large + m1.large my_key true @@ -879,7 +879,7 @@ def default_body(self): ON_DEMAND ig-aaaaaa MASTER - Master instance group + Main instance group 2014-01-24T01:21:21Z @@ -897,11 +897,11 @@ def default_body(self): Core instance group - m1.large - i-aaaaaa + m1.large + i-aaaaaa 1.0.3 12 - ec2-184-0-0-1.us-west-1.compute.amazonaws.com + ec2-184-0-0-1.us-west-1.compute.amazonaws.com 3 false @@ -930,15 +930,15 @@ def test_describe_jobflows_response(self): self.assertEqual(jf.name, 'test analytics') self.assertEqual(jf.jobflowid, 'j-aaaaaa') self.assertEqual(jf.ec2keyname, 'my_key') - self.assertEqual(jf.masterinstancetype, 'm1.large') + self.assertEqual(jf.maininstancetype, 'm1.large') self.assertEqual(jf.availabilityzone, 'us-west-1c') self.assertEqual(jf.keepjobflowalivewhennosteps, 'true') - self.assertEqual(jf.slaveinstancetype, 'm1.large') - self.assertEqual(jf.masterinstanceid, 'i-aaaaaa') + self.assertEqual(jf.subordinateinstancetype, 'm1.large') + self.assertEqual(jf.maininstanceid, 'i-aaaaaa') self.assertEqual(jf.hadoopversion, '1.0.3') self.assertEqual(jf.normalizedinstancehours, '12') self.assertEqual( - jf.masterpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') + jf.mainpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') self.assertEqual(jf.instancecount, '3') self.assertEqual(jf.terminationprotected, 'false') @@ -961,7 +961,7 @@ def test_describe_jobflows_response(self): self.assertEqual(ig.market, 'ON_DEMAND') self.assertEqual(ig.instancegroupid, 'ig-aaaaaa') self.assertEqual(ig.instancerole, 'MASTER') - self.assertEqual(ig.name, 'Master instance group') + self.assertEqual(ig.name, 'Main instance group') def test_describe_jobflows_no_args(self): self.set_http_response(200) @@ -1033,8 +1033,8 @@ def test_run_jobflow_service_role(self): 'Name': 'EmrCluster'}, ignore_params_values=['ActionOnFailure', 'Instances.InstanceCount', 'Instances.KeepJobFlowAliveWhenNoSteps', - 'Instances.MasterInstanceType', - 'Instances.SlaveInstanceType']) + 'Instances.MainInstanceType', + 'Instances.SubordinateInstanceType']) def test_run_jobflow_enable_debugging(self): self.region = 'ap-northeast-2' diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py index dda6b928..656bde7d 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py @@ -85,8 +85,8 @@ us-east-1a - m1.small - m1.small + m1.small + m1.small myec2keyname 4 true @@ -281,8 +281,8 @@ j-3H3Q13JPFLU22 - m1.large - i-64c21609 + m1.large + i-64c21609 us-east-1b @@ -300,7 +300,7 @@ Job flow terminated MASTER ig-EVMHOZJ2SCO8 - master + main 2010-10-21T01:00:25Z @@ -315,13 +315,13 @@ Job flow terminated CORE ig-YZHDYVITVHKB - slave + subordinate 40 0.20 - m1.large - ec2-184-72-153-139.compute-1.amazonaws.com + m1.large + ec2-184-72-153-139.compute-1.amazonaws.com myubersecurekey 10 false @@ -361,8 +361,8 @@ def test_JobFlows_example(self): loguri='mybucket/subdir/', name='MyJobFlowName', availabilityzone='us-east-1a', - slaveinstancetype='m1.small', - masterinstancetype='m1.small', + subordinateinstancetype='m1.small', + maininstancetype='m1.small', ec2keyname='myec2keyname', keepjobflowalivewhennosteps='true') @@ -379,8 +379,8 @@ def test_JobFlows_completed(self): loguri='s3n://example.emrtest.scripts/jobflow_logs/', name='RealJobFlowName', availabilityzone='us-east-1b', - slaveinstancetype='m1.large', - masterinstancetype='m1.large', + subordinateinstancetype='m1.large', + maininstancetype='m1.large', ec2keyname='myubersecurekey', keepjobflowalivewhennosteps='false') self.assertEquals(6, len(jobflow.steps)) diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py index cc5c747b..eb8b0229 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py @@ -19,7 +19,7 @@ def test_bidprice_missing_spot(self): """ with self.assertRaisesRegexp(ValueError, 'bidprice must be specified'): InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master') + 'SPOT', 'main') def test_bidprice_missing_ondemand(self): """ @@ -27,14 +27,14 @@ def test_bidprice_missing_ondemand(self): ON_DEMAND. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'ON_DEMAND', 'master') + 'ON_DEMAND', 'main') def test_bidprice_Decimal(self): """ Test InstanceGroup init works with bidprice type = Decimal. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master', bidprice=Decimal(1.10)) + 'SPOT', 'main', bidprice=Decimal(1.10)) self.assertEquals('1.10', instance_group.bidprice[:4]) def test_bidprice_float(self): @@ -42,7 +42,7 @@ def test_bidprice_float(self): Test InstanceGroup init works with bidprice type = float. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master', bidprice=1.1) + 'SPOT', 'main', bidprice=1.1) self.assertEquals('1.1', instance_group.bidprice) def test_bidprice_string(self): @@ -50,7 +50,7 @@ def test_bidprice_string(self): Test InstanceGroup init works with bidprice type = string. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master', bidprice='1.1') + 'SPOT', 'main', bidprice='1.1') self.assertEquals('1.1', instance_group.bidprice) if __name__ == "__main__": diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py index fbc65b09..8f4bc529 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py @@ -88,7 +88,7 @@ def default_body(self): 2012-10-03T22:01:51.047Z 200 db.m1.large - awsuser + awsuser @@ -150,7 +150,7 @@ def test_get_all_db_instances(self): db.endpoint, (u'mydbinstance2.c0hjqouvn9mf.us-west-2.rds.amazonaws.com', 3306)) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'awsuser') + self.assertEqual(db.main_username, 'awsuser') self.assertEqual(db.availability_zone, 'us-west-2b') self.assertEqual(db.backup_retention_period, 1) self.assertEqual(db.preferred_backup_window, '10:30-11:00') @@ -198,7 +198,7 @@ def default_body(self): mysql - **** + **** 0 false @@ -252,7 +252,7 @@ def default_body(self): sat:07:30-sat:08:00 10 db.m1.large - master + main @@ -267,7 +267,7 @@ def test_create_db_instance_param_group_name(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group='default.mysql5.1', db_subnet_group_name='dbSubnetgroup01', @@ -283,8 +283,8 @@ def test_create_db_instance_param_group_name(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306 }, ignore_params_values=['Version']) @@ -293,10 +293,10 @@ def test_create_db_instance_param_group_name(self): self.assertEqual(db.status, 'creating') self.assertEqual(db.allocated_storage, 10) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'master') + self.assertEqual(db.main_username, 'main') self.assertEqual(db.multi_az, False) self.assertEqual(db.pending_modified_values, - {'MasterUserPassword': '****'}) + {'MainUserPassword': '****'}) self.assertEqual(db.parameter_group.name, 'default.mysql5.1') @@ -312,7 +312,7 @@ def test_create_db_instance_param_group_instance(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group=param_group, db_subnet_group_name='dbSubnetgroup01') @@ -326,8 +326,8 @@ def test_create_db_instance_param_group_instance(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306, }, ignore_params_values=['Version']) @@ -336,10 +336,10 @@ def test_create_db_instance_param_group_instance(self): self.assertEqual(db.status, 'creating') self.assertEqual(db.allocated_storage, 10) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'master') + self.assertEqual(db.main_username, 'main') self.assertEqual(db.multi_az, False) self.assertEqual(db.pending_modified_values, - {'MasterUserPassword': '****'}) + {'MainUserPassword': '****'}) self.assertEqual(db.parameter_group.name, 'default.mysql5.1') self.assertEqual(db.parameter_group.description, None) @@ -383,7 +383,7 @@ def default_body(self): sat:07:30-sat:08:00 10 db.m1.large - master + main @@ -411,7 +411,7 @@ def test_restore_dbinstance_from_point_in_time(self): self.assertEqual(db.status, 'creating') self.assertEqual(db.allocated_storage, 10) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'master') + self.assertEqual(db.main_username, 'main') self.assertEqual(db.multi_az, False) self.assertEqual(db.parameter_group.name, @@ -445,7 +445,7 @@ def test_create_db_instance_vpc_sg_str(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group='default.mysql5.1', db_subnet_group_name='dbSubnetgroup01', @@ -460,8 +460,8 @@ def test_create_db_instance_vpc_sg_str(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306, 'VpcSecurityGroupIds.member.1': 'sg-1', 'VpcSecurityGroupIds.member.2': 'sg-2' @@ -481,7 +481,7 @@ def test_create_db_instance_vpc_sg_obj(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group='default.mysql5.1', db_subnet_group_name='dbSubnetgroup01', @@ -496,8 +496,8 @@ def test_create_db_instance_vpc_sg_obj(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306, 'VpcSecurityGroupIds.member.1': 'sg-1', 'VpcSecurityGroupIds.member.2': 'sg-2' @@ -674,9 +674,9 @@ class TestRDSLogFileDownload(AWSMockServiceTestCase): 2014-01-27 09:35:15.44 spid74 I/O is frozen on database rdsadmin. No user action is required. However, if I/O is not resumed promptly, you could cancel the backup. -2014-01-27 09:35:15.44 spid73 I/O is frozen on database master. No user action is required. However, if I/O is not resumed promptly, you could cancel the backup. +2014-01-27 09:35:15.44 spid73 I/O is frozen on database main. No user action is required. However, if I/O is not resumed promptly, you could cancel the backup. -2014-01-27 09:35:25.57 spid73 I/O was resumed on database master. No user action is required. +2014-01-27 09:35:25.57 spid73 I/O was resumed on database main. No user action is required. 2014-01-27 09:35:25.57 spid74 I/O was resumed on database rdsadmin. No user action is required. diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py index c3c9d8a6..aded3ccd 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py @@ -27,7 +27,7 @@ def default_body(self): 5.1.50 mydbsnapshot manual - master + main myoptiongroupname 1000 100 @@ -47,7 +47,7 @@ def default_body(self): 5.1.49 mysnapshot1 manual - sa + sa myoptiongroupname 1000 @@ -64,7 +64,7 @@ def default_body(self): 5.1.47 rds:simcoprod01-2012-04-02-00-01 automated - master + main myoptiongroupname 1000 @@ -118,7 +118,7 @@ def default_body(self): 5.1.50 mydbsnapshot manual - master + main @@ -160,7 +160,7 @@ def default_body(self): 5.1.50 mycopieddbsnapshot manual - master + main @@ -202,7 +202,7 @@ def default_body(self): 5.1.47 mysnapshot2 manual - master + main @@ -257,7 +257,7 @@ def default_body(self): sat:07:30-sat:08:00 10 db.m1.large - master + main diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py index 73d77248..accfa4d4 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py @@ -509,7 +509,7 @@ def default_body(self): 1800 - ns-1929.awsdns-93.net. hostmaster.awsdns.net. 1 10800 3600 604800 1800 + ns-1929.awsdns-93.net. hostmain.awsdns.net. 1 10800 3600 604800 1800 diff --git a/google-cloud-sdk/platform/gsutil/third_party/crcmod/docs/source/conf.py b/google-cloud-sdk/platform/gsutil/third_party/crcmod/docs/source/conf.py index 87abe837..b8c0f1a7 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/crcmod/docs/source/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/crcmod/docs/source/conf.py @@ -36,8 +36,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'crcmod' diff --git a/google-cloud-sdk/platform/gsutil/third_party/fasteners/doc/source/conf.py b/google-cloud-sdk/platform/gsutil/third_party/fasteners/doc/source/conf.py index dd20a54c..29a68632 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/fasteners/doc/source/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/fasteners/doc/source/conf.py @@ -48,8 +48,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'Fasteners' @@ -229,7 +229,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'Fasteners.tex', u'Fasteners Documentation', + (main_doc, 'Fasteners.tex', u'Fasteners Documentation', u'Joshua Harlow', 'manual'), ] @@ -259,7 +259,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'fasteners', u'Fasteners Documentation', + (main_doc, 'fasteners', u'Fasteners Documentation', [author], 1) ] @@ -273,7 +273,7 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'Fasteners', u'Fasteners Documentation', + (main_doc, 'Fasteners', u'Fasteners Documentation', author, 'Fasteners', 'One line description of project.', 'Miscellaneous'), ] diff --git a/google-cloud-sdk/platform/gsutil/third_party/funcsigs/docs/conf.py b/google-cloud-sdk/platform/gsutil/third_party/funcsigs/docs/conf.py index c6e4194c..3b1747c7 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/funcsigs/docs/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/funcsigs/docs/conf.py @@ -37,8 +37,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = 'funcsigs' diff --git a/google-cloud-sdk/platform/gsutil/third_party/mock/docs/conf.py b/google-cloud-sdk/platform/gsutil/third_party/mock/docs/conf.py index d32357da..b4173248 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/mock/docs/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/mock/docs/conf.py @@ -62,8 +62,8 @@ def __init__(self): # The suffix of source filenames. source_suffix = '.txt' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General substitutions. project = u'Mock' diff --git a/google-cloud-sdk/platform/gsutil/third_party/oauth2client/docs/conf.py b/google-cloud-sdk/platform/gsutil/third_party/oauth2client/docs/conf.py index 1b4663b2..5e8eb9ce 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/oauth2client/docs/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/oauth2client/docs/conf.py @@ -57,7 +57,7 @@ def __getattr__(cls, name): ] templates_path = ['_templates'] source_suffix = '.rst' -master_doc = 'index' +main_doc = 'index' # General information about the project. project = u'oauth2client' diff --git a/google-cloud-sdk/platform/gsutil/third_party/pyasn1/docs/source/conf.py b/google-cloud-sdk/platform/gsutil/third_party/pyasn1/docs/source/conf.py index 1e91e209..d05038fa 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/pyasn1/docs/source/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/pyasn1/docs/source/conf.py @@ -42,8 +42,8 @@ # The encoding of source files. # source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'contents' +# The main toctree document. +main_doc = 'contents' # General information about the project. project = u'ASN.1 types and codecs' @@ -242,7 +242,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'PyASN1.tex', u'PyASN1 Documentation', + (main_doc, 'PyASN1.tex', u'PyASN1 Documentation', u'Ilya Etingof \\textless{}etingof@gmail.com\\textgreater{}', 'manual'), ] @@ -272,7 +272,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'pyasn1', u'PyASN1 Documentation', + (main_doc, 'pyasn1', u'PyASN1 Documentation', [author], 1) ] @@ -286,7 +286,7 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'PyASN1', u'PyASN1 Documentation', + (main_doc, 'PyASN1', u'PyASN1 Documentation', author, 'PyASN1', 'One line description of project.', 'Miscellaneous'), ] diff --git a/google-cloud-sdk/platform/gsutil/third_party/rsa/doc/conf.py b/google-cloud-sdk/platform/gsutil/third_party/rsa/doc/conf.py index 95317b21..06219794 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/rsa/doc/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/rsa/doc/conf.py @@ -41,8 +41,8 @@ # The encoding of source files. source_encoding = 'utf-8' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'Python-RSA' diff --git a/google-cloud-sdk/platform/gsutil/third_party/six/documentation/conf.py b/google-cloud-sdk/platform/gsutil/third_party/six/documentation/conf.py index e0393016..e47c823e 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/six/documentation/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/six/documentation/conf.py @@ -28,8 +28,8 @@ # The encoding of source files. #source_encoding = "utf-8-sig" -# The master toctree document. -master_doc = "index" +# The main toctree document. +main_doc = "index" # General information about the project. project = u"six"