Skip to content

Commit e80c668

Browse files
authored
Bump Upbound Provider GCP to 1.8 (jsonnet-libs#468)
* Bump Upbound Provider GCP to 1.8 * forgot to uncomment
1 parent 49a39ce commit e80c668

File tree

3 files changed

+382
-2
lines changed

3 files changed

+382
-2
lines changed

libs/crossplane/Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,19 @@ upbound_aws_crds.libsonnet:
1414
jsonnetfmt -i $(ROOT_DIR)/upbound_aws_crds.libsonnet && \
1515
rm -rf $(TMP) || \
1616
rm -rf $(TMP)
17+
18+
19+
GCP_VERSION?=v1.8.3
20+
21+
.PHONY: upbound_gcp_crds.libsonnet
22+
upbound_gcp_crds.libsonnet:
23+
cd $(TMP) && \
24+
jb init && \
25+
jb install github.com/crossplane-contrib/provider-upjet-gcp/package/crds@$(AWS_VERSION) && \
26+
echo '[' > $(ROOT_DIR)/upbound_gcp_crds.libsonnet && \
27+
cd vendor/github.com/crossplane-contrib/provider-upjet-gcp/package/crds && \
28+
find . -type f -printf "%f\n" | sort | xargs -I {} echo "'{}'," >> $(ROOT_DIR)/upbound_gcp_crds.libsonnet && \
29+
echo ']' >> $(ROOT_DIR)/upbound_gcp_crds.libsonnet && \
30+
jsonnetfmt -i $(ROOT_DIR)/upbound_gcp_crds.libsonnet && \
31+
rm -rf $(TMP) || \
32+
rm -rf $(TMP)

libs/crossplane/config.jsonnet

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
local config = import 'jsonnet/config.jsonnet';
22

33
local upbound_aws_crds = import './upbound_aws_crds.libsonnet';
4+
local upbound_gcp_crds = import './upbound_gcp_crds.libsonnet';
5+
46

57
config.new(
68
name='crossplane',
@@ -116,13 +118,16 @@ config.new(
116118
crds: ['https://doc.crds.dev/raw/github.com/upbound/provider-azuread@v0.11.0'],
117119
localName: 'upbound_azuread',
118120
},
121+
// WARNING: When bumping the version, ensure that you also update the
122+
// version in the Makefile and run `make upbound_gcp_crds.libsonnet` to update the CRDs list.
119123
{
120-
output: 'upbound-provider-gcp/0.36',
124+
output: 'upbound-provider-gcp/1.8',
121125
prefix: '^io\\.upbound\\.gcp\\..*',
122-
crds: ['https://doc.crds.dev/raw/github.com/upbound/provider-gcp@v0.36.0'],
126+
crds: ['https://raw.githubusercontent.com/crossplane-contrib/provider-upjet-gcp/v1.8.3/package/crds/%s' % crd for crd in upbound_gcp_crds],
123127
localName: 'upbound_gcp',
124128
},
125129
{
130+
126131
output: 'provider-terraform/0.10',
127132
prefix: '^io\\.upbound\\.tf\\..*',
128133
crds: ['https://doc.crds.dev/raw/github.com/upbound/provider-terraform@v0.10.0'],

0 commit comments

Comments
 (0)