Skip to content

Commit

Permalink
Merge branch 'main' into feat/develop-example-content
Browse files Browse the repository at this point in the history
  • Loading branch information
rrogoda authored Feb 5, 2025
2 parents 8288954 + daf4261 commit 2df2fb7
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 36 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/kind-localsetup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
pull_request:
branches:
- '**'
paths:
- 'local-setup/**'

concurrency:
group: localsetup-${{ github.ref }}
Expand Down Expand Up @@ -64,7 +66,7 @@ jobs:
# Step 4: Prepare the NodeJS/playwright environment
- name: Cache node modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/node_modules
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand All @@ -73,7 +75,7 @@ jobs:
# Step 5: Install NodeJS and dependencies
- name: Node ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
Expand Down
9 changes: 0 additions & 9 deletions .reuse/dep5

This file was deleted.

9 changes: 9 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version = 1
SPDX-PackageName = "helm-charts"
SPDX-PackageDownloadLocation = "https://github.com/openmfp/helm-charts"

[[annotations]]
path = "**"
precedence = "aggregate"
SPDX-FileCopyrightText = "2024 SAP SE or an SAP affiliate company and openMFP contributors and helm-charts contributors."
SPDX-License-Identifier = "Apache-2.0"
4 changes: 2 additions & 2 deletions charts/account-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: account-operator
description: A Helm chart to deploy OpenMFP Account-Operator
type: application
version: 0.5.66
appVersion: "0.154.0"
version: 0.5.67
appVersion: "0.155.0"
dependencies:
- name: account-operator-crds
version: 0.1.11
Expand Down
4 changes: 2 additions & 2 deletions charts/extension-manager-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: extension-manager-operator
description: A Helm chart for extension-manager-operator which manages resources like ContentConfigurations and exposes REST `/validate` endpoint
type: application
version: 0.22.94
appVersion: "0.111.0"
version: 0.22.96
appVersion: "0.113.0"
dependencies:
- name: extension-manager-operator-crds
version: 0.1.7
Expand Down
10 changes: 5 additions & 5 deletions charts/openmfp/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
dependencies:
- name: example-content
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.111.19
version: 0.111.20
- name: portal
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.71.45
version: 0.71.46
- name: infra
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.60.8
- name: extension-manager-operator
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.22.94
version: 0.22.96
- name: keycloak
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.60.17
digest: sha256:e6af5da1c622f87d8c567e484604a95a6775d8eb9d567b47e254c90d60c6a40e
generated: "2025-02-04T08:56:33.966710929Z"
digest: sha256:351e79b01def0c35788767927eac867d28448dbe6eb47a8821e0d5bc4969926f
generated: "2025-02-04T22:37:34.514291786Z"
8 changes: 4 additions & 4 deletions charts/openmfp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@ apiVersion: v2
name: openmfp
description: The OpenMFP chart for Kubernetes
type: application
version: 0.0.186
version: 0.0.190
appVersion: "0.0.0"

dependencies:
- name: example-content
version: 0.111.19
version: 0.111.20
repository: oci://ghcr.io/openmfp/helm-charts
condition: components.example-content.enabled
- name: portal
version: 0.71.45
version: 0.71.46
repository: oci://ghcr.io/openmfp/helm-charts
condition: components.portal.enabled
- name: infra
version: 0.60.8
repository: oci://ghcr.io/openmfp/helm-charts
condition: components.infra.enabled
- name: extension-manager-operator
version: 0.22.94
version: 0.22.96
repository: oci://ghcr.io/openmfp/helm-charts
condition: components.extension-manager-operator.enabled
- name: keycloak
Expand Down
Binary file removed charts/openmfp/charts/example-content-0.111.19.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed charts/openmfp/charts/portal-0.71.45.tgz
Binary file not shown.
Binary file added charts/openmfp/charts/portal-0.71.46.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion local-setup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export GH_TOKEN='' # token used to pull the openmfp docker images
```
- apply flux deployment configuration

To start the boostrapping and local installation invoke
To start the bootstrapping and local installation invoke
```sh
./local-setup/scripts/start.sh
```
Expand Down
22 changes: 11 additions & 11 deletions local-setup/e2e/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2df2fb7

Please sign in to comment.