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

Jump to bottom

Bump build version to its latest #72

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bump build version to its latest #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5287e8e
Bump build version to its latest
zzxwill Jul 7, 2021
2b7e469
Fix duplicate Makefile command
zzxwill Jul 7, 2021
3ea6272
Lowcase clsuter name
zzxwill Jul 7, 2021
a9671c6
Rebase remote build's latest version
zzxwill Oct 28, 2021
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
10 changes: 0 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,6 @@ crds.clean:

generate: crds.clean

# Ensure a PR is ready for review.
reviewable: generate lint
@go mod tidy

# Ensure branch is clean.
check-diff: reviewable
@$(INFO) checking that branch is clean
@test -z "$$(git status --porcelain)" || $(FAIL)
@$(OK) branch is clean

# integration tests
e2e.run: test-integration

Expand Down
2 changes: 1 addition & 1 deletion build
Open in desktop
Submodule build updated 13 files
+1 −0 README.md
+8 −8 cross/Dockerfile
+67 −18 makelib/common.mk
+9 −1 makelib/docs.mk
+28 −22 makelib/golang.mk
+25 −4 makelib/helm.mk
+8 −7 makelib/image.mk
+41 −22 makelib/k8s_tools.mk
+29 −5 makelib/local.mk
+0 −2 scripts/load-configs.sh
+17 −17 scripts/localdev-deploy-component.sh
+54 −0 scripts/localdev-prepare.sh
+1 −1 scripts/localdev-remove-component.sh
2 changes: 1 addition & 1 deletion cluster/local/integration_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ CONTROLLER_IMAGE="${BUILD_REGISTRY}/${PROJECT_NAME}-controller-${HOSTARCH}"
version_tag="$(cat ${projectdir}/_output/version)"
# tag as latest version to load into kind cluster
PACKAGE_CONTROLLER_IMAGE="${DOCKER_REGISTRY}/${PROJECT_NAME}-controller:${VERSION}"
K8S_CLUSTER="${K8S_CLUSTER:-${BUILD_REGISTRY}-INTTESTS}"
K8S_CLUSTER="${K8S_CLUSTER:-${BUILD_REGISTRY}-inttests}"

CROSSPLANE_NAMESPACE="crossplane-system"
PACKAGE_NAME="provider-alibaba"
Expand Down
2 changes: 2 additions & 0 deletions package/crds/alibaba.crossplane.io_providerconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
Copy link
Member

Choose a reason for hiding this comment

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

Hrm, I'm not sure these should have all reappeared.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hi @negz I checked everywhere, different go versions, and different controller-gen versions, I could not figure it out. Then I noticed provider-aws hit the same issue https://github.com/crossplane/provider-aws/pull/602/files to solve this similar issue you fixied in upbound/build#140.

Besides, @muvaf figured it out https://github.com/crossplane/provider-aws/pull/602/files#r718819950.

I think we need to update build submodule to latest to so that crd cleanup runs properly to delete these two lines.

So for this PR, can it be accepted?

apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/alibaba.crossplane.io_providerconfigusages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/database.alibaba.crossplane.io_rdsinstances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/nas.alibaba.crossplane.io_nasfilesystems.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/nas.alibaba.crossplane.io_nasmounttargets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/oss.alibaba.crossplane.io_buckets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/redis.alibaba.crossplane.io_redisinstances.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/slb.alibaba.crossplane.io_clbs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/sls.alibaba.crossplane.io_logstoreindices.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/sls.alibaba.crossplane.io_logstores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/sls.alibaba.crossplane.io_logtails.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/sls.alibaba.crossplane.io_machinegroupbindings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/sls.alibaba.crossplane.io_machinegroups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 2 additions & 0 deletions package/crds/sls.alibaba.crossplane.io_projects.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down