Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to 3.x release #564

Merged
merged 12 commits into from
Apr 20, 2021
Merged

Update dependencies to 3.x release #564

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
28c1000
Update dependencies to 3.x release
lblackstone Apr 19, 2021
9a3735f
Changelog
lblackstone Apr 19, 2021
5110922
Pull in codegen fix
lblackstone Apr 19, 2021
721d050
Fix test dep
lblackstone Apr 19, 2021
91695d8
Fix all test deps
lblackstone Apr 20, 2021
4837edf
More test mod fixes
lblackstone Apr 20, 2021
cd51a1b
Try again
lblackstone Apr 20, 2021
06157d4
Again
lblackstone Apr 20, 2021
a84fc6c
Update k8s client calls
lblackstone Apr 20, 2021
11f7ea5
Fix sync invoke for region
lblackstone Apr 20, 2021
3e812a6
Update node deps
lblackstone Apr 20, 2021
3201557
Changelog
lblackstone Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## Unreleased

- Upgrade Pulumi dependencies to 3.0 releases
[#548](https://github.com/pulumi/pulumi-eks/pull/564)

- Update wording for providerCredentialOpt errors
[#559](https://github.com/pulumi/pulumi-eks/pull/559)

Expand Down
6 changes: 3 additions & 3 deletions dotnet/Pulumi.Eks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Pulumi" Version="2.*" />
<PackageReference Include="Pulumi.Aws" Version="3.*" ExcludeAssets="contentFiles" />
<PackageReference Include="Pulumi.Kubernetes" Version="2.*" ExcludeAssets="contentFiles" />
<PackageReference Include="Pulumi" Version="3.*" />
<PackageReference Include="Pulumi.Aws" Version="4.*" ExcludeAssets="contentFiles" />
<PackageReference Include="Pulumi.Kubernetes" Version="3.*" ExcludeAssets="contentFiles" />
</ItemGroup>

<ItemGroup>
Expand Down
26 changes: 13 additions & 13 deletions provider/cmd/pulumi-gen-eks/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"path/filepath"

"github.com/pkg/errors"
dotnetgen "github.com/pulumi/pulumi/pkg/v2/codegen/dotnet"
gogen "github.com/pulumi/pulumi/pkg/v2/codegen/go"
pygen "github.com/pulumi/pulumi/pkg/v2/codegen/python"
"github.com/pulumi/pulumi/pkg/v2/codegen/schema"
"github.com/pulumi/pulumi/sdk/v2/go/common/util/contract"
dotnetgen "github.com/pulumi/pulumi/pkg/v3/codegen/dotnet"
gogen "github.com/pulumi/pulumi/pkg/v3/codegen/go"
pygen "github.com/pulumi/pulumi/pkg/v3/codegen/python"
"github.com/pulumi/pulumi/pkg/v3/codegen/schema"
"github.com/pulumi/pulumi/sdk/v3/go/common/util/contract"
)

const Tool = "pulumi-gen-eks"
Expand Down Expand Up @@ -80,8 +80,8 @@ func main() {
}

const (
awsVersion = "v3.25.1"
k8sVersion = "v2.7.7"
awsVersion = "v4.0.0"
k8sVersion = "v3.0.0"
)

func awsRef(ref string) string {
Expand Down Expand Up @@ -1183,16 +1183,16 @@ func generateSchema() schema.PackageSpec {
Language: map[string]json.RawMessage{
"csharp": rawMessage(map[string]interface{}{
"packageReferences": map[string]string{
"Pulumi": "2.*",
"Pulumi.Aws": "3.*",
"Pulumi.Kubernetes": "2.*",
"Pulumi": "3.*",
"Pulumi.Aws": "4.*",
"Pulumi.Kubernetes": "3.*",
},
}),
"python": rawMessage(map[string]interface{}{
"requires": map[string]string{
"pulumi": ">=2.15.5,<3.0.0",
"pulumi-aws": ">=3.18.0,<4.0.0",
"pulumi-kubernetes": ">=2.7.3,<3.0.0",
"pulumi": ">=3.0.0,<4.0.0",
"pulumi-aws": ">=4.0.0,<5.0.0",
"pulumi-kubernetes": ">=3.0.0,<4.0.0",
},
"usesIOClasses": true,
// TODO: Embellish the readme
Expand Down
112 changes: 56 additions & 56 deletions provider/cmd/pulumi-resource-eks/schema.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/pkg/errors v0.9.1
github.com/pulumi/pulumi/pkg/v2 v2.21.3-0.20210222163316-277dee6cc14d
github.com/pulumi/pulumi/sdk/v2 v2.21.3-0.20210222163316-277dee6cc14d
github.com/pulumi/pulumi/pkg/v3 v3.0.0
github.com/pulumi/pulumi/sdk/v3 v3.0.0
github.com/spf13/pflag v1.0.5 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
)
295 changes: 208 additions & 87 deletions provider/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions python/pulumi_eks/_inputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import warnings
import pulumi
import pulumi.runtime
from typing import Any, Mapping, Optional, Sequence, Union
from . import _utilities, _tables
from typing import Any, Mapping, Optional, Sequence, Union, overload
from . import _utilities
from .vpc_cni import VpcCni
import pulumi_aws
import pulumi_kubernetes
Expand Down Expand Up @@ -533,7 +533,7 @@ def __init__(__self__, *,
vpc_id: pulumi.Input[str],
aws_provider: Optional[pulumi.Input['pulumi_aws.Provider']] = None,
eks_node_access: Optional[pulumi.Input['pulumi_kubernetes.core.v1.ConfigMap']] = None,
encryption_config: Optional[pulumi.Input['pulumi_aws.eks.ClusterEncryptionConfigArgs']] = None,
encryption_config: Optional[pulumi.Input['pulumi_aws.eks.ClusterEncryptionConfig']] = None,
justinvp marked this conversation as resolved.
Show resolved Hide resolved
fargate_profile: Optional[pulumi.Input['pulumi_aws.eks.FargateProfile']] = None,
kubeconfig: Optional[Any] = None,
node_security_group_tags: Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]] = None,
Expand Down Expand Up @@ -671,11 +671,11 @@ def eks_node_access(self, value: Optional[pulumi.Input['pulumi_kubernetes.core.v

@property
@pulumi.getter(name="encryptionConfig")
def encryption_config(self) -> Optional[pulumi.Input['pulumi_aws.eks.ClusterEncryptionConfigArgs']]:
def encryption_config(self) -> Optional[pulumi.Input['pulumi_aws.eks.ClusterEncryptionConfig']]:
return pulumi.get(self, "encryption_config")

@encryption_config.setter
def encryption_config(self, value: Optional[pulumi.Input['pulumi_aws.eks.ClusterEncryptionConfigArgs']]):
def encryption_config(self, value: Optional[pulumi.Input['pulumi_aws.eks.ClusterEncryptionConfig']]):
pulumi.set(self, "encryption_config", value)

@property
Expand Down Expand Up @@ -794,12 +794,12 @@ def role(self, value: pulumi.Input['pulumi_aws.iam.Role']):
class FargateProfileArgs:
def __init__(__self__, *,
pod_execution_role_arn: Optional[pulumi.Input[str]] = None,
selectors: Optional[pulumi.Input[Sequence[pulumi.Input['pulumi_aws.eks.FargateProfileSelectorArgs']]]] = None,
selectors: Optional[pulumi.Input[Sequence[pulumi.Input['pulumi_aws.eks.FargateProfileSelector']]]] = None,
subnet_ids: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None):
"""
Defines how Kubernetes pods are executed in Fargate. See aws.eks.FargateProfileArgs for reference.
:param pulumi.Input[str] pod_execution_role_arn: Specify a custom role to use for executing pods in Fargate. Defaults to creating a new role with the `arn:aws:iam::aws:policy/AmazonEKSFargatePodExecutionRolePolicy` policy attached.
:param pulumi.Input[Sequence[pulumi.Input['pulumi_aws.eks.FargateProfileSelectorArgs']]] selectors: Specify the namespace and label selectors to use for launching pods into Fargate.
:param pulumi.Input[Sequence[pulumi.Input['pulumi_aws.eks.FargateProfileSelector']]] selectors: Specify the namespace and label selectors to use for launching pods into Fargate.
:param pulumi.Input[Sequence[pulumi.Input[str]]] subnet_ids: Specify the subnets in which to execute Fargate tasks for pods. Defaults to the private subnets associated with the cluster.
"""
if pod_execution_role_arn is not None:
Expand All @@ -823,14 +823,14 @@ def pod_execution_role_arn(self, value: Optional[pulumi.Input[str]]):

@property
@pulumi.getter
def selectors(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['pulumi_aws.eks.FargateProfileSelectorArgs']]]]:
def selectors(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['pulumi_aws.eks.FargateProfileSelector']]]]:
"""
Specify the namespace and label selectors to use for launching pods into Fargate.
"""
return pulumi.get(self, "selectors")

@selectors.setter
def selectors(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['pulumi_aws.eks.FargateProfileSelectorArgs']]]]):
def selectors(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['pulumi_aws.eks.FargateProfileSelector']]]]):
pulumi.set(self, "selectors", value)

