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.

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

chore: update to controller-tools 0.14.0 #1537

Merged

Conversation

barney-s
Copy link
Collaborator

Change description

chore: update to controller-tools 0.14.0
same as #1473

Doing it on latest baseline and ran tests

Tests you have done

...
...
 scenario.go:227: Verifying output
    scenario.go:228: Checking existence of objects ["ConfigMap/team-a/proj-a" "Plan/team-a/pconfigs-team-a-config"] on "composition-e2e-0"
    simple_test.go:73: Adding proj-b entry to Facade
    simple_test.go:80: Applying patch map["op":"add" "path":"/spec/projects/-" "value":"proj-b"] to "PConfig/team-a/team-a-config" on "composition-e2e-0"
    simple_test.go:84: Checking existence of objects ["ConfigMap/team-a/proj-b"] on "composition-e2e-0"
    scenario.go:243: Cleaning up input
    scenario.go:245: Deleting object "CustomResourceDefinition/pconfigs.facade.foocorp.com" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "ClusterRole/composition-facade-foocorp" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "ClusterRoleBinding/composition-facade-foocorp" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "Namespace/team-a" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "Context/team-a/context" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "PConfig/team-a/team-a-config" on cluster "composition-e2e-0"
    scenario.go:245: WARN "PConfig/team-a/team-a-config" not found on cluster "composition-e2e-0": the server could not find the requested resource (delete pconfigs.facade.foocorp.com team-a-config)
    scenario.go:247: Checking absence of objects ["CustomResourceDefinition/pconfigs.facade.foocorp.com" "ClusterRole/composition-facade-foocorp" "ClusterRoleBinding/composition-facade-foocorp" "Composition/default/projectconfigmap" "Namespace/team-a" "Context/team-a/context" "PConfig/team-a/team-a-config"] on "composition-e2e-0"
    scenario.go:254: Cleaning up output
    scenario.go:256: Deleting object "ConfigMap/team-a/proj-a" on cluster "composition-e2e-0"
    scenario.go:256: WARN "ConfigMap/team-a/proj-a" not found on cluster "composition-e2e-0": configmaps "proj-a" not found
    scenario.go:256: Deleting object "Plan/team-a/pconfigs-team-a-config" on cluster "composition-e2e-0"
    scenario.go:256: WARN "Plan/team-a/pconfigs-team-a-config" not found on cluster "composition-e2e-0": plans.composition.google.com "pconfigs-team-a-config" not found
    scenario.go:258: Checking absence of objects ["ConfigMap/team-a/proj-a" "Plan/team-a/pconfigs-team-a-config"] on "composition-e2e-0"
    cluster.go:123: Released cluster composition-e2e-0
