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 controller-gen, fix make test #581

Merged
merged 2 commits into from
May 10, 2024
Merged

Update controller-gen, fix make test #581

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4239095
Update controller-gen, fix `make test`
blampe May 10, 2024
8b95918
also run unit tests...
blampe May 10, 2024
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 @@ -2,6 +2,7 @@ CHANGELOG
=========

## HEAD (unreleased)
- Regenerate CRDs with controller-gen v0.15.0.

## 1.15.0 (2024-04-12)
- Clean up stale workspace directories and don't treat them as a crude lock. [#552](https://github.com/pulumi/pulumi-kubernetes-operator/pull/552)
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ install-crds:
codegen: install-controller-gen install-crdoc generate-k8s generate-crds generate-crdocs

install-controller-gen:
@echo "Installing controller-gen to GOPATH/bin"; pushd /tmp >& /dev/null && go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2 ; popd >& /dev/null
@echo "Installing controller-gen to GOPATH/bin"; pushd /tmp >& /dev/null && go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 ; popd >& /dev/null

install-crdoc:
@echo "Installing crdoc to go GOPATH/bin"; pushd /tmp >& /dev/null && go install fybrik.io/[email protected]; popd >& /dev/null
Expand Down Expand Up @@ -48,7 +48,7 @@ push-image:

test: codegen download-test-deps
KUBEBUILDER_ASSETS="$(shell setup-envtest --use-env use -p path)" \
ginkgo -nodes=${TEST_NODES} --randomize-all ./test/...
go run github.com/onsi/ginkgo/v2/ginkgo -nodes=${TEST_NODES} --randomize-all ./test/...

deploy:
kubectl apply -f deploy/yaml/service_account.yaml
Expand Down
48 changes: 27 additions & 21 deletions deploy/crds/pulumi.com_programs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.15.0
name: programs.pulumi.com
spec:
group: pulumi.com
Expand All @@ -25,14 +24,19 @@ spec:
description: Program is the schema for the inline YAML program API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -54,8 +58,9 @@ spec:
- List<String>
type: string
type: object
description: configuration specifies the Pulumi config inputs to the
deployment. Either type or default is required.
description: |-
configuration specifies the Pulumi config inputs to the deployment.
Either type or default is required.
type: object
outputs:
additionalProperties:
Expand All @@ -77,9 +82,9 @@ spec:
state:
additionalProperties:
x-kubernetes-preserve-unknown-fields: true
description: state contains the known properties (input
& output) of the resource. This assists the provider in
figuring out the correct resource.
description: |-
state contains the known properties (input & output) of the resource. This assists
the provider in figuring out the correct resource.
type: object
required:
- id
Expand All @@ -95,9 +100,9 @@ spec:
type: string
type: array
aliases:
description: aliases specifies names that this resource
used to have, so that renaming or refactoring doesn’t
replace it.
description: |-
aliases specifies names that this resource used to have, so that renaming or refactoring
doesn’t replace it.
items:
type: string
type: array
Expand Down Expand Up @@ -139,9 +144,9 @@ spec:
cloud account under the control of Pulumi.
type: string
parent:
description: parent resource option specifies a parent for
a resource. It is used to associate children with the
parents that encapsulate or are responsible for them.
description: |-
parent resource option specifies a parent for a resource. It is used to associate
children with the parents that encapsulate or are responsible for them.
x-kubernetes-preserve-unknown-fields: true
protect:
description: protect prevents accidental deletion of a resource.
Expand Down Expand Up @@ -180,8 +185,9 @@ spec:
variables:
additionalProperties:
x-kubernetes-preserve-unknown-fields: true
description: variables specifies intermediate values of the program;
the values of variables are expressions that can be re-used.
description: |-
variables specifies intermediate values of the program; the values of variables are
expressions that can be re-used.
type: object
type: object
type: object
Expand Down
Loading
Loading