Skip to content

Commit

Permalink
Merge branch 'main' into update-1739278823
Browse files Browse the repository at this point in the history
  • Loading branch information
clay-lake authored Feb 26, 2025
2 parents 503aca4 + 76c5ac6 commit 52d4875
Show file tree
Hide file tree
Showing 16 changed files with 331 additions and 14 deletions.
8 changes: 4 additions & 4 deletions oci/glauth/_releases.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"2-22.04": {
"end-of-life": "2025-05-01T00:00:00Z",
"end-of-life": "2025-05-26T00:00:00Z",
"stable": {
"target": "1"
"target": "4"
},
"candidate": {
"target": "1"
"target": "2-22.04_stable"
},
"edge": {
"target": "1"
"target": "2-22.04_beta"
},
"beta": {
"target": "2-22.04_candidate"
Expand Down
35 changes: 35 additions & 0 deletions oci/istio-install-cni/_releases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"1-24.04": {
"end-of-life": "2025-08-20T00:00:00Z",
"stable": {
"target": "1"
},
"candidate": {
"target": "1-24.04_stable"
},
"beta": {
"target": "1-24.04_candidate"
},
"edge": {
"target": "1-24.04_beta"
}
},
"1.24-24.04": {
"end-of-life": "2025-08-20T00:00:00Z",
"stable": {
"target": "1"
},
"candidate": {
"target": "1.24-24.04_stable"
},
"beta": {
"target": "1.24-24.04_candidate"
},
"edge": {
"target": "1.24-24.04_beta"
}
},
"1.24.3-24.04": {
"end-of-life": "2025-02-19T00:00:00Z"
}
}
5 changes: 5 additions & 0 deletions oci/istio-install-cni/contacts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
notify:
emails:
- observability@lists.launchpad.net
mattermost-channels:
- 1ayd5kim67bbing34i3h1x9uac
19 changes: 19 additions & 0 deletions oci/istio-install-cni/documentation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: 1
# --- OVERVIEW INFORMATION ---
application: install-cni
description: >
Install-cni is an image used for installing Istio's CNI plugin, which is used in the CNI component in Istio ambient mesh.
Read more on the [project repo](https://github.com/istio/istio/tree/master/cni#overview).
debug:
text: |
### Debugging
To debug the container:
```bash
docker exec -it install-cni-container pebble logs -f install-cni
```
To get an interactive shell:
```bash
docker exec -it install-cni-container /bin/bash
```
18 changes: 18 additions & 0 deletions oci/istio-install-cni/image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 1
upload:
- source: canonical/istio-install-cni-rock
commit: ea497ef462db77c5f1925df58203fa5caa6030da
directory: 1.24.3
release:
1-24.04:
end-of-life: '2025-08-20T00:00:00Z'
risks:
- stable
1.24-24.04:
end-of-life: '2025-08-20T00:00:00Z'
risks:
- stable
1.24.3-24.04:
end-of-life: '2025-02-19T00:00:00Z'
risks:
- stable
35 changes: 35 additions & 0 deletions oci/istio-ztunnel/_releases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"1-24.04": {
"end-of-life": "2025-08-19T00:00:00Z",
"stable": {
"target": "1"
},
"candidate": {
"target": "1-24.04_stable"
},
"beta": {
"target": "1-24.04_candidate"
},
"edge": {
"target": "1-24.04_beta"
}
},
"1.24-24.04": {
"end-of-life": "2025-08-19T00:00:00Z",
"stable": {
"target": "1"
},
"candidate": {
"target": "1.24-24.04_stable"
},
"beta": {
"target": "1.24-24.04_candidate"
},
"edge": {
"target": "1.24-24.04_beta"
}
},
"1.24.3-24.04": {
"end-of-life": "2025-02-19T00:00:00Z"
}
}
5 changes: 5 additions & 0 deletions oci/istio-ztunnel/contacts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
notify:
emails:
- observability@lists.launchpad.net
mattermost-channels:
- 1ayd5kim67bbing34i3h1x9uac
38 changes: 38 additions & 0 deletions oci/istio-ztunnel/documentation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
version: 1
# --- OVERVIEW INFORMATION ---
application: ztunnel
description: >
Ztunnel is a purpose built implementation of the node proxy
to be used as the ztunnel component of Istio's ambient mesh.
Read more on the [project repo](https://github.com/istio/ztunnel).
# --- USAGE INFORMATION ---
docker:
parameters:
- -p 15020:15020
access: Access your Ztunnel instance at `http://localhost:15020`.

parameters:
- type: -e
value: 'TZ=UTC'
description: Timezone setting for the container.
- type: -p
value: '15020:15020'
description: Port mapping for the Ztunnel process.
- type: CMD
value: "ztunnel proxy"
description: >
Launch Ztunnel in proxy mode (default).
debug:
text: |
### Debugging
To debug the container:
```bash
docker exec -it ztunnel-container pebble logs -f ztunnel
```
To get an interactive shell:
```bash
docker exec -it ztunnel-container /bin/bash
```
18 changes: 18 additions & 0 deletions oci/istio-ztunnel/image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 1
upload:
- source: canonical/istio-ztunnel-rock
commit: 757b49f351e64041433960efef246f0c36e18e53
directory: 1.24.3
release:
1-24.04:
end-of-life: '2025-08-19T00:00:00Z'
risks:
- stable
1.24-24.04:
end-of-life: '2025-08-19T00:00:00Z'
risks:
- stable
1.24.3-24.04:
end-of-life: '2025-02-19T00:00:00Z'
risks:
- stable
50 changes: 50 additions & 0 deletions oci/parca/_releases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"0-24.04": {
"end-of-life": "2025-05-27T00:00:00Z",
"stable": {
"target": "2"
},
"candidate": {
"target": "0-24.04_stable"
},
"beta": {
"target": "0-24.04_candidate"
},
"edge": {
"target": "0-24.04_beta"
}
},
"0.23-24.04": {
"end-of-life": "2025-05-27T00:00:00Z",
"stable": {
"target": "2"
},
"candidate": {
"target": "0.23-24.04_stable"
},
"beta": {
"target": "0.23-24.04_candidate"
},
"edge": {
"target": "0.23-24.04_beta"
}
},
"0.23.0-24.04": {
"end-of-life": "2025-02-21T00:00:00Z"
},
"0.23.1-24.04": {
"end-of-life": "2025-05-27T00:00:00Z",
"stable": {
"target": "2"
},
"candidate": {
"target": "0.23.1-24.04_stable"
},
"beta": {
"target": "0.23.1-24.04_candidate"
},
"edge": {
"target": "0.23.1-24.04_beta"
}
}
}
5 changes: 5 additions & 0 deletions oci/parca/contacts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
notify:
emails:
- observability@lists.launchpad.net
mattermost-channels:
- 1ayd5kim67bbing34i3h1x9uac
41 changes: 41 additions & 0 deletions oci/parca/documentation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
version: 1
# --- OVERVIEW INFORMATION ---
application: parca
description: >
Parca provides continuous profiling for analysis of CPU and memory usage, down to the line number
and throughout time. Saving infrastructure cost, improving performance, and increasing reliability.
Read more on the [official documentation](https://www.parca.dev/)
Please note that this repository is now holding a rock, not a
Dockerfile-based image. As such the entrypoint is now Pebble. Read more on
the [Rockcraft docs](https://canonical-rockcraft.readthedocs-hosted.com/en/latest/).
# --- USAGE INFORMATION ---
docker:
parameters:
- -p 7070:7070
access: Access your Parca instance at `http://localhost:7070`.
parameters:
- type: -e
value: 'TZ=UTC'
description: Timezone.
- type: -p
value: '7070:7070'
description: Expose Parca on `localhost:7070`.
- type: -v
value: "/path/to/parca/config.yaml:/etc/parca/parca.yaml"
description: Local configuration file `parca.yaml`.
debug:
text: |
### Debugging
To debug the container:
```bash
docker exec -it parca-container pebble logs -f parca
```
To get an interactive shell:
```bash
docker exec -it parca-container /bin/bash
```
18 changes: 18 additions & 0 deletions oci/parca/image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 1
upload:
- source: canonical/parca-rock
commit: 470508389e4ab7a557baca265844d86a5c349771
directory: 0.23.1
release:
0-24.04:
end-of-life: '2025-05-27T00:00:00Z'
risks:
- stable
0.23-24.04:
end-of-life: '2025-05-27T00:00:00Z'
risks:
- stable
0.23.1-24.04:
end-of-life: '2025-05-27T00:00:00Z'
risks:
- stable
34 changes: 32 additions & 2 deletions oci/tempo/_releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@
}
},
"2-24.04": {
"end-of-life": "2025-03-14T00:00:00Z",
"end-of-life": "2025-05-21T00:00:00Z",
"stable": {
"target": "4"
"target": "5"
},
"candidate": {
"target": "2-24.04_stable"
Expand Down Expand Up @@ -133,5 +133,35 @@
"edge": {
"target": "2.6.1-24.04_beta"
}
},
"2.7-24.04": {
"end-of-life": "2025-05-21T00:00:00Z",
"stable": {
"target": "5"
},
"candidate": {
"target": "2.7-24.04_stable"
},
"beta": {
"target": "2.7-24.04_candidate"
},
"edge": {
"target": "2.7-24.04_beta"
}
},
"2.7.1-24.04": {
"end-of-life": "2025-05-21T00:00:00Z",
"stable": {
"target": "5"
},
"candidate": {
"target": "2.7.1-24.04_stable"
},
"beta": {
"target": "2.7.1-24.04_candidate"
},
"edge": {
"target": "2.7.1-24.04_beta"
}
}
}
14 changes: 7 additions & 7 deletions oci/tempo/image.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
version: 1
upload:
- source: canonical/tempo-rock
commit: f484d825ad257f747a0fa10b62bc850d74cae447
directory: 2.6.1
commit: a337da5226877f40c5b74d545f38cb03ce66e757
directory: 2.7.1
release:
2-24.04:
end-of-life: '2025-03-14T00:00:00Z'
end-of-life: '2025-05-21T00:00:00Z'
risks:
- stable
2.6-24.04:
end-of-life: '2025-03-14T00:00:00Z'
2.7-24.04:
end-of-life: '2025-05-21T00:00:00Z'
risks:
- stable
2.6.1-24.04:
end-of-life: '2025-03-14T00:00:00Z'
2.7.1-24.04:
end-of-life: '2025-05-21T00:00:00Z'
risks:
- stable
Loading

0 comments on commit 52d4875

Please sign in to comment.