Skip to content

Commit

Permalink
updating crds
Browse files Browse the repository at this point in the history
  • Loading branch information
[email protected] committed May 31, 2024
1 parent a88389e commit c31bdd8
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 70 deletions.
3 changes: 1 addition & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22
toolchain go1.22.0

require (
github.com/crossplane/crossplane-runtime v1.16.0
github.com/crossplane/crossplane-runtime v1.15.1
github.com/crossplane/crossplane-tools v0.0.0-20240522174801-1ad3d4c87f21
github.com/go-logr/logr v1.4.1
github.com/go-logr/zapr v1.3.0
Expand All @@ -29,7 +29,6 @@ require (
github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
github.com/dave/jennifer v1.7.0 // indirect
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,13 @@ github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAu
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/crossplane/crossplane-runtime v1.16.0 h1:lz+l0wEB3qowdTmN7t0PZkfuNSvfOoEhQrEYFbYqMow=
github.com/crossplane/crossplane-runtime v1.16.0/go.mod h1:Pz2tdGVMF6KDGzHZOkvKro0nKc8EzK0sb/nSA7pH4Dc=
github.com/crossplane/crossplane-runtime v1.15.1 h1:g1h75tNYOQT152IUNxs8ZgSsRFQKrZN9z69KefMujXs=
github.com/crossplane/crossplane-runtime v1.15.1/go.mod h1:kRcJjJQmBFrR2n/KhwL8wYS7xNfq3D8eK4JliEScOHI=
github.com/crossplane/crossplane-tools v0.0.0-20240522174801-1ad3d4c87f21 h1:8wb7/zCbVPkeX68WbVESWJmSWQE5SZKzz0g9X4FlXRw=
github.com/crossplane/crossplane-tools v0.0.0-20240522174801-1ad3d4c87f21/go.mod h1:cN0Y7PFGQMM8mcagXVCbeQoKtipmFWQTPZYyziCPBUI=
github.com/dave/jennifer v1.7.0 h1:uRbSBH9UTS64yXbh4FrMHfgfY762RD+C7bUPKODpSJE=
Expand Down
14 changes: 0 additions & 14 deletions package/crds/minio.crossplane.io_buckets.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,13 +329,6 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
type: string
observedGeneration:
description: |-
ObservedGeneration represents the .metadata.generation that the condition was set based upon.
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
with respect to the current state of the instance.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand Down Expand Up @@ -363,13 +356,6 @@ spec:
type: string
endpointURL:
type: string
observedGeneration:
description: |-
ObservedGeneration is the latest metadata.generation
which resulted in either a ready state, or stalled due to error
it can not recover from without human intervention.
format: int64
type: integer
type: object
required:
- spec
Expand Down
14 changes: 0 additions & 14 deletions package/crds/minio.crossplane.io_policies.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,6 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
type: string
observedGeneration:
description: |-
ObservedGeneration represents the .metadata.generation that the condition was set based upon.
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
with respect to the current state of the instance.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand All @@ -335,13 +328,6 @@ spec:
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
observedGeneration:
description: |-
ObservedGeneration is the latest metadata.generation
which resulted in either a ready state, or stalled due to error
it can not recover from without human intervention.
format: int64
type: integer
type: object
required:
- spec
Expand Down
7 changes: 0 additions & 7 deletions package/crds/minio.crossplane.io_providerconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,6 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
type: string
observedGeneration:
description: |-
ObservedGeneration represents the .metadata.generation that the condition was set based upon.
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
with respect to the current state of the instance.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand Down
14 changes: 0 additions & 14 deletions package/crds/minio.crossplane.io_users.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,6 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
type: string
observedGeneration:
description: |-
ObservedGeneration represents the .metadata.generation that the condition was set based upon.
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
with respect to the current state of the instance.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand All @@ -347,13 +340,6 @@ spec:
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
observedGeneration:
description: |-
ObservedGeneration is the latest metadata.generation
which resulted in either a ready state, or stalled due to error
it can not recover from without human intervention.
format: int64
type: integer
type: object
required:
- spec
Expand Down
22 changes: 7 additions & 15 deletions package/package.mk
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@


mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
package_dir := $(notdir $(patsubst %/,%,$(dir $(mkfile_path))))

crossplane_bin = $(go_bin)/kubectl-crossplane
up_bin = $(go_bin)/up

# Build kubectl-crossplane plugin
$(crossplane_bin):export GOBIN = $(go_bin)
$(crossplane_bin): | $(go_bin)
go install github.com/crossplane/crossplane/cmd/crank@latest
@mv $(go_bin)/crank $@

# Install up plugin
$(up_bin):export GOBIN = $(go_bin)
$(up_bin):export VERSION=v0.15.0
$(up_bin): | $(go_bin)
curl -sL "https://cli.upbound.io" | sh
@mv up $@
$(up_bin) --version

.PHONY: package
package: ## All-in-one packaging and releasing
package: package-push
Expand All @@ -28,15 +20,15 @@ package-provider-local: export CONTROLLER_IMG = $(CONTAINER_IMG)
package-provider-local: $(crossplane_bin) generate ## Build Crossplane package for local installation in kind-cluster
@rm -rf package/*.xpkg
@yq e '.spec.controller.image=strenv(CONTROLLER_IMG)' $(package_dir)/crossplane.yaml.template > $(package_dir)/crossplane.yaml
@$(crossplane_bin) xpkg build --package-root=$(package_dir)
@$(crossplane_bin) xpkg build -f $(package_dir)
@echo Package file: $$(ls $(package_dir)/*.xpkg)

.PHONY: package-provider
package-provider: export CONTROLLER_IMG = $(CONTAINER_IMG)
package-provider: $(up_bin) generate build-docker ## Build Crossplane package for Upbound Marketplace
package-provider: $(crossplane_bin) generate build-docker ## Build Crossplane package for Upbound Marketplace
@rm -rf package/*.xpkg
@yq e 'del(.spec)' $(package_dir)/crossplane.yaml.template > $(package_dir)/crossplane.yaml
$(up_bin) xpkg build -f $(package_dir) -o $(package_dir)/provider-minio.xpkg --controller=$(CONTROLLER_IMG)
$(crossplane_bin) xpkg build --package-root=$(package_dir) --embed-runtime-image=$(CONTROLLER_IMG) -o $(package_dir)/provider-minio.xpkg

.PHONY: .local-package-push
.local-package-push: pkg_file = $(shell ls $(package_dir)/*.xpkg)
Expand All @@ -51,11 +43,11 @@ package-provider: $(up_bin) generate build-docker ## Build Crossplane package fo
.PHONY: .upbound-package-push
.upbound-package-push: pkg_file = $(package_dir)/provider-minio.xpkg
.upbound-package-push: package-provider
$(up_bin) xpkg push -f $(pkg_file) $(UPBOUND_PACKAGE_IMG)
$(crossplane_bin) xpkg push -f $(pkg_file) $(UPBOUND_PACKAGE_IMG)

.PHONY: package-push
package-push: .ghcr-package-push ## Push Crossplane package to container registries
package-push: .ghcr-package-push .upbound-package-push ## Push Crossplane package to container registries

.PHONY: .package-clean
.package-clean:
rm -f $(crossplane_bin) $(up_bin) package/*.xpkg
rm -f $(crossplane_bin) package/*.xpkg

0 comments on commit c31bdd8

Please sign in to comment.