@property
Expand Down Expand Up @@ -971,7 +971,7 @@ def __init__(__self__, *,
encrypted: Optional[pulumi.Input[bool]] = None,
iops_per_gb: Optional[pulumi.Input[int]] = None,
kms_key_id: Optional[pulumi.Input[str]] = None,
metadata: Optional[pulumi.Input['pulumi_kubernetes.meta.v1.ObjectMetaArgs']] = None,
metadata: Optional[pulumi.Input['pulumi_kubernetes.meta.v1.ObjectMeta']] = None,
mount_options: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
reclaim_policy: Optional[pulumi.Input[str]] = None,
volume_binding_mode: Optional[pulumi.Input[str]] = None,
Expand All @@ -988,7 +988,7 @@ def __init__(__self__, *,
:param pulumi.Input[bool] encrypted: Denotes whether the EBS volume should be encrypted.
:param pulumi.Input[int] iops_per_gb: I/O operations per second per GiB for "io1" volumes. The AWS volume plugin multiplies this with the size of a requested volume to compute IOPS of the volume and caps the result at 20,000 IOPS.
:param pulumi.Input[str] kms_key_id: The full Amazon Resource Name of the key to use when encrypting the volume. If none is supplied but encrypted is true, a key is generated by AWS.
:param pulumi.Input['pulumi_kubernetes.meta.v1.ObjectMetaArgs'] metadata: Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
:param pulumi.Input['pulumi_kubernetes.meta.v1.ObjectMeta'] metadata: Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
:param pulumi.Input[Sequence[pulumi.Input[str]]] mount_options: Dynamically provisioned PersistentVolumes of this storage class are created with these mountOptions, e.g. ["ro", "soft"]. Not validated - mount of the PVs will simply fail if one is invalid.
:param pulumi.Input[str] reclaim_policy: Dynamically provisioned PersistentVolumes of this storage class are created with this reclaimPolicy. Defaults to Delete.
:param pulumi.Input[str] volume_binding_mode: VolumeBindingMode indicates how PersistentVolumeClaims should be provisioned and bound. When unset, VolumeBindingImmediate is used. This field is alpha-level and is only honored by servers that enable the VolumeScheduling feature.
Expand Down Expand Up @@ -1094,14 +1094,14 @@ def kms_key_id(self, value: Optional[pulumi.Input[str]]):

@property
@pulumi.getter
def metadata(self) -> Optional[pulumi.Input['pulumi_kubernetes.meta.v1.ObjectMetaArgs']]:
def metadata(self) -> Optional[pulumi.Input['pulumi_kubernetes.meta.v1.ObjectMeta']]:
"""
Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
"""
return pulumi.get(self, "metadata")

@metadata.setter
def metadata(self, value: Optional[pulumi.Input['pulumi_kubernetes.meta.v1.ObjectMetaArgs']]):
def metadata(self, value: Optional[pulumi.Input['pulumi_kubernetes.meta.v1.ObjectMeta']]):
pulumi.set(self, "metadata", value)

@property
Expand Down
Loading