Skip to content

Commit

Permalink
Address feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
lblackstone committed Aug 19, 2019
1 parent 4b6804e commit 40eb038
Show file tree
Hide file tree
Showing 23 changed files with 50 additions and 4 deletions.
6 changes: 4 additions & 2 deletions pkg/gen/awaitComments.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import (
)

func timeoutComment(kind kinds.Kind) string {
const timeoutOverride = `setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.`
const timeoutOverride = `setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.`

timeout := func(kind kinds.Kind) string {
switch kind {
Expand Down Expand Up @@ -86,7 +88,7 @@ Or (for Jobs): The Pod succeeded ('.status.phase' set to "Succeeded").
case kinds.Service:
comment += `
1. Service object exists.
2. Related Endpoint objects are created. Each time we get an update, wait ~5-10 seconds
2. Related Endpoint objects are created. Each time we get an update, wait 10 seconds
for any stragglers.
3. The endpoints objects target some number of living objects (unless the Service is
an "empty headless" Service [1] or a Service with '.spec.type: ExternalName').
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/apps/v1/Deployment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import { getVersion } from "../../version";
* If the Deployment has not reached a Ready state after 5 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class Deployment extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/apps/v1/StatefulSet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import { getVersion } from "../../version";
* If the StatefulSet has not reached a Ready state after 5 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class StatefulSet extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/apps/v1beta1/Deployment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import { getVersion } from "../../version";
* If the Deployment has not reached a Ready state after 5 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class Deployment extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/apps/v1beta1/StatefulSet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import { getVersion } from "../../version";
* If the StatefulSet has not reached a Ready state after 5 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class StatefulSet extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/apps/v1beta2/Deployment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import { getVersion } from "../../version";
* If the Deployment has not reached a Ready state after 5 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class Deployment extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/apps/v1beta2/StatefulSet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import { getVersion } from "../../version";
* If the StatefulSet has not reached a Ready state after 5 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class StatefulSet extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/core/v1/Pod.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import { getVersion } from "../../version";
* If the Pod has not reached a Ready state after 5 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class Pod extends pulumi.CustomResource {
/**
Expand Down
4 changes: 3 additions & 1 deletion sdk/nodejs/core/v1/Service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { getVersion } from "../../version";
* The following conditions are used to determine whether the resource creation has
* succeeded or failed:
* 1. Service object exists.
* 2. Related Endpoint objects are created. Each time we get an update, wait ~5-10 seconds
* 2. Related Endpoint objects are created. Each time we get an update, wait 10 seconds
* for any stragglers.
* 3. The endpoints objects target some number of living objects (unless the Service is
* an "empty headless" Service [1] or a Service with '.spec.type: ExternalName').
Expand All @@ -27,6 +27,8 @@ import { getVersion } from "../../version";
* If the Service has not reached a Ready state after 10 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class Service extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/extensions/v1beta1/Deployment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import { getVersion } from "../../version";
* If the Deployment has not reached a Ready state after 5 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class Deployment extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/extensions/v1beta1/Ingress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ import { getVersion } from "../../version";
* If the Ingress has not reached a Ready state after 10 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class Ingress extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/nodejs/networking/v1beta1/Ingress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import { getVersion } from "../../version";
* If the Ingress has not reached a Ready state after 10 minutes, it will
* time out and mark the resource update as Failed. You can override the default timeout value
* by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
* This approach will be deprecated in favor of customTimeouts. See
* https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
*/
export class Ingress extends pulumi.CustomResource {
/**
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/apps/v1/Deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class Deployment(pulumi.CustomResource):
If the Deployment has not reached a Ready state after 5 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/apps/v1/StatefulSet.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class StatefulSet(pulumi.CustomResource):
If the StatefulSet has not reached a Ready state after 5 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ class Deployment(pulumi.CustomResource):
If the Deployment has not reached a Ready state after 5 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ class StatefulSet(pulumi.CustomResource):
If the StatefulSet has not reached a Ready state after 5 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ class Deployment(pulumi.CustomResource):
If the Deployment has not reached a Ready state after 5 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ class StatefulSet(pulumi.CustomResource):
If the StatefulSet has not reached a Ready state after 5 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/core/v1/Pod.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ class Pod(pulumi.CustomResource):
If the Pod has not reached a Ready state after 5 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
4 changes: 3 additions & 1 deletion sdk/python/pulumi_kubernetes/core/v1/Service.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Service(pulumi.CustomResource):
The following conditions are used to determine whether the resource creation has
succeeded or failed:
1. Service object exists.
2. Related Endpoint objects are created. Each time we get an update, wait ~5-10 seconds
2. Related Endpoint objects are created. Each time we get an update, wait 10 seconds
for any stragglers.
3. The endpoints objects target some number of living objects (unless the Service is
an "empty headless" Service [1] or a Service with '.spec.type: ExternalName').
Expand All @@ -33,6 +33,8 @@ class Service(pulumi.CustomResource):
If the Service has not reached a Ready state after 10 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/extensions/v1beta1/Deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ class Deployment(pulumi.CustomResource):
If the Deployment has not reached a Ready state after 5 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ class Ingress(pulumi.CustomResource):
If the Ingress has not reached a Ready state after 10 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down
2 changes: 2 additions & 0 deletions sdk/python/pulumi_kubernetes/networking/v1beta1/Ingress.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ class Ingress(pulumi.CustomResource):
If the Ingress has not reached a Ready state after 10 minutes, it will
time out and mark the resource update as Failed. You can override the default timeout value
by setting 'pulumi.com/timeoutSeconds' as a '.metadata.annotation' on the resource.
This approach will be deprecated in favor of customTimeouts. See
https://github.com/pulumi/pulumi-kubernetes/issues/672 for details.
"""

def __init__(self, resource_name, opts=None, metadata=None, spec=None, status=None, __name__=None, __opts__=None):
Expand Down

0 comments on commit 40eb038

Please sign in to comment.