Skip to content

Commit c4922ad

Browse files
committed
merge upstream
Signed-off-by: Mikel Landa <[email protected]>
2 parents 28aca4e + 4988633 commit c4922ad

File tree

55 files changed

+3994
-2470
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

+3994
-2470
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010

1111
env:
1212
# Common versions
13-
GO_VERSION: '1.18'
14-
GOLANGCI_VERSION: 'v1.47.1'
13+
GO_VERSION: '1.21'
14+
GOLANGCI_VERSION: 'v1.54.0'
1515
DOCKER_BUILDX_VERSION: 'v0.8.2'
1616

1717
# Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run

.github/workflows/promote.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ env:
1919
# a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether
2020
# credentials have been provided before trying to run steps that need them.
2121
CONTRIB_DOCKER_USR: ${{ secrets.CONTRIB_DOCKER_USR }}
22+
XPKG_ACCESS_ID: ${{ secrets.XPKG_ACCESS_ID }}
2223
AWS_USR: ${{ secrets.AWS_USR }}
2324

2425
jobs:
@@ -41,6 +42,14 @@ jobs:
4142
username: ${{ secrets.CONTRIB_DOCKER_USR }}
4243
password: ${{ secrets.CONTRIB_DOCKER_PSW }}
4344

45+
- name: Login to Upbound
46+
uses: docker/login-action@v1
47+
if: env.XPKG_ACCESS_ID != ''
48+
with:
49+
registry: xpkg.upbound.io
50+
username: ${{ secrets.XPKG_ACCESS_ID }}
51+
password: ${{ secrets.XPKG_TOKEN }}
52+
4453
- name: Promote Artifacts in S3 and Docker Hub
4554
if: env.AWS_USR != '' && env.CONTRIB_DOCKER_USR != ''
4655
run: make -j2 promote BRANCH_NAME=${GITHUB_REF##*/}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ KIND_NODE_IMAGE_TAG ?= v1.23.4
3636
# ====================================================================================
3737
# Setup Kubernetes tools
3838

39-
UP_VERSION = v0.18.0
39+
UP_VERSION = v0.31.0
4040
UP_CHANNEL = stable
4141
-include build/makelib/k8s_tools.mk
4242

README.md

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,32 @@ managed resources, this provider reconciles its managed resources every 10 minut
1212

1313
It currently supports **MySQL**, **PostgreSQL** and **MSSQL**.
1414

15+
## Install
16+
17+
Install the provider by using the following command after changing the image tag to the [latest release](https://marketplace.upbound.io/providers/crossplane-contrib/provider-sql/):
18+
19+
```bash
20+
cat << EOF | kubectl apply -f -
21+
apiVersion: pkg.crossplane.io/v1
22+
kind: Provider
23+
metadata:
24+
name: provider-sql
25+
spec:
26+
package: xpkg.upbound.io/crossplane-contrib/provider-sql:v0.9.0
27+
EOF
28+
```
29+
30+
Alternatively, you can use Crossplane CLI:
31+
```bash
32+
up ctp provider install xpkg.upbound.io/crossplane-contrib/provider-sql:v0.9.0
33+
```
34+
35+
Check the example:
36+
37+
- [Provider](./examples/provider.yaml)
38+
- [deploymentRuntimeConfig](./examples/deploymentRuntimeConfig.yaml)
39+
40+
1541
## Usage
1642

1743
1. Create a connection secret:
@@ -31,7 +57,7 @@ It currently supports **MySQL**, **PostgreSQL** and **MSSQL**.
3157
--from-literal=port=3306
3258
```
3359

34-
2. Create managed resource for your SQL server flavor:
60+
2. Create managed resources for your SQL server flavor:
3561

3662
- **MySQL**: `Database`, `Grant`, `User` (See [the examples](examples/mysql))
3763
- **PostgreSQL**: `Database`, `Grant`, `Extension`, `Role` (See [the examples](examples/postgresql))
@@ -45,7 +71,7 @@ It currently supports **MySQL**, **PostgreSQL** and **MSSQL**.
4571

4672
1. Fork the project and clone locally.
4773
2. Create a branch with the changes.
48-
3. Install go version 1.17.
74+
3. Install go version 1.18.
4975
4. Run `make` to initialize the "build". Make submodules used for CI/CD.
5076
5. Run `make reviewable` to run code generation, linters, and tests.
5177
6. Commit, push, and PR.

apis/mssql/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/mssql/v1alpha1/zz_generated.managed.go

Lines changed: 30 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/mysql/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)