From 40eb038aaade7567671aa0fd49b202031c04114d Mon Sep 17 00:00:00 2001 From: Levi Blackstone Date: Mon, 19 Aug 2019 12:47:42 -0600 Subject: [PATCH] Address feedback --- pkg/gen/awaitComments.go | 6 ++++-- sdk/nodejs/apps/v1/Deployment.ts | 2 ++ sdk/nodejs/apps/v1/StatefulSet.ts | 2 ++ sdk/nodejs/apps/v1beta1/Deployment.ts | 2 ++ sdk/nodejs/apps/v1beta1/StatefulSet.ts | 2 ++ sdk/nodejs/apps/v1beta2/Deployment.ts | 2 ++ sdk/nodejs/apps/v1beta2/StatefulSet.ts | 2 ++ sdk/nodejs/core/v1/Pod.ts | 2 ++ sdk/nodejs/core/v1/Service.ts | 4 +++- sdk/nodejs/extensions/v1beta1/Deployment.ts | 2 ++ sdk/nodejs/extensions/v1beta1/Ingress.ts | 2 ++ sdk/nodejs/networking/v1beta1/Ingress.ts | 2 ++ sdk/python/pulumi_kubernetes/apps/v1/Deployment.py | 2 ++ sdk/python/pulumi_kubernetes/apps/v1/StatefulSet.py | 2 ++ sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py | 2 ++ sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py | 2 ++ sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py | 2 ++ sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py | 2 ++ sdk/python/pulumi_kubernetes/core/v1/Pod.py | 2 ++ sdk/python/pulumi_kubernetes/core/v1/Service.py | 4 +++- .../pulumi_kubernetes/extensions/v1beta1/Deployment.py | 2 ++ sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py | 2 ++ sdk/python/pulumi_kubernetes/networking/v1beta1/Ingress.py | 2 ++ 23 files changed, 50 insertions(+), 4 deletions(-) diff --git a/pkg/gen/awaitComments.go b/pkg/gen/awaitComments.go index f181abe195..68d6bdf0a8 100644 --- a/pkg/gen/awaitComments.go +++ b/pkg/gen/awaitComments.go @@ -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 { @@ -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'). diff --git a/sdk/nodejs/apps/v1/Deployment.ts b/sdk/nodejs/apps/v1/Deployment.ts index 594bd2fbf0..9a4604058a 100755 --- a/sdk/nodejs/apps/v1/Deployment.ts +++ b/sdk/nodejs/apps/v1/Deployment.ts @@ -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 { /** diff --git a/sdk/nodejs/apps/v1/StatefulSet.ts b/sdk/nodejs/apps/v1/StatefulSet.ts index dacb7c7d18..2b21cbc533 100755 --- a/sdk/nodejs/apps/v1/StatefulSet.ts +++ b/sdk/nodejs/apps/v1/StatefulSet.ts @@ -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 { /** diff --git a/sdk/nodejs/apps/v1beta1/Deployment.ts b/sdk/nodejs/apps/v1beta1/Deployment.ts index e70e72f996..7d15c89e79 100755 --- a/sdk/nodejs/apps/v1beta1/Deployment.ts +++ b/sdk/nodejs/apps/v1beta1/Deployment.ts @@ -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 { /** diff --git a/sdk/nodejs/apps/v1beta1/StatefulSet.ts b/sdk/nodejs/apps/v1beta1/StatefulSet.ts index 38847cb165..fd2ccfc94e 100755 --- a/sdk/nodejs/apps/v1beta1/StatefulSet.ts +++ b/sdk/nodejs/apps/v1beta1/StatefulSet.ts @@ -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 { /** diff --git a/sdk/nodejs/apps/v1beta2/Deployment.ts b/sdk/nodejs/apps/v1beta2/Deployment.ts index 4ebd16ba50..8b03b1f7a7 100755 --- a/sdk/nodejs/apps/v1beta2/Deployment.ts +++ b/sdk/nodejs/apps/v1beta2/Deployment.ts @@ -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 { /** diff --git a/sdk/nodejs/apps/v1beta2/StatefulSet.ts b/sdk/nodejs/apps/v1beta2/StatefulSet.ts index de0812a641..4a426cb4ca 100755 --- a/sdk/nodejs/apps/v1beta2/StatefulSet.ts +++ b/sdk/nodejs/apps/v1beta2/StatefulSet.ts @@ -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 { /** diff --git a/sdk/nodejs/core/v1/Pod.ts b/sdk/nodejs/core/v1/Pod.ts index 977edd0857..0bdb6e87fb 100755 --- a/sdk/nodejs/core/v1/Pod.ts +++ b/sdk/nodejs/core/v1/Pod.ts @@ -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 { /** diff --git a/sdk/nodejs/core/v1/Service.ts b/sdk/nodejs/core/v1/Service.ts index 079294364a..0f830b2d48 100755 --- a/sdk/nodejs/core/v1/Service.ts +++ b/sdk/nodejs/core/v1/Service.ts @@ -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'). @@ -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 { /** diff --git a/sdk/nodejs/extensions/v1beta1/Deployment.ts b/sdk/nodejs/extensions/v1beta1/Deployment.ts index f55988e86b..eafb6114f4 100755 --- a/sdk/nodejs/extensions/v1beta1/Deployment.ts +++ b/sdk/nodejs/extensions/v1beta1/Deployment.ts @@ -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 { /** diff --git a/sdk/nodejs/extensions/v1beta1/Ingress.ts b/sdk/nodejs/extensions/v1beta1/Ingress.ts index ca653beab8..fdafabf0db 100755 --- a/sdk/nodejs/extensions/v1beta1/Ingress.ts +++ b/sdk/nodejs/extensions/v1beta1/Ingress.ts @@ -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 { /** diff --git a/sdk/nodejs/networking/v1beta1/Ingress.ts b/sdk/nodejs/networking/v1beta1/Ingress.ts index f1200a95df..ca5a48eabc 100755 --- a/sdk/nodejs/networking/v1beta1/Ingress.ts +++ b/sdk/nodejs/networking/v1beta1/Ingress.ts @@ -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 { /** diff --git a/sdk/python/pulumi_kubernetes/apps/v1/Deployment.py b/sdk/python/pulumi_kubernetes/apps/v1/Deployment.py index 2d95d607e4..d75dd3b731 100755 --- a/sdk/python/pulumi_kubernetes/apps/v1/Deployment.py +++ b/sdk/python/pulumi_kubernetes/apps/v1/Deployment.py @@ -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): diff --git a/sdk/python/pulumi_kubernetes/apps/v1/StatefulSet.py b/sdk/python/pulumi_kubernetes/apps/v1/StatefulSet.py index 998d381cd5..244e2bf138 100755 --- a/sdk/python/pulumi_kubernetes/apps/v1/StatefulSet.py +++ b/sdk/python/pulumi_kubernetes/apps/v1/StatefulSet.py @@ -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): diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py b/sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py index c25a7e7c0b..8e928aba25 100755 --- a/sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py +++ b/sdk/python/pulumi_kubernetes/apps/v1beta1/Deployment.py @@ -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): diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py b/sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py index 9641bbc80b..440d647a52 100755 --- a/sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py +++ b/sdk/python/pulumi_kubernetes/apps/v1beta1/StatefulSet.py @@ -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): diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py b/sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py index d4a1e50b2b..d33c5300e3 100755 --- a/sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py +++ b/sdk/python/pulumi_kubernetes/apps/v1beta2/Deployment.py @@ -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): diff --git a/sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py b/sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py index fb9b9922eb..04fa3f3488 100755 --- a/sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py +++ b/sdk/python/pulumi_kubernetes/apps/v1beta2/StatefulSet.py @@ -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): diff --git a/sdk/python/pulumi_kubernetes/core/v1/Pod.py b/sdk/python/pulumi_kubernetes/core/v1/Pod.py index 0e8d5dacf4..0311a3f307 100755 --- a/sdk/python/pulumi_kubernetes/core/v1/Pod.py +++ b/sdk/python/pulumi_kubernetes/core/v1/Pod.py @@ -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): diff --git a/sdk/python/pulumi_kubernetes/core/v1/Service.py b/sdk/python/pulumi_kubernetes/core/v1/Service.py index 6241a9088e..6bb9a6cb01 100755 --- a/sdk/python/pulumi_kubernetes/core/v1/Service.py +++ b/sdk/python/pulumi_kubernetes/core/v1/Service.py @@ -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'). @@ -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): diff --git a/sdk/python/pulumi_kubernetes/extensions/v1beta1/Deployment.py b/sdk/python/pulumi_kubernetes/extensions/v1beta1/Deployment.py index b6fcb50b47..bc7e2b1e0e 100755 --- a/sdk/python/pulumi_kubernetes/extensions/v1beta1/Deployment.py +++ b/sdk/python/pulumi_kubernetes/extensions/v1beta1/Deployment.py @@ -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): diff --git a/sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py b/sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py index 949481a072..eac0597d87 100755 --- a/sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py +++ b/sdk/python/pulumi_kubernetes/extensions/v1beta1/Ingress.py @@ -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): diff --git a/sdk/python/pulumi_kubernetes/networking/v1beta1/Ingress.py b/sdk/python/pulumi_kubernetes/networking/v1beta1/Ingress.py index da9480c3a3..eca45daf5a 100755 --- a/sdk/python/pulumi_kubernetes/networking/v1beta1/Ingress.py +++ b/sdk/python/pulumi_kubernetes/networking/v1beta1/Ingress.py @@ -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):