Skip to content

Commit

Permalink
Merge branch 'main' into bump-1.36
Browse files Browse the repository at this point in the history
  • Loading branch information
pierDipi committed Jan 16, 2025
2 parents 0c609d4 + 5b2c19c commit d47ca80
Show file tree
Hide file tree
Showing 74 changed files with 1,804 additions and 1,216 deletions.
7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ assignees: ''
- [ ] Verify that [`knative-istio-authz-chart`](https://github.com/openshift-knative/knative-istio-authz-chart/branches) has a branch with the same name as the `release-1.X` branch created previously in serverless-operator
- [ ] Verify that [`knative-istio-authz-chart`'s `Chart.yaml`](https://github.com/openshift-knative/knative-istio-authz-chart/blob/main/Chart.yaml) has `version` and `appVersion` set to the next version.

## Monitor Build Status

Once the `serverless-operator` branch is cut and PRs related to the release we're releasing are in,
Konflux pipelines will run (if they haven't already) and build the various artifacts.
You can check their aggregated status using the
[Build Status Dashboard](https://openshift-knative.github.io/hack/).

### Pre-checks
- [ ] Make sure that all dependent repos have a release branch for the new version and [CI set up](https://github.com/openshift-knative/hack)
- [ ] Make sure that the [automated PR to point the CSV to the old branch is merged](https://github.com/openshift-knative/serverless-operator/pulls?q=is%3Apr+author%3Aapp%2Fgithub-actions+release-+is%3Aopen) like in https://github.com/openshift-knative/serverless-operator/pull/1881
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ jobs:
REGISTRY_REDHAT_IO_PASSWORD: ${{ secrets.REGISTRY_REDHAT_IO_PASSWORD }}
run: make generate-catalog

- name: Regenerate override-snapshot
working-directory: ./src/github.com/${{ github.repository }}
run: make generate-override-snapshot

# Optional:
# Since we're generating files based on a floating branch in midstream,
# we need to reconcile those files periodically.
Expand Down
17 changes: 17 additions & 0 deletions .konflux-release/override-snapshot-fbc-414.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: appstudio.redhat.com/v1alpha1
kind: Snapshot
metadata:
generateName: serverless-operator-135-fbc-414-override-snapshot-
labels:
test.appstudio.openshift.io/type: override
application: serverless-operator-135-fbc-414
spec:
application: serverless-operator-135-fbc-414
components:
- name: "serverless-index-135-fbc-414"
containerImage: "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135-fbc-414/serverless-index-135-fbc-414@sha256:1eca53d1077ba78ef175c518abba1a3917020c4870fcf31d4ad16ee03fae0db5"
source:
git:
url: "https://github.com/openshift-knative/serverless-operator"
revision: "7292e49bfa1322237b2fdf455adabe4b7ef9256f"
dockerfileUrl: "Dockerfile"
17 changes: 17 additions & 0 deletions .konflux-release/override-snapshot-fbc-415.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: appstudio.redhat.com/v1alpha1
kind: Snapshot
metadata:
generateName: serverless-operator-135-fbc-415-override-snapshot-
labels:
test.appstudio.openshift.io/type: override
application: serverless-operator-135-fbc-415
spec:
application: serverless-operator-135-fbc-415
components:
- name: "serverless-index-135-fbc-415"
containerImage: "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135-fbc-415/serverless-index-135-fbc-415@sha256:dfefd75369c83137585dedeed89972737824755c2e199ff1014aafe4eec9c598"
source:
git:
url: "https://github.com/openshift-knative/serverless-operator"
revision: "7292e49bfa1322237b2fdf455adabe4b7ef9256f"
dockerfileUrl: "Dockerfile"
17 changes: 17 additions & 0 deletions .konflux-release/override-snapshot-fbc-416.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: appstudio.redhat.com/v1alpha1
kind: Snapshot
metadata:
generateName: serverless-operator-135-fbc-416-override-snapshot-
labels:
test.appstudio.openshift.io/type: override
application: serverless-operator-135-fbc-416
spec:
application: serverless-operator-135-fbc-416
components:
- name: "serverless-index-135-fbc-416"
containerImage: "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135-fbc-416/serverless-index-135-fbc-416@sha256:e6664357b687115ce9ee8c93551d46ea58b29065f17492e331580606274a3dcf"
source:
git:
url: "https://github.com/openshift-knative/serverless-operator"
revision: "7292e49bfa1322237b2fdf455adabe4b7ef9256f"
dockerfileUrl: "Dockerfile"
17 changes: 17 additions & 0 deletions .konflux-release/override-snapshot-fbc-417.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: appstudio.redhat.com/v1alpha1
kind: Snapshot
metadata:
generateName: serverless-operator-135-fbc-417-override-snapshot-
labels:
test.appstudio.openshift.io/type: override
application: serverless-operator-135-fbc-417
spec:
application: serverless-operator-135-fbc-417
components:
- name: "serverless-index-135-fbc-417"
containerImage: "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135-fbc-417/serverless-index-135-fbc-417@sha256:9c2dc323302806c927159f081b993929ce4b404f98f2ac7783f4ec31de1278bd"
source:
git:
url: "https://github.com/openshift-knative/serverless-operator"
revision: "7292e49bfa1322237b2fdf455adabe4b7ef9256f"
dockerfileUrl: "Dockerfile"
17 changes: 17 additions & 0 deletions .konflux-release/override-snapshot-fbc-418.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: appstudio.redhat.com/v1alpha1
kind: Snapshot
metadata:
generateName: serverless-operator-135-fbc-418-override-snapshot-
labels:
test.appstudio.openshift.io/type: override
application: serverless-operator-135-fbc-418
spec:
application: serverless-operator-135-fbc-418
components:
- name: "serverless-index-135-fbc-418"
containerImage: "quay.io/redhat-user-workloads/ocp-serverless-tenant/serverless-operator-135-fbc-418/serverless-index-135-fbc-418@sha256:93cc61097d21c728a7d22b266a873a530d7e7dbe5bd7f2a0f67b7364744aee7e"
source:
git:
url: "https://github.com/openshift-knative/serverless-operator"
revision: "7292e49bfa1322237b2fdf455adabe4b7ef9256f"
dockerfileUrl: "Dockerfile"
Loading

0 comments on commit d47ca80

Please sign in to comment.