Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion head
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eb9be4bacbf1ab80f8d65ba79de270629b08507e
1fa495c1ddc3b2647d8ae99b537a865cbb358f42
6 changes: 3 additions & 3 deletions upstream/.ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: console-plugin-test-cypress
namespace: ci
tag: node20-yarn4
name: nodejs-18
namespace: openshift
tag: latest
25 changes: 0 additions & 25 deletions upstream/.github/renovate.json

This file was deleted.

22 changes: 4 additions & 18 deletions upstream/.github/workflows/publish_container_image.yaml
Original file line number Diff line number Diff line change
@@ -1,41 +1,27 @@
name: Build and Publish Container

name: publish container images
on:
push:
branches:
- main
- release-v* # example: release-v1.14
- main_ocp_4.22
tags: ['v*']
pull_request:
branches:
- main
- main_ocp_4.22
workflow_dispatch:

jobs:
setup:
name: build container
runs-on: ubuntu-latest
permissions:
contents: read
packages: write

steps:
- name: Checkout source code
uses: actions/checkout@v4

- uses: actions/setup-node@v4
with:
node-version: '20'

- name: Enable Corepack
run: corepack enable
node-version: '18'

- uses: docker/setup-buildx-action@v3

- name: Login in to ghcr.io registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
with:
registry: ghcr.io
Expand All @@ -55,5 +41,5 @@ jobs:
run: ./scripts/build_container.sh
env:
SUPPORT_MULTI_ARCH: "true"
CONSOLE_PLUGIN_IMAGE_REPO: ${{ github.event_name == 'pull_request' && format('ttl.sh/{0}/console-plugin-pr-{1}', github.repository, github.event.pull_request.number) || format('ghcr.io/{0}', github.repository) }}
CONSOLE_PLUGIN_IMAGE_TAG: ${{ github.event_name == 'pull_request' && '24h' || github.ref_name }}
CONSOLE_PLUGIN_IMAGE_REPO: 'ghcr.io/${{ github.repository }}'
CONSOLE_PLUGIN_IMAGE_TAG: '${{ github.ref_name }}'
5 changes: 1 addition & 4 deletions upstream/.gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
node_modules/
*.tgz
dist/
/coverage
.devcontainer/dev.env
integration-tests/gui_test_screenshots
integration-tests/videos
integration-tests/screenshots
yarn-error.log
.DS_Store
*.pem
integration-tests/cypress-a11y-report.json
.yarn/*
integration-tests/cypress-a11y-report.json
1 change: 1 addition & 0 deletions upstream/.konflux/.placeholder
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test
8 changes: 8 additions & 0 deletions upstream/.konflux/1.18/application.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Generated by openshift-pipelines/hack. DO NOT EDIT.
---
apiVersion: appstudio.redhat.com/v1alpha1
kind: Application
metadata:
name: console-plugin-1-18
spec:
displayName: console-plugin 1.18
18 changes: 18 additions & 0 deletions upstream/.konflux/1.18/component-console-plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by openshift-pipelines/hack. DO NOT EDIT.
---
apiVersion: appstudio.redhat.com/v1alpha1
kind: Component
metadata:
annotations:
build.appstudio.openshift.io/pipeline: '{"name":"docker-build-multi-platform-oci-ta","bundle":"latest"}'
name: console-plugin-1-18-console-plugin
spec:
componentName: console-plugin
application: console-plugin-1-18
build-nudges-ref:
- operator-1-18-bundle
source:
git:
url: https://github.com/openshift-pipelines/console-plugin
dockerfileUrl: .konflux/dockerfiles/console-plugin.Dockerfile
revision: release-v1.18.x
15 changes: 15 additions & 0 deletions upstream/.konflux/1.18/image-console-plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Generated by openshift-pipelines/hack. DO NOT EDIT.
---
apiVersion: appstudio.redhat.com/v1alpha1
kind: ImageRepository
metadata:
name: 1-18-console-plugin-rhel9
annotations:
image-controller.appstudio.redhat.com/update-component-image: "true"
labels:
appstudio.redhat.com/component: console-plugin-1-18-console-plugin
appstudio.redhat.com/application: console-plugin-1-18
spec:
image:
name: 1-18/console-plugin-rhel9
visibility: public
27 changes: 27 additions & 0 deletions upstream/.konflux/1.18/tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Generated by openshift-pipelines/hack. DO NOT EDIT.
---
apiVersion: appstudio.redhat.com/v1beta2
kind: IntegrationTestScenario
metadata:
name: console-plugin-1-18-enterprise-contract
spec:
application: console-plugin-1-18
contexts:
- description: Application testing for console-plugin-1-18-console-plugin
name: component_console-plugin-1-18-console-plugin
params:
- name: POLICY_CONFIGURATION
value: tekton-ecosystem-tenant/tekton-ecosystem-tenant-containers
- name: TIMEOUT
value: "15m0s"
- name: SINGLE_COMPONENT
value: "true"
resolverRef:
params:
- name: url
value: "https://github.com/konflux-ci/build-definitions"
- name: revision
value: main
- name: pathInRepo
value: pipelines/enterprise-contract.yaml
resolver: git
32 changes: 14 additions & 18 deletions upstream/.konflux/dockerfiles/console-plugin.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
ARG BUILDER=registry.redhat.io/ubi9/nodejs-20@sha256:b45e1ba00ca4bda7575f3ef2a5000ea679e64b9892daa1d8ec850ae38f1d9259
ARG RUNTIME=registry.redhat.io/ubi9/nginx-124@sha256:b9c2c8657761ea521f49ade5b330e5f81ac03372a093588f142de736e13336af
ARG BUILDER=registry.redhat.io/ubi9/nodejs-18@sha256:01197aaa92c0f9230f4fbb3e58a9154e31006a1b377f4be2f1901a7977f49c34
ARG RUNTIME=registry.access.redhat.com/ubi9/nginx-124@sha256:8f3028866a8e2d8fafea39b0fc49f523a46ec645d11507c2a04bedf93c79142d

FROM $BUILDER AS builder-ui

WORKDIR /go/src/github.com/openshift-pipelines/console-plugin
COPY . .
#Install Yarn
RUN if [[ -d /cachi2/output/deps/npm/ ]]; then \
npm install -g /cachi2/output/deps/npm/yarnpkg-cli-dist-4.6.0.tgz; \
YARN_ENABLE_NETWORK=0; \
else \
npm install -g corepack; \
corepack enable ;\
corepack prepare yarn@4.6.0 --activate; \
fi

# Install dependencies & build
USER root
RUN CYPRESS_INSTALL_BINARY=0 yarn install --immutable && \
RUN npm install -g yarn-1.22.22.tgz
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
COPY .konflux/yarn.lock .
RUN yarn install --offline --frozen-lockfile --ignore-scripts && \
yarn build


FROM $RUNTIME
ARG VERSION=console-plugin-main
ARG VERSION=console-plugin-1.18.1

COPY --from=builder-ui /go/src/github.com/openshift-pipelines/console-plugin/dist /usr/share/nginx/html
COPY --from=builder-ui /go/src/github.com/openshift-pipelines/console-plugin/nginx.conf /etc/nginx/nginx.conf

USER root
RUN dnf install -y openssl-libs && \
dnf install -y libxml2 && \
dnf install -y openssl

USER 1001

ENTRYPOINT ["nginx", "-g", "daemon off;"]
Expand All @@ -40,4 +35,5 @@ LABEL \
description="Red Hat OpenShift Pipelines Console Plugin" \
io.k8s.display-name="Red Hat OpenShift Pipelines Console Plugin" \
io.k8s.description="Red Hat OpenShift Pipelines Console Plugin" \
io.openshift.tags="pipelines,tekton,openshift"
io.openshift.tags="pipelines,tekton,openshift" \
cpe="cpe:/a:redhat:openshift_pipelines:1.18::el9"
8 changes: 8 additions & 0 deletions upstream/.konflux/next/application.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Generated by openshift-pipelines/hack. DO NOT EDIT.
---
apiVersion: appstudio.redhat.com/v1alpha1
kind: Application
metadata:
name: console-plugin-next
spec:
displayName: console-plugin next
18 changes: 18 additions & 0 deletions upstream/.konflux/next/component-console-plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by openshift-pipelines/hack. DO NOT EDIT.
---
apiVersion: appstudio.redhat.com/v1alpha1
kind: Component
metadata:
annotations:
build.appstudio.openshift.io/pipeline: '{"name":"docker-build-multi-platform-oci-ta","bundle":"latest"}'
name: console-plugin-next-console-plugin
spec:
componentName: console-plugin
application: console-plugin-next
build-nudges-ref:
- operator-next-bundle
source:
git:
url: https://github.com/openshift-pipelines/console-plugin
dockerfileUrl: .konflux/dockerfiles/console-plugin.Dockerfile
revision: release-v1.18.x
15 changes: 15 additions & 0 deletions upstream/.konflux/next/image-console-plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Generated by openshift-pipelines/hack. DO NOT EDIT.
---
apiVersion: appstudio.redhat.com/v1alpha1
kind: ImageRepository
metadata:
name: next-console-plugin-rhel9
annotations:
image-controller.appstudio.redhat.com/update-component-image: "true"
labels:
appstudio.redhat.com/component: console-plugin-next-console-plugin
appstudio.redhat.com/application: console-plugin-next
spec:
image:
name: next/console-plugin-rhel9
visibility: public
25 changes: 25 additions & 0 deletions upstream/.konflux/next/release-plan.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Generated by openshift-pipelines/hack. DO NOT EDIT.
---
apiVersion: appstudio.redhat.com/v1alpha1
kind: ReleasePlan
metadata:
labels:
release.appstudio.openshift.io/auto-release: 'true'
release.appstudio.openshift.io/standing-attribution: 'true'
name: console-plugin-next-rp
spec:
application: console-plugin-next
tenantPipeline:
serviceAccountName: release-registry-openshift-pipelines-next
pipelineRef:
resolver: git
params:
- name: url
value: https://github.com/openshift-pipelines/hack.git
- name: revision
value: main
- name: pathInRepo
value: tenantpipelines/pipeline.yaml
params:
- name: released_version
value: 5.0.5
27 changes: 27 additions & 0 deletions upstream/.konflux/next/tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Generated by openshift-pipelines/hack. DO NOT EDIT.
---
apiVersion: appstudio.redhat.com/v1beta2
kind: IntegrationTestScenario
metadata:
name: console-plugin-next-enterprise-contract
spec:
application: console-plugin-next
contexts:
- description: Application testing for console-plugin-next-console-plugin
name: component_console-plugin-next-console-plugin
params:
- name: POLICY_CONFIGURATION
value: tekton-ecosystem-tenant/tekton-ecosystem-tenant-containers
- name: TIMEOUT
value: "15m0s"
- name: SINGLE_COMPONENT
value: "true"
resolverRef:
params:
- name: url
value: "https://github.com/konflux-ci/build-definitions"
- name: revision
value: main
- name: pathInRepo
value: pipelines/enterprise-contract.yaml
resolver: git
28 changes: 0 additions & 28 deletions upstream/.konflux/npm/package-lock.json

This file was deleted.

7 changes: 0 additions & 7 deletions upstream/.konflux/npm/package.json

This file was deleted.

1 change: 1 addition & 0 deletions upstream/.konflux/patches/.placeholder
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Test
Loading