diff --git a/Deploy/metadata/V1/CloudDeploy.php b/Deploy/metadata/V1/CloudDeploy.php
index 98256d768968..f45ab390eda7 100644
Binary files a/Deploy/metadata/V1/CloudDeploy.php and b/Deploy/metadata/V1/CloudDeploy.php differ
diff --git a/Deploy/src/V1/KubernetesConfig/GatewayServiceMesh.php b/Deploy/src/V1/KubernetesConfig/GatewayServiceMesh.php
index 7baf6775224c..0f84cf1fe5f5 100644
--- a/Deploy/src/V1/KubernetesConfig/GatewayServiceMesh.php
+++ b/Deploy/src/V1/KubernetesConfig/GatewayServiceMesh.php
@@ -51,6 +51,13 @@ class GatewayServiceMesh extends \Google\Protobuf\Internal\Message
* Generated from protobuf field .google.protobuf.Duration stable_cutback_duration = 5 [(.google.api.field_behavior) = OPTIONAL];
*/
protected $stable_cutback_duration = null;
+ /**
+ * Optional. The label to use when selecting Pods for the Deployment and
+ * Service resources. This label must already be present in both resources.
+ *
+ * Generated from protobuf field string pod_selector_label = 6 [(.google.api.field_behavior) = OPTIONAL];
+ */
+ protected $pod_selector_label = '';
/**
* Constructor.
@@ -74,6 +81,9 @@ class GatewayServiceMesh extends \Google\Protobuf\Internal\Message
* Service to the original Service during the stable phase deployment. If
* specified, must be between 15s and 3600s. If unspecified, there is no
* cutback time.
+ * @type string $pod_selector_label
+ * Optional. The label to use when selecting Pods for the Deployment and
+ * Service resources. This label must already be present in both resources.
* }
*/
public function __construct($data = NULL) {
@@ -243,6 +253,34 @@ public function setStableCutbackDuration($var)
return $this;
}
+ /**
+ * Optional. The label to use when selecting Pods for the Deployment and
+ * Service resources. This label must already be present in both resources.
+ *
+ * Generated from protobuf field string pod_selector_label = 6 [(.google.api.field_behavior) = OPTIONAL];
+ * @return string
+ */
+ public function getPodSelectorLabel()
+ {
+ return $this->pod_selector_label;
+ }
+
+ /**
+ * Optional. The label to use when selecting Pods for the Deployment and
+ * Service resources. This label must already be present in both resources.
+ *
+ * Generated from protobuf field string pod_selector_label = 6 [(.google.api.field_behavior) = OPTIONAL];
+ * @param string $var
+ * @return $this
+ */
+ public function setPodSelectorLabel($var)
+ {
+ GPBUtil::checkString($var, True);
+ $this->pod_selector_label = $var;
+
+ return $this;
+ }
+
}
diff --git a/Deploy/src/V1/KubernetesConfig/ServiceNetworking.php b/Deploy/src/V1/KubernetesConfig/ServiceNetworking.php
index 1313dae9edc2..90d2288e4b43 100644
--- a/Deploy/src/V1/KubernetesConfig/ServiceNetworking.php
+++ b/Deploy/src/V1/KubernetesConfig/ServiceNetworking.php
@@ -37,6 +37,13 @@ class ServiceNetworking extends \Google\Protobuf\Internal\Message
* Generated from protobuf field bool disable_pod_overprovisioning = 3 [(.google.api.field_behavior) = OPTIONAL];
*/
protected $disable_pod_overprovisioning = false;
+ /**
+ * Optional. The label to use when selecting Pods for the Deployment
+ * resource. This label must already be present in the Deployment.
+ *
+ * Generated from protobuf field string pod_selector_label = 4 [(.google.api.field_behavior) = OPTIONAL];
+ */
+ protected $pod_selector_label = '';
/**
* Constructor.
@@ -54,6 +61,9 @@ class ServiceNetworking extends \Google\Protobuf\Internal\Message
* overprovisioning is disabled then Cloud Deploy will limit the number of
* total Pods used for the deployment strategy to the number of Pods the
* Deployment has on the cluster.
+ * @type string $pod_selector_label
+ * Optional. The label to use when selecting Pods for the Deployment
+ * resource. This label must already be present in the Deployment.
* }
*/
public function __construct($data = NULL) {
@@ -147,6 +157,34 @@ public function setDisablePodOverprovisioning($var)
return $this;
}
+ /**
+ * Optional. The label to use when selecting Pods for the Deployment
+ * resource. This label must already be present in the Deployment.
+ *
+ * Generated from protobuf field string pod_selector_label = 4 [(.google.api.field_behavior) = OPTIONAL];
+ * @return string
+ */
+ public function getPodSelectorLabel()
+ {
+ return $this->pod_selector_label;
+ }
+
+ /**
+ * Optional. The label to use when selecting Pods for the Deployment
+ * resource. This label must already be present in the Deployment.
+ *
+ * Generated from protobuf field string pod_selector_label = 4 [(.google.api.field_behavior) = OPTIONAL];
+ * @param string $var
+ * @return $this
+ */
+ public function setPodSelectorLabel($var)
+ {
+ GPBUtil::checkString($var, True);
+ $this->pod_selector_label = $var;
+
+ return $this;
+ }
+
}
diff --git a/Deploy/src/V1/RepairRolloutOperation.php b/Deploy/src/V1/RepairRolloutOperation.php
index cbc9fa6ba97a..8db984466a7f 100644
--- a/Deploy/src/V1/RepairRolloutOperation.php
+++ b/Deploy/src/V1/RepairRolloutOperation.php
@@ -21,12 +21,6 @@ class RepairRolloutOperation extends \Google\Protobuf\Internal\Message
* Generated from protobuf field string rollout = 1 [(.google.api.field_behavior) = OUTPUT_ONLY];
*/
protected $rollout = '';
- /**
- * Output only. The index of the current repair action in the repair sequence.
- *
- * Generated from protobuf field int64 current_repair_mode_index = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
- */
- protected $current_repair_mode_index = 0;
/**
* Output only. Records of the repair attempts. Each repair phase may have
* multiple retry attempts or single rollback attempt.
@@ -34,6 +28,19 @@ class RepairRolloutOperation extends \Google\Protobuf\Internal\Message
* Generated from protobuf field repeated .google.cloud.deploy.v1.RepairPhase repair_phases = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
*/
private $repair_phases;
+ /**
+ * Output only. The phase ID of the phase that includes the job being
+ * repaired.
+ *
+ * Generated from protobuf field string phase_id = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ */
+ protected $phase_id = '';
+ /**
+ * Output only. The job ID for the Job to repair.
+ *
+ * Generated from protobuf field string job_id = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ */
+ protected $job_id = '';
/**
* Constructor.
@@ -43,11 +50,14 @@ class RepairRolloutOperation extends \Google\Protobuf\Internal\Message
*
* @type string $rollout
* Output only. The name of the rollout that initiates the `AutomationRun`.
- * @type int|string $current_repair_mode_index
- * Output only. The index of the current repair action in the repair sequence.
* @type array<\Google\Cloud\Deploy\V1\RepairPhase>|\Google\Protobuf\Internal\RepeatedField $repair_phases
* Output only. Records of the repair attempts. Each repair phase may have
* multiple retry attempts or single rollback attempt.
+ * @type string $phase_id
+ * Output only. The phase ID of the phase that includes the job being
+ * repaired.
+ * @type string $job_id
+ * Output only. The job ID for the Job to repair.
* }
*/
public function __construct($data = NULL) {
@@ -82,55 +92,83 @@ public function setRollout($var)
}
/**
- * Output only. The index of the current repair action in the repair sequence.
+ * Output only. Records of the repair attempts. Each repair phase may have
+ * multiple retry attempts or single rollback attempt.
*
- * Generated from protobuf field int64 current_repair_mode_index = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
- * @return int|string
+ * Generated from protobuf field repeated .google.cloud.deploy.v1.RepairPhase repair_phases = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ * @return \Google\Protobuf\Internal\RepeatedField
*/
- public function getCurrentRepairModeIndex()
+ public function getRepairPhases()
{
- return $this->current_repair_mode_index;
+ return $this->repair_phases;
}
/**
- * Output only. The index of the current repair action in the repair sequence.
+ * Output only. Records of the repair attempts. Each repair phase may have
+ * multiple retry attempts or single rollback attempt.
*
- * Generated from protobuf field int64 current_repair_mode_index = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
- * @param int|string $var
+ * Generated from protobuf field repeated .google.cloud.deploy.v1.RepairPhase repair_phases = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ * @param array<\Google\Cloud\Deploy\V1\RepairPhase>|\Google\Protobuf\Internal\RepeatedField $var
* @return $this
*/
- public function setCurrentRepairModeIndex($var)
+ public function setRepairPhases($var)
{
- GPBUtil::checkInt64($var);
- $this->current_repair_mode_index = $var;
+ $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Cloud\Deploy\V1\RepairPhase::class);
+ $this->repair_phases = $arr;
return $this;
}
/**
- * Output only. Records of the repair attempts. Each repair phase may have
- * multiple retry attempts or single rollback attempt.
+ * Output only. The phase ID of the phase that includes the job being
+ * repaired.
*
- * Generated from protobuf field repeated .google.cloud.deploy.v1.RepairPhase repair_phases = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
- * @return \Google\Protobuf\Internal\RepeatedField
+ * Generated from protobuf field string phase_id = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ * @return string
*/
- public function getRepairPhases()
+ public function getPhaseId()
{
- return $this->repair_phases;
+ return $this->phase_id;
}
/**
- * Output only. Records of the repair attempts. Each repair phase may have
- * multiple retry attempts or single rollback attempt.
+ * Output only. The phase ID of the phase that includes the job being
+ * repaired.
*
- * Generated from protobuf field repeated .google.cloud.deploy.v1.RepairPhase repair_phases = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
- * @param array<\Google\Cloud\Deploy\V1\RepairPhase>|\Google\Protobuf\Internal\RepeatedField $var
+ * Generated from protobuf field string phase_id = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ * @param string $var
* @return $this
*/
- public function setRepairPhases($var)
+ public function setPhaseId($var)
{
- $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Cloud\Deploy\V1\RepairPhase::class);
- $this->repair_phases = $arr;
+ GPBUtil::checkString($var, True);
+ $this->phase_id = $var;
+
+ return $this;
+ }
+
+ /**
+ * Output only. The job ID for the Job to repair.
+ *
+ * Generated from protobuf field string job_id = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ * @return string
+ */
+ public function getJobId()
+ {
+ return $this->job_id;
+ }
+
+ /**
+ * Output only. The job ID for the Job to repair.
+ *
+ * Generated from protobuf field string job_id = 5 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ * @param string $var
+ * @return $this
+ */
+ public function setJobId($var)
+ {
+ GPBUtil::checkString($var, True);
+ $this->job_id = $var;
return $this;
}
diff --git a/Deploy/src/V1/RepairRolloutRule.php b/Deploy/src/V1/RepairRolloutRule.php
index 44a01f3f4736..e562296f3300 100644
--- a/Deploy/src/V1/RepairRolloutRule.php
+++ b/Deploy/src/V1/RepairRolloutRule.php
@@ -24,17 +24,6 @@ class RepairRolloutRule extends \Google\Protobuf\Internal\Message
* Generated from protobuf field string id = 1 [(.google.api.field_behavior) = REQUIRED];
*/
protected $id = '';
- /**
- * Optional. Phases within which jobs are subject to automatic repair actions
- * on failure. Proceeds only after phase name matched any one in the list, or
- * for all phases if unspecified. This value must consist of lower-case
- * letters, numbers, and hyphens, start with a letter and end with a letter or
- * a number, and have a max length of 63 characters. In other words, it must
- * match the following regex: `^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$`.
- *
- * Generated from protobuf field repeated string source_phases = 2 [(.google.api.field_behavior) = OPTIONAL];
- */
- private $source_phases;
/**
* Optional. Jobs to repair. Proceeds only after job name matched any one in
* the list, or for all jobs if unspecified or empty. The phase that includes
@@ -47,12 +36,6 @@ class RepairRolloutRule extends \Google\Protobuf\Internal\Message
* Generated from protobuf field repeated string jobs = 3 [(.google.api.field_behavior) = OPTIONAL];
*/
private $jobs;
- /**
- * Required. Defines the types of automatic repair actions for failed jobs.
- *
- * Generated from protobuf field repeated .google.cloud.deploy.v1.RepairMode repair_modes = 4 [(.google.api.field_behavior) = REQUIRED];
- */
- private $repair_modes;
/**
* Output only. Information around the state of the 'Automation' rule.
*
@@ -70,13 +53,6 @@ class RepairRolloutRule extends \Google\Protobuf\Internal\Message
* Required. ID of the rule. This id must be unique in the `Automation`
* resource to which this rule belongs. The format is
* `[a-z]([a-z0-9-]{0,61}[a-z0-9])?`.
- * @type array|\Google\Protobuf\Internal\RepeatedField $source_phases
- * Optional. Phases within which jobs are subject to automatic repair actions
- * on failure. Proceeds only after phase name matched any one in the list, or
- * for all phases if unspecified. This value must consist of lower-case
- * letters, numbers, and hyphens, start with a letter and end with a letter or
- * a number, and have a max length of 63 characters. In other words, it must
- * match the following regex: `^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$`.
* @type array|\Google\Protobuf\Internal\RepeatedField $jobs
* Optional. Jobs to repair. Proceeds only after job name matched any one in
* the list, or for all jobs if unspecified or empty. The phase that includes
@@ -85,8 +61,6 @@ class RepairRolloutRule extends \Google\Protobuf\Internal\Message
* letter and end with a letter or a number, and have a max length of 63
* characters. In other words, it must match the following regex:
* `^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$`.
- * @type array<\Google\Cloud\Deploy\V1\RepairMode>|\Google\Protobuf\Internal\RepeatedField $repair_modes
- * Required. Defines the types of automatic repair actions for failed jobs.
* @type \Google\Cloud\Deploy\V1\AutomationRuleCondition $condition
* Output only. Information around the state of the 'Automation' rule.
* }
@@ -126,42 +100,6 @@ public function setId($var)
return $this;
}
- /**
- * Optional. Phases within which jobs are subject to automatic repair actions
- * on failure. Proceeds only after phase name matched any one in the list, or
- * for all phases if unspecified. This value must consist of lower-case
- * letters, numbers, and hyphens, start with a letter and end with a letter or
- * a number, and have a max length of 63 characters. In other words, it must
- * match the following regex: `^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$`.
- *
- * Generated from protobuf field repeated string source_phases = 2 [(.google.api.field_behavior) = OPTIONAL];
- * @return \Google\Protobuf\Internal\RepeatedField
- */
- public function getSourcePhases()
- {
- return $this->source_phases;
- }
-
- /**
- * Optional. Phases within which jobs are subject to automatic repair actions
- * on failure. Proceeds only after phase name matched any one in the list, or
- * for all phases if unspecified. This value must consist of lower-case
- * letters, numbers, and hyphens, start with a letter and end with a letter or
- * a number, and have a max length of 63 characters. In other words, it must
- * match the following regex: `^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$`.
- *
- * Generated from protobuf field repeated string source_phases = 2 [(.google.api.field_behavior) = OPTIONAL];
- * @param array|\Google\Protobuf\Internal\RepeatedField $var
- * @return $this
- */
- public function setSourcePhases($var)
- {
- $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
- $this->source_phases = $arr;
-
- return $this;
- }
-
/**
* Optional. Jobs to repair. Proceeds only after job name matched any one in
* the list, or for all jobs if unspecified or empty. The phase that includes
@@ -200,32 +138,6 @@ public function setJobs($var)
return $this;
}
- /**
- * Required. Defines the types of automatic repair actions for failed jobs.
- *
- * Generated from protobuf field repeated .google.cloud.deploy.v1.RepairMode repair_modes = 4 [(.google.api.field_behavior) = REQUIRED];
- * @return \Google\Protobuf\Internal\RepeatedField
- */
- public function getRepairModes()
- {
- return $this->repair_modes;
- }
-
- /**
- * Required. Defines the types of automatic repair actions for failed jobs.
- *
- * Generated from protobuf field repeated .google.cloud.deploy.v1.RepairMode repair_modes = 4 [(.google.api.field_behavior) = REQUIRED];
- * @param array<\Google\Cloud\Deploy\V1\RepairMode>|\Google\Protobuf\Internal\RepeatedField $var
- * @return $this
- */
- public function setRepairModes($var)
- {
- $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Cloud\Deploy\V1\RepairMode::class);
- $this->repair_modes = $arr;
-
- return $this;
- }
-
/**
* Output only. Information around the state of the 'Automation' rule.
*
diff --git a/Deploy/src/V1/RepairState.php b/Deploy/src/V1/RepairState.php
index 0069e36d1f81..fabd2dd44dcb 100644
--- a/Deploy/src/V1/RepairState.php
+++ b/Deploy/src/V1/RepairState.php
@@ -50,11 +50,11 @@ class RepairState
*/
const REPAIR_STATE_PENDING = 5;
/**
- * The `repair` action was skipped.
+ * The `repair` action was aborted.
*
- * Generated from protobuf enum REPAIR_STATE_SKIPPED = 6;
+ * Generated from protobuf enum REPAIR_STATE_ABORTED = 7;
*/
- const REPAIR_STATE_SKIPPED = 6;
+ const REPAIR_STATE_ABORTED = 7;
private static $valueToName = [
self::REPAIR_STATE_UNSPECIFIED => 'REPAIR_STATE_UNSPECIFIED',
@@ -63,7 +63,7 @@ class RepairState
self::REPAIR_STATE_FAILED => 'REPAIR_STATE_FAILED',
self::REPAIR_STATE_IN_PROGRESS => 'REPAIR_STATE_IN_PROGRESS',
self::REPAIR_STATE_PENDING => 'REPAIR_STATE_PENDING',
- self::REPAIR_STATE_SKIPPED => 'REPAIR_STATE_SKIPPED',
+ self::REPAIR_STATE_ABORTED => 'REPAIR_STATE_ABORTED',
];
public static function name($value)
diff --git a/Deploy/src/V1/RetryPhase.php b/Deploy/src/V1/RetryPhase.php
index 0eb3f79d6b1d..f8efa1208a0c 100644
--- a/Deploy/src/V1/RetryPhase.php
+++ b/Deploy/src/V1/RetryPhase.php
@@ -29,18 +29,6 @@ class RetryPhase extends \Google\Protobuf\Internal\Message
* Generated from protobuf field .google.cloud.deploy.v1.BackoffMode backoff_mode = 2 [(.google.api.field_behavior) = OUTPUT_ONLY];
*/
protected $backoff_mode = 0;
- /**
- * Output only. The phase ID of the phase that includes the job being retried.
- *
- * Generated from protobuf field string phase_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
- */
- protected $phase_id = '';
- /**
- * Output only. The job ID for the Job to retry.
- *
- * Generated from protobuf field string job_id = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
- */
- protected $job_id = '';
/**
* Output only. Detail of a retry action.
*
@@ -59,10 +47,6 @@ class RetryPhase extends \Google\Protobuf\Internal\Message
* @type int $backoff_mode
* Output only. The pattern of how the wait time of the retry attempt is
* calculated.
- * @type string $phase_id
- * Output only. The phase ID of the phase that includes the job being retried.
- * @type string $job_id
- * Output only. The job ID for the Job to retry.
* @type array<\Google\Cloud\Deploy\V1\RetryAttempt>|\Google\Protobuf\Internal\RepeatedField $attempts
* Output only. Detail of a retry action.
* }
@@ -126,58 +110,6 @@ public function setBackoffMode($var)
return $this;
}
- /**
- * Output only. The phase ID of the phase that includes the job being retried.
- *
- * Generated from protobuf field string phase_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
- * @return string
- */
- public function getPhaseId()
- {
- return $this->phase_id;
- }
-
- /**
- * Output only. The phase ID of the phase that includes the job being retried.
- *
- * Generated from protobuf field string phase_id = 3 [(.google.api.field_behavior) = OUTPUT_ONLY];
- * @param string $var
- * @return $this
- */
- public function setPhaseId($var)
- {
- GPBUtil::checkString($var, True);
- $this->phase_id = $var;
-
- return $this;
- }
-
- /**
- * Output only. The job ID for the Job to retry.
- *
- * Generated from protobuf field string job_id = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
- * @return string
- */
- public function getJobId()
- {
- return $this->job_id;
- }
-
- /**
- * Output only. The job ID for the Job to retry.
- *
- * Generated from protobuf field string job_id = 4 [(.google.api.field_behavior) = OUTPUT_ONLY];
- * @param string $var
- * @return $this
- */
- public function setJobId($var)
- {
- GPBUtil::checkString($var, True);
- $this->job_id = $var;
-
- return $this;
- }
-
/**
* Output only. Detail of a retry action.
*