--- PASS: TestSimpleCompositionAddFacadeField (23.29s)
=== RUN   TestSimpleCompositionDeleteFacadeField
    cluster.go:117: Reserved cluster composition-e2e-0
    scenario.go:211: Applying input
    scenario.go:162: Creating object "CustomResourceDefinition/pconfigs.facade.foocorp.com" on cluster "composition-e2e-0"
    scenario.go:175: Creating object "Namespace/team-a" on cluster "composition-e2e-0"
    scenario.go:188: Creating object "ClusterRole/composition-facade-foocorp" on cluster "composition-e2e-0"
    scenario.go:188: Creating object "ClusterRoleBinding/composition-facade-foocorp" on cluster "composition-e2e-0"
    scenario.go:188: Creating object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:188: Creating object "Context/team-a/context" on cluster "composition-e2e-0"
    scenario.go:188: Creating object "PConfig/team-a/team-a-config" on cluster "composition-e2e-0"
    scenario.go:219: Verifying input
    scenario.go:220: Checking existence of objects ["CustomResourceDefinition/pconfigs.facade.foocorp.com" "ClusterRole/composition-facade-foocorp" "ClusterRoleBinding/composition-facade-foocorp" "Composition/default/projectconfigmap" "Namespace/team-a" "Context/team-a/context" "PConfig/team-a/team-a-config"] on "composition-e2e-0"
    scenario.go:227: Verifying output
    scenario.go:228: Checking existence of objects ["ConfigMap/team-a/proj-a" "ConfigMap/team-a/proj-b" "Plan/team-a/pconfigs-team-a-config"] on "composition-e2e-0"
    simple_test.go:97: Removing proj-b entry from Facade
    simple_test.go:103: Applying patch map["op":"remove" "path":"/spec/projects/1"] to "PConfig/team-a/team-a-config" on "composition-e2e-0"
    simple_test.go:107: Checking absence of objects ["ConfigMap/team-a/proj-b"] on "composition-e2e-0"
    scenario.go:243: Cleaning up input
    scenario.go:245: Deleting object "CustomResourceDefinition/pconfigs.facade.foocorp.com" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "ClusterRole/composition-facade-foocorp" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "ClusterRoleBinding/composition-facade-foocorp" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "Namespace/team-a" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "Context/team-a/context" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "PConfig/team-a/team-a-config" on cluster "composition-e2e-0"
    scenario.go:245: WARN "PConfig/team-a/team-a-config" not found on cluster "composition-e2e-0": the server could not find the requested resource (delete pconfigs.facade.foocorp.com team-a-config)
    scenario.go:247: Checking absence of objects ["CustomResourceDefinition/pconfigs.facade.foocorp.com" "ClusterRole/composition-facade-foocorp" "ClusterRoleBinding/composition-facade-foocorp" "Composition/default/projectconfigmap" "Namespace/team-a" "Context/team-a/context" "PConfig/team-a/team-a-config"] on "composition-e2e-0"
    scenario.go:254: Cleaning up output
    scenario.go:256: Deleting object "ConfigMap/team-a/proj-a" on cluster "composition-e2e-0"
    scenario.go:256: WARN "ConfigMap/team-a/proj-a" not found on cluster "composition-e2e-0": configmaps "proj-a" not found
    scenario.go:256: Deleting object "ConfigMap/team-a/proj-b" on cluster "composition-e2e-0"
    scenario.go:256: WARN "ConfigMap/team-a/proj-b" not found on cluster "composition-e2e-0": configmaps "proj-b" not found
    scenario.go:256: Deleting object "Plan/team-a/pconfigs-team-a-config" on cluster "composition-e2e-0"
    scenario.go:256: WARN "Plan/team-a/pconfigs-team-a-config" not found on cluster "composition-e2e-0": plans.composition.google.com "pconfigs-team-a-config" not found
    scenario.go:258: Checking absence of objects ["ConfigMap/team-a/proj-a" "ConfigMap/team-a/proj-b" "Plan/team-a/pconfigs-team-a-config"] on "composition-e2e-0"
    cluster.go:123: Released cluster composition-e2e-0
--- PASS: TestSimpleCompositionDeleteFacadeField (27.34s)
=== RUN   TestSimpleCompositionStatusValidation
    cluster.go:117: Reserved cluster composition-e2e-0
    scenario.go:211: Applying input
    scenario.go:162: Creating object "CustomResourceDefinition/pconfigs.facade.foocorp.com" on cluster "composition-e2e-0"
    scenario.go:188: Creating object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:219: Verifying input
    scenario.go:220: Checking existence of objects ["CustomResourceDefinition/pconfigs.facade.foocorp.com" "Composition/default/projectconfigmap"] on "composition-e2e-0"
    simple_test.go:119: Checking condition "ValidationFailed" present in object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    client.go:285: Has condition [ValidationFailed, ExpanderValidationFailed, .spec.expanders[0] missing name]
    scenario.go:200: Loading manifests from: fixed_composition.yaml
    scenario.go:188: Creating object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:188: Updating already present "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    simple_test.go:127: Checking condition "ValidationFailed" not present in object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:243: Cleaning up input
    scenario.go:245: Deleting object "CustomResourceDefinition/pconfigs.facade.foocorp.com" on cluster "composition-e2e-0"
    scenario.go:245: Deleting object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:247: Checking absence of objects ["CustomResourceDefinition/pconfigs.facade.foocorp.com" "Composition/default/projectconfigmap"] on "composition-e2e-0"
    scenario.go:266: Cleaning up intermediate Manifests: fixed_composition.yaml
    scenario.go:268: Deleting object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:268: WARN "Composition/default/projectconfigmap" not found on cluster "composition-e2e-0": compositions.composition.google.com "projectconfigmap" not found
    scenario.go:270: Checking absence of objects ["Composition/default/projectconfigmap"] on "composition-e2e-0"
    scenario.go:254: Cleaning up output
    scenario.go:258: Checking absence of objects [] on "composition-e2e-0"
    cluster.go:123: Released cluster composition-e2e-0
