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

Bump example model to Redis 7.2.2 #226

Merged
merged 2 commits into from
Oct 21, 2023
+40 −40
Merged

Bump example model to Redis 7.2.2 #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea179b4
ci: Fix schemas push
stefanprodan Oct 21, 2023
d6ed805
Bump Redis to 7.2.2
stefanprodan Oct 21, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Push schemas
run: |
timoni artifact push oci://ghcr.io/stefanprodan/timoni/schemas \
-f ./schemas -t ${{ github.event.inputs.version }} -t latest \
-f ./schemas -t ${{ github.event.inputs.version }} -t latest \
-a 'org.opencontainers.image.licenses=Apache-2.0' \
-a 'org.opencontainers.image.source=https://github.com/stefanprodan/timoni' \
-a 'org.opencontainers.image.description=Timoni CUE schemas.' \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
- name: Push schemas
run: |
timoni artifact push oci://ghcr.io/stefanprodan/timoni/schemas \
-f ./schemas -t ${{ steps.info.outputs.version }} -t latest \
-f ./schemas -t ${{ steps.info.outputs.version }} -t latest \
-a 'org.opencontainers.image.licenses=Apache-2.0' \
-a 'org.opencontainers.image.source=https://github.com/stefanprodan/timoni' \
-a 'org.opencontainers.image.description=Timoni CUE schemas.' \
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ bundle: {
redis: {
module: {
url: "oci://ghcr.io/stefanprodan/modules/redis"
version: "7.2.1"
version: "7.2.2"
}
namespace: "podinfo"
values: maxmemory: 256
Expand Down
56 changes: 28 additions & 28 deletions docs/bundle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ bundle: {
redis: {
module: {
url: "oci://ghcr.io/stefanprodan/modules/redis"
version: "7.2.1"
version: "7.2.2"
}
namespace: "podinfo"
values: maxmemory: 256
}
podinfo: {
module: url: "oci://ghcr.io/stefanprodan/modules/podinfo"
module: version: "6.5.0"
module: version: "6.5.2"
namespace: "podinfo"
values: caching: {
enabled: true
Expand Down Expand Up @@ -66,8 +66,8 @@ Apply the Bundle on the cluster:

```text
applying instance redis
pulling oci://ghcr.io/stefanprodan/modules/redis:7.2.1
using module timoni.sh/redis version 7.2.1
pulling oci://ghcr.io/stefanprodan/modules/redis:7.2.2
using module timoni.sh/redis version 7.2.2
installing redis in namespace podinfo
Namespace/podinfo created
applying master
Expand All @@ -84,8 +84,8 @@ Apply the Bundle on the cluster:
waiting for 2 resource(s) to become ready...
resources are ready
applying instance podinfo
pulling oci://ghcr.io/stefanprodan/modules/podinfo:6.5.0
using module timoni.sh/podinfo version 6.5.0
pulling oci://ghcr.io/stefanprodan/modules/podinfo:6.5.2
using module timoni.sh/podinfo version 6.5.2
installing podinfo in namespace podinfo
ServiceAccount/podinfo/podinfo created
Service/podinfo/podinfo created
Expand All @@ -112,7 +112,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
metadata:
labels:
app.kubernetes.io/part-of: redis
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.2.2
name: redis
namespace: podinfo
---
Expand All @@ -132,7 +132,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
metadata:
labels:
app.kubernetes.io/part-of: redis
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.2.2
name: redis
namespace: podinfo
---
Expand All @@ -142,7 +142,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
labels:
app.kubernetes.io/name: redis-master
app.kubernetes.io/part-of: redis
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.2.2
name: redis
namespace: podinfo
spec:
Expand All @@ -161,7 +161,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
labels:
app.kubernetes.io/name: redis-replica
app.kubernetes.io/part-of: redis
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.2.2
name: redis-readonly
namespace: podinfo
spec:
Expand All @@ -180,7 +180,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
labels:
app.kubernetes.io/name: redis-master
app.kubernetes.io/part-of: redis
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.2.2
name: redis-master
namespace: podinfo
spec:
Expand Down Expand Up @@ -258,7 +258,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
labels:
app.kubernetes.io/name: redis-replica
app.kubernetes.io/part-of: redis
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.2.2
name: redis-replica
namespace: podinfo
spec:
Expand Down Expand Up @@ -339,7 +339,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
metadata:
labels:
app.kubernetes.io/part-of: redis
app.kubernetes.io/version: 7.2.1
app.kubernetes.io/version: 7.2.2
name: redis-master
namespace: podinfo
spec:
Expand All @@ -358,7 +358,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
metadata:
labels:
app.kubernetes.io/name: podinfo
app.kubernetes.io/version: 6.5.0
app.kubernetes.io/version: 6.5.2
name: podinfo
namespace: podinfo
---
Expand All @@ -367,7 +367,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
metadata:
labels:
app.kubernetes.io/name: podinfo
app.kubernetes.io/version: 6.5.0
app.kubernetes.io/version: 6.5.2
name: podinfo
namespace: podinfo
spec:
Expand All @@ -385,7 +385,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
metadata:
labels:
app.kubernetes.io/name: podinfo
app.kubernetes.io/version: 6.5.0
app.kubernetes.io/version: 6.5.2
name: podinfo
namespace: podinfo
spec:
Expand All @@ -403,7 +403,7 @@ Build the Bundle and print the resulting Kubernetes resources for all the Bundle
- ./podinfo
- --level=info
- --cache-server=tcp://redis:6379
image: ghcr.io/stefanprodan/podinfo:6.5.0
image: ghcr.io/stefanprodan/podinfo:6.5.2
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down Expand Up @@ -433,8 +433,8 @@ List the managed resources from a bundle and their rollout status:

```text
last applied 2023-10-08T20:21:19Z
module oci://ghcr.io/stefanprodan/modules/redis:7.2.1
digest: sha256:9935e0b63db8a56c279d7722ced7683d5692a50815f715e336663509889b7e21
module oci://ghcr.io/stefanprodan/modules/redis:7.2.2
digest: sha256:0e1f9cfbd020230e4e9f8c3b14bc728df932793d02d4f0a26512737af6df2dc8
ServiceAccount/podinfo/redis Current Resource is current
ConfigMap/podinfo/redis Current Resource is always ready
Service/podinfo/redis Current Service is ready
Expand All @@ -444,8 +444,8 @@ List the managed resources from a bundle and their rollout status:
PersistentVolumeClaim/podinfo/redis-master Current PVC is Bound

last applied 2023-10-08T20:21:19Z
module oci://ghcr.io/stefanprodan/modules/podinfo:6.5.0
digest: sha256:d5cb5a8c625045ee1da01d629a2d46cd361f2b6472b8bd07bcabbd0012bc574b
module oci://ghcr.io/stefanprodan/modules/podinfo:6.5.2
digest: sha256:6feb340acfc8f566bad9d4fa1e71a3cd0feade41a00750428b4f1b0b5e3c86a0
ServiceAccount/podinfo/podinfo Current Resource is always ready
Service/podinfo/podinfo Current Service is ready
Deployment/podinfo/podinfo Current Deployment is available. Replicas: 1
Expand All @@ -463,8 +463,8 @@ List the instances in Bundle `podinfo` across all namespaces:

```text
NAME NAMESPACE MODULE VERSION LAST APPLIED BUNDLE
podinfo podinfo oci://ghcr.io/stefanprodan/modules/podinfo 6.5.0 2023-09-10T16:20:07Z podinfo
redis podinfo oci://ghcr.io/stefanprodan/modules/redis 7.2.1 2023-09-10T16:20:00Z podinfo
podinfo podinfo oci://ghcr.io/stefanprodan/modules/podinfo 6.5.2 2023-09-10T16:20:07Z podinfo
redis podinfo oci://ghcr.io/stefanprodan/modules/redis 7.2.2 2023-09-10T16:20:00Z podinfo
```

## Writing a Bundle spec
Expand Down Expand Up @@ -537,13 +537,13 @@ where the module is published. The `url` field must be in the format `oci://<reg
#### Version

The `instance.module.version` is an optional field that specifies the version number of the module.
The version number must follow [Timoni's semantic versioning](module-semver.md).
The version number must follow [Timoni's semantic versioning](module-distribution.md).
When not specified, the version defaults to `latest`, which pulls the module OCI artifact tagged as latest.

```cue
module: {
url: "oci://ghcr.io/stefanprodan/modules/podinfo"
version: "6.5.0"
version: "6.5.2"
}
```

Expand All @@ -559,7 +559,7 @@ The `instance.module.digest` is an optional field that specifies the OCI digest
```cue
module: {
url: "oci://ghcr.io/stefanprodan/modules/podinfo"
digest: "sha256:d5cb5a8c625045ee1da01d629a2d46cd361f2b6472b8bd07bcabbd0012bc574b"
digest: "sha256:6feb340acfc8f566bad9d4fa1e71a3cd0feade41a00750428b4f1b0b5e3c86a0"
}
```

Expand All @@ -569,8 +569,8 @@ upstream digest of the version matches the specified `instance.module.digest`.
```cue
module: {
url: "oci://ghcr.io/stefanprodan/modules/podinfo"
version: "6.5.0"
digest: "sha256:d5cb5a8c625045ee1da01d629a2d46cd361f2b6472b8bd07bcabbd0012bc574b"
version: "6.5.2"
digest: "sha256:6feb340acfc8f566bad9d4fa1e71a3cd0feade41a00750428b4f1b0b5e3c86a0"
}
```

Expand Down
10 changes: 5 additions & 5 deletions docs/quickstart.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ in a new namespace:
```console
$ timoni -n test apply podinfo oci://ghcr.io/stefanprodan/modules/podinfo --version latest
pulling oci://ghcr.io/stefanprodan/modules/podinfo:latest
using module timoni.sh/podinfo version 6.5.0
using module timoni.sh/podinfo version 6.5.2
installing podinfo in namespace test
Namespace/test created
ServiceAccount/test/podinfo created
Expand All @@ -57,9 +57,9 @@ To get more information on an instance, you can use the `timoni inspect` sub-com
```console
$ timoni -n test inspect module podinfo
name: timoni.sh/podinfo
version: 6.5.0
version: 6.5.2
repository: oci://ghcr.io/stefanprodan/modules/podinfo
digest: sha256:d5cb5a8c625045ee1da01d629a2d46cd361f2b6472b8bd07bcabbd0012bc574b
digest: sha256:0e1f9cfbd020230e4e9f8c3b14bc728df932793d02d4f0a26512737af6df2dc8
```

To learn more about the available commands, use `timoni inspect --help`.
Expand Down Expand Up @@ -127,14 +127,14 @@ bundle: {
redis: {
module: {
url: "oci://ghcr.io/stefanprodan/modules/redis"
version: "7.2.1"
version: "7.2.2"
}
namespace: "podinfo"
values: maxmemory: 256
}
podinfo: {
module: url: "oci://ghcr.io/stefanprodan/modules/podinfo"
module: version: "6.5.0"
module: version: "6.5.2"
namespace: "podinfo"
values: caching: {
enabled: true
Expand Down
4 changes: 2 additions & 2 deletions examples/bundles/podinfo.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ bundle: {
redis: {
module: {
url: "oci://ghcr.io/stefanprodan/modules/redis"
version: "7.2.1"
digest: "sha256:a5a0906f9509adb279cc9e10fa080921197de4a53b666ee5e58d82882109f9f0"
version: "7.2.2"
digest: "sha256:0e1f9cfbd020230e4e9f8c3b14bc728df932793d02d4f0a26512737af6df2dc8"
}
namespace: "podinfo"
values: {
Expand Down
4 changes: 2 additions & 2 deletions examples/redis/values.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package main
values: {
image: {
repository: "cgr.dev/chainguard/redis"
tag: "7.2.1"
digest: "sha256:31e5ad71a315a1d6b75a93dfabcbfbe2cfcd6fe295cb605bad7441c17a2c48e8"
tag: "7.2.2"
digest: "sha256:8969ecdfa82ed7d0d10596163ba9b7063879e0b1ccb57d054d10aa9d99bd1ce5"
}
}