Skip to content

Commit db307c4

Browse files
authored
Merge pull request #104 from kcp-ci-bot/cherry-pick-102-to-kcp-1.31.6
[kcp-1.31.6] 🐛 Fix groupnames in examples
2 parents f78b79a + cb47357 commit db307c4

File tree

55 files changed

+426
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+426
-114
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ lint: $(GOLANGCI_LINT)
9898
.PHONY: test
9999
test:
100100
go test ./...
101+
cd examples; go test ./...
101102

102103
# Note, running this locally if you have any modified files, even those that are not generated,
103104
# will result in an error. This target is mostly for CI jobs.

examples/go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
4040
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
4141
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
4242
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
43+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb h1:W11F/dp6NdUnHeB0SrpyWLiifRosu1qaMJvdFGGLXc0=
44+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb/go.mod h1:mEDD1K5BVUXJ4CP6wcJ0vZUf+7tbFMjkCFzBKsUNj18=
45+
github.com/kcp-dev/client-go v0.0.0-20230927101349-0416c830e3b1 h1:cyRhjhVSmcUqsMg0wh+DB/DjlpV58nhRpJYxRgCjayA=
46+
github.com/kcp-dev/client-go v0.0.0-20230927101349-0416c830e3b1/go.mod h1:XfQFbR0lb2SsNEiAcR0ktxzgjlcJQpiWLX+OHw3a5ac=
4347
github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU=
4448
github.com/kcp-dev/logicalcluster/v3 v3.0.5/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY=
4549
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

examples/pkg/apis/example/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ limitations under the License.
1515
*/
1616

1717
// +k8s:deepcopy-gen=package,register
18+
// +groupName=example.dev
1819
package example

examples/pkg/apis/example/v1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ limitations under the License.
1515
*/
1616

1717
// +k8s:deepcopy-gen=package,register
18+
// +groupName=example.dev
1819
package v1

examples/pkg/apis/example/v1alpha1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ limitations under the License.
1515
*/
1616

1717
// +k8s:deepcopy-gen=package,register
18+
// +groupName=example.dev
1819
package v1alpha1

examples/pkg/apis/example/v1beta1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ limitations under the License.
1515
*/
1616

1717
// +k8s:deepcopy-gen=package,register
18+
// +groupName=example.dev
1819
package v1beta1

examples/pkg/apis/example/v2/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ limitations under the License.
1515
*/
1616

1717
// +k8s:deepcopy-gen=package,register
18+
// +groupName=example.dev
1819
package v2

examples/pkg/apis/example3/register.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ limitations under the License.
1717
package example
1818

1919
const (
20-
GroupName = "example3.dev"
20+
GroupName = "example3.some.corp"
2121
)

examples/pkg/apis/existinginterfaces/register.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ limitations under the License.
1717
package existinginterfaces
1818

1919
const (
20-
GroupName = "existinginterfaces.dev"
20+
GroupName = "existinginterfaces.acme.corp"
2121
)

examples/pkg/apis/secondexample/v1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ limitations under the License.
1515
*/
1616

1717
// +k8s:deepcopy-gen=package,register
18+
// +groupName=secondexample.dev
1819
package v1

0 commit comments

Comments
 (0)