Skip to content

Commit b700da7

Browse files
Merge branch 'main' of https://github.com/rancher/kubewarden-ui into install
2 parents da94cd9 + 4f70dea commit b700da7

16 files changed

Lines changed: 87 additions & 82 deletions

File tree

.github/workflows/build-extension-charts.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ defaults:
1111

1212
jobs:
1313
build-extension-charts:
14-
uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@48d0d137adc4de85b15a279fa13acdd668b12722 # master
14+
uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@9bf23dff6650116673346447bcf0b088e0edb27f # creators-pkg-v3.0.12
1515
permissions:
16-
actions: write
1716
contents: write
18-
deployments: write
19-
pages: write
17+
pull-requests: write
2018
with:
2119
target_branch: gh-pages
22-
tagged_release: ${{ github.ref_name }}
20+
tagged_release: ${{ github.ref_name }}

.github/workflows/fossa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
timeout-minutes: 30
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
18+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1919

2020
# The FOSSA token is shared between all repos in Rancher's GH org. It can be
2121
# used directly and there is no need to request specific access to EIO.
@@ -26,7 +26,7 @@ jobs:
2626
secret/data/github/org/rancher/fossa/push token | FOSSA_API_KEY_PUSH_ONLY
2727
2828
- name: FOSSA scan
29-
uses: fossas/fossa-action@ff70fe9fe17cbd2040648f1c45e8ec4e4884dcf3 # v1.9.0
29+
uses: fossas/fossa-action@29693cc50323968e039056be419b32989fc5880c # v2.0.0
3030
with:
3131
api-key: ${{ env.FOSSA_API_KEY_PUSH_ONLY }}
3232
# Only runs the scan and do not provide/returns any results back to the

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111

1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
14+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1515

1616
- name: Setup Nodejs and npm
17-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
17+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
1818
with:
1919
node-version: '24'
2020

2121
- name: Setup yarn
2222
run: npm install -g yarn
2323

2424
- name: Setup Nodejs with yarn caching
25-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
25+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
2626
with:
2727
node-version: '24'
2828
cache: yarn

.github/workflows/playwright.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,15 @@ jobs:
214214
# Create k3d cluster and install rancher
215215
# Use local kuberlr to avoid version skew
216216

217-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
217+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
218218
with:
219219
ref: ${{ steps.find-branch.outputs.ref }}
220220

221221
- name: Install k3d
222222
run: TAG=${{ env.K3D_VERSION }} sudo --preserve-env=TAG k3d-install
223223

224224
- name: Install Rancher
225-
uses: kubewarden/kubewarden-end-to-end-tests@50f4cf0f4f05df8328dfd1f5c36dd25bff148415 # main
225+
uses: kubewarden/kubewarden-end-to-end-tests@2f6179e7730dc829724bd79d8ec39ffae7418d0c # main
226226
with:
227227
make: rancher
228228
env:
@@ -237,7 +237,7 @@ jobs:
237237
# Setup playwright ENV and run tests
238238
# https://rancher.github.io/dashboard/testing/e2e-test#setup-for-local-tests
239239

240-
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
240+
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
241241
with:
242242
node-version: '24'
243243

.github/workflows/unit-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
17+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1818
with:
1919
fetch-depth: 0
2020

2121
- name: Setup Nodejs and npm
22-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
22+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
2323
with:
2424
node-version: '24'
2525

2626
- name: Setup yarn
2727
run: npm install -g yarn
2828

2929
- name: Setup Nodejs with yarn caching
30-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
30+
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
3131
with:
3232
node-version: '24'
3333
cache: yarn

pkg/kubewarden/components/Dashboard/__tests__/InstallView.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ describe('component: InstallView', () => {
168168
query: {
169169
'repo-type': 'cluster',
170170
repo: 'kubewarden-charts',
171-
chart: 'kubewarden-controller',
171+
chart: 'suse-security-admission-controller',
172172
version: '2.0.5',
173173
namespace: 'kubewarden-system'
174174
}
@@ -214,7 +214,7 @@ describe('component: InstallView', () => {
214214
query: {
215215
'repo-type': 'cluster',
216216
repo: 'kubewarden-charts',
217-
chart: 'kubewarden-controller',
217+
chart: 'suse-security-admission-controller',
218218
version: '2.0.6-rc1',
219219
namespace: 'kubewarden-system'
220220
}

pkg/kubewarden/types/kubewarden.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ export const KUBEWARDEN_REPOS = {
2727
POLICY_CATALOG_REPO_NAME: 'kubewarden-policy-catalog',
2828
};
2929

30-
export const KUBEWARDEN_CHARTS = { CONTROLLER: 'suse-security-admission-controller' };
30+
export const KUBEWARDEN_CHARTS = {
31+
CONTROLLER: 'suse-security-admission-controller',
32+
DEFAULTS: 'kubewarden-defaults',
33+
};
3134

3235
export const KUBEWARDEN_APPS = {
3336
RANCHER_CONTROLLER: 'rancher-suse-security-admission-controller',

renovate.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
"helpers:pinGitHubActionDigests",
66
"schedule:earlyMondays"
77
],
8+
"minimumReleaseAge": "7 days",
9+
"vulnerabilityAlerts": {
10+
"minimumReleaseAge": "0 days"
11+
},
812
"ignoreDeps": [
913
"./dashboard",
1014
"core-js",

tests/e2e/components/rancher-ui.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ export class RancherUI {
145145
// Load yaml from code editor
146146
await expect(this.codeMirror).toBeVisible()
147147
const lines = await this.codeMirror.locator('pre.CodeMirror-line').allTextContents()
148-
const cmYaml = jsyaml.load(lines.join('\n')
148+
const cmText = lines.join('\n')
149149
.replace(/\u00A0/g, ' ') // replace   with space
150150
.replace(/\u200B/g, '') // remove ZERO WIDTH SPACE last line
151-
) || {}
151+
const cmYaml = cmText.trim() ? (jsyaml.load(cmText) || {}) : {}
152152

153153
// Edit yaml
154154
if (typeof patch === 'function') {

tests/e2e/rancher/rancher-apps.page.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ export class RancherAppsPage extends BasePage {
4848

4949
constructor(page: Page) {
5050
super(page)
51-
this.step1 = page.getByRole('heading', { name: 'Install: Step 1' })
52-
this.step2 = page.getByRole('heading', { name: 'Install: Step 2' })
51+
this.step1 = page.getByRole('heading', { name: 'Install: Step 1' }).or(this.page.getByRole('tab', { name: 'Metadata', selected: true })).first()
52+
this.step2 = page.getByRole('heading', { name: 'Install: Step 2' }).or(this.page.getByRole('tab', { name: 'Values', selected: true })).first()
5353
this.stepTitle = page.locator('div.top.choice-banner>.title')
5454
this.nextBtn = this.ui.button('Next')
5555
this.installBtn = this.ui.button(/Install|Install this version/)

0 commit comments

Comments
 (0)