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

Replace negz/provider-nop with crossplane/provider-nop #23

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace negz/provider-nop with crossplane/provider-nop #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions crossplane/apiextensions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,13 +453,11 @@ func TestCompositeResource(t *testing.T) {
t.Fatalf("Create client: %v", err)
}

// TODO(negz): Use the other provider-nop from contrib once it's ready.
// https://github.com/crossplane-contrib/provider-nop
prv := &pkgv1.Provider{
ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName},
Spec: pkgv1.ProviderSpec{
PackageSpec: pkgv1.PackageSpec{
Package: "negz/provider-nop:v0.1.0",
Package: "crossplane/provider-nop:main",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we cut a release of provider-nop we can pin to? I can take care of doing that, since I believe it will require adding some secrets to the provider-nop GitHub repo.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That will be great. Thanks!

IgnoreCrossplaneConstraints: pointer.BoolPtr(true),
},
},
Expand Down Expand Up @@ -686,6 +684,20 @@ func TestCompositeResource(t *testing.T) {
"apiVersion": "nop.crossplane.io/v1alpha1",
"kind": "NopResource",
"spec": {
"forProvider": {
"conditionAfter": [
{
"conditionType": "Ready",
"conditionStatus": "True",
"time": "0s"
},
{
"conditionType": "Synced",
"conditionStatus": "True",
"time": "0s"
}
]
},
"writeConnectionSecretToRef": {
"namespace": "%s"
}
Expand Down
3 changes: 1 addition & 2 deletions crossplane/configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ func TestConfiguration(t *testing.T) {
},
}

// The crossplane-conformance provider depends on negz/provider-nop.
prv := &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "negz-provider-nop"}}
prv := &pkgv1.Provider{ObjectMeta: metav1.ObjectMeta{Name: "crossplane-provider-nop"}}

if err := kube.Create(ctx, cfg); err != nil {
t.Fatalf("Create configuration %q: %v", cfg.GetName(), err)
Expand Down
4 changes: 1 addition & 3 deletions crossplane/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@ func TestProvider(t *testing.T) {
t.Fatalf("Create client: %v", err)
}

// TODO(negz): Use the other provider-nop from contrib once it's ready.
// https://github.com/crossplane-contrib/provider-nop
prv := &pkgv1.Provider{
ObjectMeta: metav1.ObjectMeta{Name: internal.SuiteName},
Spec: pkgv1.ProviderSpec{
PackageSpec: pkgv1.PackageSpec{
Package: "negz/provider-nop:v0.1.0",
Package: "crossplane/provider-nop:main",
IgnoreCrossplaneConstraints: pointer.BoolPtr(true),
},
},
Expand Down
4 changes: 2 additions & 2 deletions testdata/configuration/crossplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ spec:
crossplane:
version: ">=v1.1.0"
dependsOn:
- provider: negz/provider-nop
version: "v0.1.0"
- provider: crossplane/provider-nop
version: "main"