--- PASS: TestSimpleCompositionStatusValidation (6.12s)
=== RUN   TestSimpleCompositionStatusFacadeCRDMissing
    cluster.go:117: Reserved cluster composition-e2e-0
    scenario.go:211: Applying input
    scenario.go:188: Creating object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:219: Verifying input
    scenario.go:220: Checking existence of objects ["Composition/default/projectconfigmap"] on "composition-e2e-0"
    simple_test.go:139: Checking condition "Error" present in object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    client.go:285: Has condition [Error, MissingFacadeCRD, CustomResourceDefinition.apiextensions.k8s.io "pconfigs.facade.foocorp.com" not found]
    scenario.go:200: Loading manifests from: facade_crd.yaml
    scenario.go:162: Creating object "CustomResourceDefinition/pconfigs.facade.foocorp.com" on cluster "composition-e2e-0"
    simple_test.go:147: Checking condition "Error" not present in object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:243: Cleaning up input
    scenario.go:245: Deleting object "Composition/default/projectconfigmap" on cluster "composition-e2e-0"
    scenario.go:247: Checking absence of objects ["Composition/default/projectconfigmap"] on "composition-e2e-0"
    scenario.go:266: Cleaning up intermediate Manifests: facade_crd.yaml
    scenario.go:268: Deleting object "CustomResourceDefinition/pconfigs.facade.foocorp.com" on cluster "composition-e2e-0"
    scenario.go:270: Checking absence of objects ["CustomResourceDefinition/pconfigs.facade.foocorp.com"] on "composition-e2e-0"
    scenario.go:254: Cleaning up output
    scenario.go:258: Checking absence of objects [] on "composition-e2e-0"
    cluster.go:123: Released cluster composition-e2e-0
--- PASS: TestSimpleCompositionStatusFacadeCRDMissing (4.09s)
PASS
ok      google.com/composition/tests/testcases  200.030s

@barney-s
Copy link
Collaborator Author

/assign @justinsb
/assign @acpana

@barney-s
Copy link
Collaborator Author

@justinsb -

make generate
experiments/compoistions/composition $ go run sigs.k8s.io/controller-tools/cmd/[email protected] object:headerFile="hack/boilerplate.go.txt" paths="./..."

is at odds with

$ go run -mod=readonly golang.org/x/tools/cmd/goimports@latest -w pkg cmd scripts tests config/tests experiments

They seem to conflict on how the the import "k8s.io/apimachinery/pkg/apis/meta/v1" should be formatted.

@barney-s barney-s force-pushed the controller_tools_0_14_0 branch 2 times, most recently from 8250bd7 to db0f13d Compare April 15, 2024 17:15
@justinsb
Copy link
Collaborator

Thanks @barney-s

/approve
/lgtm

@barney-s barney-s force-pushed the controller_tools_0_14_0 branch from db0f13d to e243a08 Compare April 15, 2024 20:36
@google-oss-prow google-oss-prow bot removed the lgtm label Apr 15, 2024
@justinsb
Copy link
Collaborator

/approve
/lgtm

@google-oss-prow google-oss-prow bot added the lgtm label Apr 15, 2024
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justinsb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@google-oss-prow google-oss-prow bot merged commit e765418 into GoogleCloudPlatform:master Apr 16, 2024
8 checks passed
@barney-s barney-s deleted the controller_tools_0_14_0 branch May 14, 2024 22:49
@yuwenma yuwenma added this to the 1.118 milestone Oct 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants