Skip to content

Commit 68ae49a

Browse files
committed
fix(build): fix image tags to work with helm
1 parent 0dd8620 commit 68ae49a

File tree

4 files changed

+37
-38
lines changed

4 files changed

+37
-38
lines changed

.github/workflows/docker.yml

-11
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,6 @@ jobs:
5050
- name: set version
5151
run: just set-version
5252

53-
- name: meta
54-
id: meta
55-
uses: docker/metadata-action@v5
56-
with:
57-
images: |
58-
${{ env.IMAGE }}
59-
tags: |
60-
type=ref,event=tag
61-
type=raw,value=unstable,enable={{is_default_branch}}
62-
type=sha
63-
6453
- name: buildx
6554
uses: docker/setup-buildx-action@v3
6655
with:

.github/workflows/release.yml

+11
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838

3939
steps:
4040
- uses: actions/checkout@v4
41+
- name: tags
42+
run: git fetch --prune --unshallow --tags
4143

4244
- name: fetch digests
4345
uses: actions/download-artifact@v4
@@ -51,6 +53,13 @@ jobs:
5153
- name: buildx
5254
uses: docker/setup-buildx-action@v3
5355

56+
- uses: taiki-e/install-action@v2
57+
with:
58+
tool: just,git-cliff
59+
- name: get version
60+
id: version
61+
run: echo "version=$(just --evaluate version)" >> "${GITHUB_OUTPUT}"
62+
5463
- name: meta
5564
id: meta
5665
uses: docker/metadata-action@v5
@@ -59,6 +68,8 @@ jobs:
5968
${{ env.IMAGE }}
6069
tags: |
6170
type=ref,event=tag
71+
type=semver,pattern={{version}}
72+
type=raw,value=${{ steps.version.outputs.version }},enable=true
6273
type=raw,value=unstable,enable={{is_default_branch}}
6374
type=sha
6475

README.md

+8-27
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ You can:
1717

1818
1. Download the [cli][cli-download] and add it to your `$PATH`.
1919
1. Get a k8s cluster. [k3d][k3d] is a convenient way to get a cluster up and
20-
running fast. Follow their [installation] instructions and create a default
20+
running fast. Follow their installation instructions and create a default
2121
cluster.
2222
1. Grant your email address access to the cluster. Choose `cluster-admin` if
2323
you'd like something simple to check out how things work. For more details on
24-
the minimum possible permissions, read the [Authorization] section. The email
25-
address is what you'll be using to authenticate against. It can either be the
26-
one associated with a google or github account. Note, the ID used for login
27-
and the providers available can all be configured.
24+
the minimum possible permissions, read the [Authorization](#authorization)
25+
section. The email address is what you'll be using to authenticate against.
26+
It can either be the one associated with a google or github account. Note,
27+
the ID used for login and the providers available can all be configured.
2828

2929
```bash
3030
kuberift users grant <cluster-role> <email-address>
@@ -84,9 +84,9 @@ your cluster, you can run:
8484

8585
```bash
8686
helm install kuberift oci://ghcr.io/grampelberg/helm/kuberift \
87-
-n kuberift --create-namespace \
88-
--version $(curl -L https://api.github.com/repos/grampelberg/kuberift/tags | jq -r '.[0].name' | cut -c2-) \
89-
-f https://raw.githubusercontent.com/grampelberg/kuberift/main/helm/getting-started.yaml
87+
-n kuberift --create-namespace \
88+
--version $(curl -L https://api.github.com/repos/grampelberg/kuberift/tags | jq -r '.[0].name' | cut -c2-) \
89+
-f https://raw.githubusercontent.com/grampelberg/kuberift/main/helm/getting-started.yaml
9090
```
9191

9292
Note: this exposes the kuberift service externally by default. To get that IP
@@ -264,22 +264,3 @@ the design decisions section for an explanation of what's happening there.
264264

265265
- See releases for the latest tagged release.
266266
- The `unstable` tag is updated on every merge to main.
267-
268-
## TODO
269-
270-
- Groups are probably what most users are going to want to use to configure all
271-
this. The closest to the OpenID spec would be via adding extra scopes that add
272-
the data required to the token and then map back to a group. Imagine:
273-
274-
```yaml
275-
user: email
276-
group: https://myapp.example.com/group
277-
```
278-
279-
The downside to using this kind of configuration is that it'll need to be
280-
handled in the provider backend and it is unclear how easy that'll be. It is
281-
possible in auth0, so I'll go down this route for now.
282-
283-
- Is there a way to do FPS on a per-session basis with prometheus? Naively the
284-
way to do it would be to have a per-session label value, but that would be
285-
crazy for cardinality.

TODO.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
## TODO
2+
3+
- Groups are probably what most users are going to want to use to configure all
4+
this. The closest to the OpenID spec would be via adding extra scopes that add
5+
the data required to the token and then map back to a group. Imagine:
6+
7+
```yaml
8+
user: email
9+
group: https://myapp.example.com/group
10+
```
11+
12+
The downside to using this kind of configuration is that it'll need to be
13+
handled in the provider backend and it is unclear how easy that'll be. It is
14+
possible in auth0, so I'll go down this route for now.
15+
16+
- Is there a way to do FPS on a per-session basis with prometheus? Naively the
17+
way to do it would be to have a per-session label value, but that would be
18+
crazy for cardinality.

0 commit comments

Comments
 (0)