Skip to content

Commit df7f858

Browse files
Merge pull request #1014 from anwesha-palit-redhat/master-with-main
SRVKP-11384,SRVKP-11386: Merge main into master
2 parents eff032d + 41f2204 commit df7f858

51 files changed

Lines changed: 1825 additions & 677 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"extends": [
44
"github>konflux-ci/mintmaker//config/renovate/renovate.json"
55
],
6-
"branchPrefix": "osp-mintmaker/",
76
"enabledManagers": [
87
"tekton",
98
"dockerfile",
@@ -15,6 +14,7 @@
1514
"konflux",
1615
"mintmaker"
1716
],
17+
"ignorePaths": ["upstream/**"],
1818
"autoApprove": true,
1919
"packageRules": [
2020
{

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ yarn-error.log
1010
.DS_Store
1111
*.pem
1212
integration-tests/cypress-a11y-report.json
13-
.yarn/
13+
.yarn/*

OWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
approvers:
22
- anwesha-palit-redhat
3+
- arvindk-softwaredev
34
- vdemeester
45
- vikram-raj
56
- lokanandaprabhu

locales/en/plugin__pipelines-console-plugin.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@
299299
"Missing resources": "Missing resources",
300300
"Missing workspaces": "Missing workspaces",
301301
"More info": "More info",
302+
"Multicluster Pipeline Run": "Multicluster Pipeline Run",
302303
"Must define at least one task.": "Must define at least one task.",
303304
"Name": "Name",
304305
"Name must consist of lower-case letters, numbers and hyphens. It must start with a letter and end with a letter or number.": "Name must consist of lower-case letters, numbers and hyphens. It must start with a letter and end with a letter or number.",
@@ -316,7 +317,6 @@
316317
"No labels": "No labels",
317318
"No latest run available": "No latest run available",
318319
"No logs found": "No logs found",
319-
"No logs to display for {{taskName}} task": "No logs to display for {{taskName}} task",
320320
"No matching events": "No matching events",
321321
"No options matching your criteria": "No options matching your criteria",
322322
"No Output found": "No Output found",
@@ -393,6 +393,7 @@
393393
"PipelineRun failed to start": "PipelineRun failed to start",
394394
"PipelineRun has been {{state}}": "PipelineRun has been {{state}}",
395395
"PipelineRun has timed out": "PipelineRun has timed out",
396+
"PipelineRun is waiting to be admitted to a worker cluster": "PipelineRun is waiting to be admitted to a worker cluster",
396397
"PipelineRun name": "PipelineRun name",
397398
"PipelineRun not started yet": "PipelineRun not started yet",
398399
"PipelineRun status": "PipelineRun status",
@@ -568,6 +569,7 @@
568569
"The base server url (e.g. https://quay.io/)": "The base server url (e.g. https://quay.io/)",
569570
"The following secrets are available for all pipelines in this namespace to authenticate to the specified Git server or Image registry:": "The following secrets are available for all pipelines in this namespace to authenticate to the specified Git server or Image registry:",
570571
"The following variables can be used in the Parameters or when created new Resources.": "The following variables can be used in the Parameters or when created new Resources.",
572+
"The multi-cluster connection is unavailable. Logs and status may be delayed until connection is restored.": "The multi-cluster connection is unavailable. Logs and status may be delayed until connection is restored.",
571573
"The secret is required to set the Build status and to attach the webhook to the Git repository.": "The secret is required to set the Build status and to attach the webhook to the Git repository.",
572574
"There was an unknown error": "There was an unknown error",
573575
"This action will delete resource from k8s but still the resource can be fetched from Tekton Results": "This action will delete resource from k8s but still the resource can be fetched from Tekton Results",

locales/es/plugin__pipelines-console-plugin.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"<0>{{eventCount}} times</0>": "<0>{{eventCount}} veces</0>",
2626
"<0>In the <1>.tekton</1> directory, create a new file called<3>push.yaml</3> and add the following code:</0>": "<0>En el directorio <1>.tekton</1>, cree un nuevo archivo llamado <3>push.yaml</3> y agregue el siguiente código:</0>",
2727
"<0>In your repository, create the <2>.tekton</2> directory to store you pipeline.</0>": "<0>En su repositorio, cree el directorio <2>.tekton</2> para almacenar su canalización.</0>",
28-
"<0>Use the <2>link</2> to install the newly created GitHub application to your repositories in your organization/account</0>": "<0>Utilice el <2>enlace</2> para instalar la aplicación GitHub recién creada en sus repositorios en su organización/cuenta</0>",
28+
"<0>Use the <2>link</2> to install the newly created GitHub application to your repositories in your organization/account</0>": "<0>Utilice el <2>enlace</2> para instalar la aplicación GitHub recién creada en sus repositorios en su organización o cuenta</0>",
2929
"A GitHub App is already set up for this cluster. To use it, install the GitHub app on your personal account or GitHub organization.": "Ya hay una aplicación GitHub configurada para este clúster. Para usarla, instálela en su cuenta personal u organización de GitHub.",
3030
"Access Denied": "Acceso denegado",
3131
"Access Mode": "Modo de acceso",
@@ -76,7 +76,7 @@
7676
"Archived in Tekton results": "Archivado en resultados de Tekton",
7777
"Are you sure you want to approve": "¿Estás seguro que deseas aprobar?",
7878
"Are you sure you want to remove {{taskName}}?": "¿Está seguro de que desea quitar {{taskName}}?",
79-
"Are you sure you want to remove <1>{{selection}}</1> from <4>{{pipelineName}}</4>?": "¿Está seguro de que desea quitar <1>{{selection}}</1> de <4>?",
79+
"Are you sure you want to remove <1>{{selection}}</1> from <4>{{pipelineName}}</4>?": "¿Está seguro de que desea eliminar <1>{{selection}}</1> de <4>{{pipelineName}}</4>?",
8080
"Authentication type": "Tipo de autenticación",
8181
"Average duration": "Duración media",
8282
"Basic Authentication": "Autenticación básica",
@@ -291,6 +291,7 @@
291291
"Missing resources": "Recursos faltantes",
292292
"Missing workspaces": "Espacios de trabajo faltantes",
293293
"More info": "Más información",
294+
"Multicluster Pipeline Run": "Ejecución de canalización multiclúster",
294295
"Must define at least one task.": "Debe definir al menos una tarea.",
295296
"Name": "Nombre",
296297
"Name must consist of lower-case letters, numbers and hyphens. It must start with a letter and end with a letter or number.": "El nombre debe constar de letras minúsculas, números y guiones. Debe comenzar con una letra y terminar con una letra o número.",
@@ -382,6 +383,7 @@
382383
"PipelineRun failed to start": "Error al iniciar PipelineRun",
383384
"PipelineRun has been {{state}}": "PipelineRun ha sido {{state}}",
384385
"PipelineRun has timed out": "PipelineRun ha expirado",
386+
"PipelineRun is waiting to be admitted to a worker cluster": "PipelineRun está esperando ser admitido en un clúster de trabajadores",
385387
"PipelineRun name": "Nombre de PipelineRun",
386388
"PipelineRun not started yet": "PipelineRun aún no iniciada",
387389
"PipelineRun status": "Estado de PipelineRun",
@@ -560,6 +562,7 @@
560562
"The base server url (e.g. https://quay.io/)": "La URL del servidor base (por ejemplo, https://quay.io/)",
561563
"The following secrets are available for all pipelines in this namespace to authenticate to the specified Git server or Image registry:": "Los siguientes secretos están disponibles para que todas las canalizaciones en este espacio de nombres se autentiquen en el servidor Git o registro de imágenes especificado:",
562564
"The following variables can be used in the Parameters or when created new Resources.": "Las siguientes variables se pueden utilizar en los Parámetros o cuando se crean nuevos Recursos.",
565+
"The multi-cluster connection is unavailable. Logs and status may be delayed until connection is restored.": "La conexión multiclúster no está disponible. Los registros y el estado podrían retrasarse hasta que se restablezca la conexión.",
563566
"The secret is required to set the Build status and to attach the webhook to the Git repository.": "El secreto es necesario para establecer el estado de compilación y adjuntar el webhook al repositorio Git.",
564567
"There was an unknown error": "Se produjo un error desconocido",
565568
"This action will delete resource from k8s but still the resource can be fetched from Tekton Results": "Esta acción eliminará el recurso de k8s pero aún así se podrá recuperar el recurso de Resultados de Tekton",
@@ -601,10 +604,10 @@
601604
"URL": "URL",
602605
"Use <1>{appLink}</1> link to install the GitHub Application to your repositories in your organisation/account.": "Utilice el enlace <1>{appLink}</1> para instalar la aplicación GitHub en los repositorios de su organización o cuenta.",
603606
"Use GitHub App": "Utilizar la aplicación GitHub",
604-
"Use this <2>link</2> to install the GitHub Application to your repositories in your organization/account.": "Utilice este <2>enlace</2> para instalar la aplicación GitHub en sus repositorios en su organización/cuenta.",
607+
"Use this <2>link</2> to install the GitHub Application to your repositories in your organization/account.": "Utilice este <2>enlace</2> para instalar la aplicación GitHub en sus repositorios en su organización o cuenta.",
605608
"Use this format when you reference variables in this form: ": "Utilice este formato cuando haga referencia a variables en este formulario: ",
606609
"Use this format when you reference variables in this form: <2>$(</2>": "Utilice este formato cuando haga referencia a variables en este formulario: <2>$(</2>",
607-
"Use your Bitbucket App password. Use this <2>link</2> to create a token with <5>Read and Write </5>scopes in <8>Account, Workspace membership, Projects, Issues, Pull requests and Webhooks</8>.": "Utilice la contraseña de su aplicación Bitbucket. Utilice este <2>enlace</2> para crear un token con los alcances <5>Lectura y escritura</5> en <8>Cuenta, membresía del espacio de trabajo, proyectos, problemas, solicitudes de extracción y webhooks</8>.",
610+
"Use your Bitbucket App password. Use this <2>link</2> to create a token with <5>Read and Write </5>scopes in <8>Account, Workspace membership, Projects, Issues, Pull requests and Webhooks</8>.": "Utilice la contraseña de su aplicación Bitbucket. Utilice este <2>enlace</2> para crear un token con los alcances <5>Lectura y escritura </5>en <8>Cuenta, membresía del espacio de trabajo, proyectos, problemas, solicitudes de extracción y webhooks</8>.",
608611
"Use your Gitlab Personal access token. Use this <2>link</2> to create a token with <5>api</5> scope. Select the role as <8>Maintainer/Owner</8>. Give your token an expiration i.e 30d.": "Utilice su token de acceso personal de Gitlab. Utilice este <2>enlace</2> para crear un token con el alcance <5>api</5>. Seleccione el rol como <8>Mantenedor/Propietario</8>.Asigne un vencimiento a su token, es decir, 30 días.",
609612
"User": "Usuario",
610613
"User not an approver": "El usuario no es un aprobador",
@@ -651,4 +654,4 @@
651654
"Zoom out": "Alejar",
652655
"Use your Git Personal token. Create a token with repo, public_repo & admin:repo_hook scopes and give your token an expiration, i.e 30d.": "Usa tu token personal de Git. Crea un token con repo, public_repo y admin:repo.",
653656
"Use your GitHub Personal token. Use this <2>link</2> to create a <5>classic</5> token with <7>repo</7> & <10>admin:repo_hook</10> scopes and give your token an expiration, i.e 30d.": "Usa tu token personal de GitHub. Usa esto<2> enlace</2> Para crear un<5> clásico</5> token con<7> repositorio</7> &<10> administrador:repositorio"
654-
}
657+
}

0 commit comments

Comments
 (0)