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

Jump to bottom

[sdk/dotnet] Unpin System.Collections.Immutable dependency #1621

Merged
merged 2 commits into from
Jun 17, 2021
Merged

[sdk/dotnet] Unpin System.Collections.Immutable dependency #1621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99faedc
[sdk/dotnet] Unpin System.Collections.Immutable dependency
lblackstone Jun 17, 2021
125ddb0
Disable flaky test
lblackstone Jun 17, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- [sdk/go] `ConfigGroup` now respects explicit provider instances when parsing YAML. (https://github.com/pulumi/pulumi-kubernetes/pull/1601)
- Fix hanging updates for deployment await logic (https://github.com/pulumi/pulumi-kubernetes/pull/1596)
- Fix auto-naming bug for computed names (https://github.com/pulumi/pulumi-kubernetes/pull/1618)
- [sdk/dotnet] Unpin System.Collections.Immutable dependency (https://github.com/pulumi/pulumi-kubernetes/pull/1621)

## 3.3.1 (June 8, 2021)

Expand Down
3 changes: 1 addition & 2 deletions provider/cmd/pulumi-resource-kubernetes/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42344,8 +42344,7 @@
},
"packageReferences": {
"Glob": "1.1.5",
"Pulumi": "3.*",
"System.Collections.Immutable": "1.6.0"
"Pulumi": "3.*"
}
},
"go": {
Expand Down
1 change: 0 additions & 1 deletion provider/pkg/gen/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ func PulumiSchema(swagger map[string]interface{}) pschema.PackageSpec {
"packageReferences": map[string]string{
"Glob": "1.1.5",
"Pulumi": "3.*",
"System.Collections.Immutable": "1.6.0",
},
"namespaces": csharpNamespaces,
"compatibility": kubernetes20,
Expand Down
1 change: 0 additions & 1 deletion sdk/dotnet/Pulumi.Kubernetes.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<ItemGroup>
<PackageReference Include="Glob" Version="1.1.5" />
<PackageReference Include="Pulumi" Version="3.*" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
</ItemGroup>

<ItemGroup>
Expand Down
54 changes: 26 additions & 28 deletions tests/sdk/nodejs/nodejs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@ package test
import (
b64 "encoding/base64"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"os"
"path/filepath"
"strings"
"testing"
"time"

"github.com/pulumi/pulumi-kubernetes/provider/v3/pkg/openapi"
"github.com/pulumi/pulumi-kubernetes/tests/v3"
Expand Down Expand Up @@ -536,31 +533,32 @@ func TestGet(t *testing.T) {
integration.ProgramTest(t, &test)
}

func TestIstio(t *testing.T) {
test := baseOptions.With(integration.ProgramTestOptions{
Dir: filepath.Join("istio", "step1"),
Quick: true,
SkipRefresh: true,
ExtraRuntimeValidation: func(t *testing.T, stackInfo integration.RuntimeValidationStackInfo) {
frontend := stackInfo.Outputs["frontendIp"].(string)

// Retry the GET on the Istio gateway repeatedly. Istio doesn't publish `.status` on any
// of its CRDs, so this is as reliable as we can be right now.
for i := 1; i < 10; i++ {
req, err := http.Get(fmt.Sprintf("http://%s", frontend))
if err != nil {
fmt.Printf("Request to Istio gateway failed: %v\n", err)
time.Sleep(time.Second * 10)
} else if req.StatusCode == 200 {
return
}
}

assert.Fail(t, "Maximum Istio gateway request retries exceeded")
},
})
integration.ProgramTest(t, &test)
}
// TODO(lblackstone): Disable Istio test until https://github.com/pulumi/pulumi-kubernetes/issues/1622 is fixed.
//func TestIstio(t *testing.T) {
// test := baseOptions.With(integration.ProgramTestOptions{
// Dir: filepath.Join("istio", "step1"),
// Quick: true,
// SkipRefresh: true,
// ExtraRuntimeValidation: func(t *testing.T, stackInfo integration.RuntimeValidationStackInfo) {
// frontend := stackInfo.Outputs["frontendIp"].(string)
//
// // Retry the GET on the Istio gateway repeatedly. Istio doesn't publish `.status` on any
// // of its CRDs, so this is as reliable as we can be right now.
// for i := 1; i < 10; i++ {
// req, err := http.Get(fmt.Sprintf("http://%s", frontend))
// if err != nil {
// fmt.Printf("Request to Istio gateway failed: %v\n", err)
// time.Sleep(time.Second * 10)
// } else if req.StatusCode == 200 {
// return
// }
// }
//
// assert.Fail(t, "Maximum Istio gateway request retries exceeded")
// },
// })
// integration.ProgramTest(t, &test)
//}

func TestKustomize(t *testing.T) {
test := baseOptions.With(integration.ProgramTestOptions{
Expand Down