Skip to content

Commit

Permalink
Merge branch 'main' into feat_reusable_workflow_docs
Browse files Browse the repository at this point in the history
  • Loading branch information
zhijie-yang authored Dec 20, 2024
2 parents 7f954b2 + aab644b commit 17adddb
Show file tree
Hide file tree
Showing 41 changed files with 806 additions and 126 deletions.
1 change: 0 additions & 1 deletion .github/workflows/_Test-OCI-Factory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ jobs:
# test-oci-compliance: true
# test-vulnerabilities: true


# # Test workflow used in continuous testing
# test-vulnerability-scan:
# name: Test vulnerability scan workflow
Expand Down
2 changes: 2 additions & 0 deletions oci/grafana-agent/.trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ CVE-2023-49568
GHSA-9763-4f94-gfch
# github.com/opencontainers/runc - runc: file descriptor leak
CVE-2024-21626
# golang.org/x/crypto - Applications and libraries which misuse the ServerConfig.PublicKeyCall ...
CVE-2024-45337
45 changes: 45 additions & 0 deletions oci/grafana-agent/_releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,5 +268,50 @@
"edge": {
"target": "0.40.3-22.04_beta"
}
},
"0-24.04": {
"end-of-life": "2025-03-12T00:00:00Z",
"stable": {
"target": "79"
},
"candidate": {
"target": "0-24.04_stable"
},
"beta": {
"target": "0-24.04_candidate"
},
"edge": {
"target": "0-24.04_beta"
}
},
"0.43-24.04": {
"end-of-life": "2025-03-12T00:00:00Z",
"stable": {
"target": "79"
},
"candidate": {
"target": "0.43-24.04_stable"
},
"beta": {
"target": "0.43-24.04_candidate"
},
"edge": {
"target": "0.43-24.04_beta"
}
},
"0.43.4-24.04": {
"end-of-life": "2025-03-12T00:00:00Z",
"stable": {
"target": "79"
},
"candidate": {
"target": "0.43.4-24.04_stable"
},
"beta": {
"target": "0.43.4-24.04_candidate"
},
"edge": {
"target": "0.43.4-24.04_beta"
}
}
}
32 changes: 8 additions & 24 deletions oci/grafana-agent/image.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,18 @@
version: 1
upload:
- source: canonical/grafana-agent-rock
commit: 8fdc452a8c36d7f8916821b8b4a7a4e88136eff6
directory: 0.40.5
commit: d3c1eaec89c38897141ff2b5b2e549664dea3992
directory: 0.43.4
release:
0.40.5-22.04:
end-of-life: "2025-05-28T00:00:00Z"
0-24.04:
end-of-life: '2025-03-12T00:00:00Z'
risks:
- stable
0.40-22.04:
end-of-life: "2025-05-28T00:00:00Z"
0.43-24.04:
end-of-life: '2025-03-12T00:00:00Z'
risks:
- stable
0-22.04:
end-of-life: "2025-05-28T00:00:00Z"
risks:
- stable
- source: canonical/grafana-agent-rock
commit: 8fdc452a8c36d7f8916821b8b4a7a4e88136eff6
directory: 0.40.4
release:
0.40.4-22.04:
end-of-life: "2025-05-28T00:00:00Z"
risks:
- stable
- source: canonical/grafana-agent-rock
commit: 8fdc452a8c36d7f8916821b8b4a7a4e88136eff6
directory: 0.40.3
release:
0.40.3-22.04:
end-of-life: "2025-05-28T00:00:00Z"
0.43.4-24.04:
end-of-life: '2025-03-12T00:00:00Z'
risks:
- stable
2 changes: 2 additions & 0 deletions oci/grafana/.trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ CVE-2023-49568
CVE-2023-49569
# github.com/cloudflare/circl - CIRCL's Kyber: timing side-channel (kyberslash2)
GHSA-9763-4f94-gfch
# golang.org/x/crypto - Applications and libraries which misuse the ServerConfig.PublicKeyCall ...
CVE-2024-45337
32 changes: 8 additions & 24 deletions oci/grafana/image.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,18 @@
version: 1
upload:
- source: canonical/grafana-rock
commit: 76e6113b71255cd3d83df9b6f01b0ab2b783920d
directory: 10.4.2
commit: a2d8bea8db1fc640cbe465429a70e79fcfbb83bb
directory: 11.4.0
release:
10.4.2-22.04:
end-of-life: "2025-05-28T00:00:00Z"
11-24.04:
end-of-life: '2025-03-13T00:00:00Z'
risks:
- stable
10.4-22.04:
end-of-life: "2025-05-28T00:00:00Z"
11.4-24.04:
end-of-life: '2025-03-13T00:00:00Z'
risks:
- stable
10-22.04:
end-of-life: "2025-05-28T00:00:00Z"
risks:
- stable
- source: canonical/grafana-rock
commit: 76e6113b71255cd3d83df9b6f01b0ab2b783920d
directory: 11.0.0
release:
11.0.0-22.04:
end-of-life: "2025-05-28T00:00:00Z"
risks:
- stable
11.0-22.04:
end-of-life: "2025-05-28T00:00:00Z"
risks:
- stable
11-22.04:
end-of-life: "2025-05-28T00:00:00Z"
11.4.0-24.04:
end-of-life: '2025-03-13T00:00:00Z'
risks:
- stable
16 changes: 14 additions & 2 deletions oci/identity-platform-admin-ui/_releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
}
},
"1-22.04": {
"end-of-life": "2025-05-12T00:00:00Z",
"end-of-life": "2025-06-12T00:00:00Z",
"stable": {
"target": "4"
"target": "9"
},
"candidate": {
"target": "1-22.04_stable"
Expand All @@ -40,5 +40,17 @@
"edge": {
"target": "6"
}
},
"1.22-22.04": {
"end-of-life": "2024-12-26T00:00:00Z",
"candidate": {
"target": "10"
},
"edge": {
"target": "10"
},
"beta": {
"target": "1.22-22.04_candidate"
}
}
}
12 changes: 12 additions & 0 deletions oci/identity-platform-login-ui/_releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,17 @@
"edge": {
"target": "0-22.04_beta"
}
},
"0.18-22.04": {
"end-of-life": "2024-12-19T00:00:00Z",
"candidate": {
"target": "9"
},
"edge": {
"target": "9"
},
"beta": {
"target": "0.18-22.04_candidate"
}
}
}
4 changes: 2 additions & 2 deletions oci/kratos/_releases.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
}
},
"1-22.04": {
"end-of-life": "2025-02-13T00:00:00Z",
"end-of-life": "2025-03-03T00:00:00Z",
"stable": {
"target": "3"
"target": "10"
},
"candidate": {
"target": "1-22.04_stable"
Expand Down
92 changes: 92 additions & 0 deletions oci/metrics-proxy/_releases.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"0.1.1-22.04": {
"end-of-life": "2025-11-27T00:00:00Z",
"stable": {
"target": "1"
},
"candidate": {
"target": "0.1.1-22.04_stable"
},
"beta": {
"target": "0.1.1-22.04_candidate"
},
"edge": {
"target": "0.1.1-22.04_beta"
}
},
"0.1-22.04": {
"end-of-life": "2025-11-27T00:00:00Z",
"stable": {
"target": "1"
},
"candidate": {
"target": "0.1-22.04_stable"
},
"beta": {
"target": "0.1-22.04_candidate"
},
"edge": {
"target": "0.1-22.04_beta"
}
},
"0-22.04": {
"end-of-life": "2025-11-27T00:00:00Z",
"stable": {
"target": "1"
},
"candidate": {
"target": "0-22.04_stable"
},
"beta": {
"target": "0-22.04_candidate"
},
"edge": {
"target": "0-22.04_beta"
}
},
"0-24.04": {
"end-of-life": "2025-03-14T00:00:00Z",
"stable": {
"target": "2"
},
"candidate": {
"target": "0-24.04_stable"
},
"beta": {
"target": "0-24.04_candidate"
},
"edge": {
"target": "0-24.04_beta"
}
},
"0.1-24.04": {
"end-of-life": "2025-03-14T00:00:00Z",
"stable": {
"target": "2"
},
"candidate": {
"target": "0.1-24.04_stable"
},
"beta": {
"target": "0.1-24.04_candidate"
},
"edge": {
"target": "0.1-24.04_beta"
}
},
"0.1.1-24.04": {
"end-of-life": "2025-03-14T00:00:00Z",
"stable": {
"target": "2"
},
"candidate": {
"target": "0.1.1-24.04_stable"
},
"beta": {
"target": "0.1.1-24.04_candidate"
},
"edge": {
"target": "0.1.1-24.04_beta"
}
}
}
5 changes: 5 additions & 0 deletions oci/metrics-proxy/contacts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
notify:
emails:
- [email protected]
mattermost-channels:
- 1ayd5kim67bbing34i3h1x9uac
43 changes: 43 additions & 0 deletions oci/metrics-proxy/documentation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
version: 1
# --- OVERVIEW INFORMATION ---
application: metrics-proxy
description: >
Metrics Proxy is a lightweight proxy designed to expose a unified metrics endpoint for multiple Kubernetes pods.
The proxy watches for pods in a Kubernetes cluster and listens on a configurable port,
where it exposes aggregated metrics on a configurable endpoint.
Read more on the [project repo](https://github.com/canonical/metrics-k8s-proxy).
# --- USAGE INFORMATION ---
docker:
parameters:
- -p 15090:15090
access: Access aggregated metrics at `http://localhost:15090`.

parameters:
- type: -e
value: 'TZ=UTC'
description: Timezone setting for the container.
- type: -p
value: '15090:15090'
description: Port mapping for accessing the metrics-proxy aggregated metrics endpoint.
- type: -e
value: 'POD_LABEL_SELECTOR="foo=bar"'
description: Specify labels to filter Kubernetes pods for metrics aggregation.
- type: -e
value: 'PORT="15090"'
description: The port on which the metrics-proxy listens for scrape requests.
- type: -e
value: 'SCRAPE_TIMEOUT="9s"'
description: Configures the timeout duration for scraping metrics from the pods.

debug:
text: |
### Debugging
To debug the container:
```bash
docker exec -it metrics-proxy-container pebble logs -f metrics-proxy
```
To get an interactive shell:
```bash
docker exec -it metrics-proxy-container /bin/bash
```
18 changes: 18 additions & 0 deletions oci/metrics-proxy/image.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
version: 1
upload:
- source: canonical/metrics-proxy-rock
commit: 78ab3165104b87d648d077a1c3f80c308a10b6af
directory: 0.1.1
release:
0-24.04:
end-of-life: '2025-03-14T00:00:00Z'
risks:
- stable
0.1-24.04:
end-of-life: '2025-03-14T00:00:00Z'
risks:
- stable
0.1.1-24.04:
end-of-life: '2025-03-14T00:00:00Z'
risks:
- stable
2 changes: 2 additions & 0 deletions oci/mimir/.trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ CVE-2023-39325
GHSA-m425-mq94-257g
# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp - opentelemetry: DoS vulnerability in otelhttp
CVE-2023-45142
# golang.org/x/crypto - Applications and libraries which misuse the ServerConfig.PublicKeyCall ...
CVE-2024-45337
Loading

0 comments on commit 17adddb

Please sign in to comment.