Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dejanzele committed Aug 29, 2023
1 parent 05ad57c commit 496c156
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion charts/testkube-cloud-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: testkube-cloud-api
description: A Helm chart for Testkube Cloud API
type: application
version: 1.14.0
appVersion: 1.3.6
appVersion: 1.3.7
maintainers:
- name: testkube
url: https://testkube.io
Expand Down
2 changes: 1 addition & 1 deletion charts/testkube-cloud-api/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# testkube-cloud-api

![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.6](https://img.shields.io/badge/AppVersion-1.3.6-informational?style=flat-square)
![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.7](https://img.shields.io/badge/AppVersion-1.3.7-informational?style=flat-square)

A Helm chart for Testkube Cloud API

Expand Down
2 changes: 1 addition & 1 deletion charts/testkube-cloud-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -349,4 +349,4 @@ nodeSelector: {}

tolerations: []

affinity: {}
affinity: {}
4 changes: 2 additions & 2 deletions charts/testkube-cloud-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: testkube-cloud-ui
description: A Helm chart for Testkube Cloud UI
type: application
version: 1.13.79
appVersion: 1.3.1
version: 1.14.0
appVersion: 1.4.0-dev-f443d5d
maintainers:
- name: testkube
url: https://testkube.io
Expand Down
2 changes: 1 addition & 1 deletion charts/testkube-cloud-ui/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# testkube-cloud-ui

![Version: 1.13.79](https://img.shields.io/badge/Version-1.13.79-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.1](https://img.shields.io/badge/AppVersion-1.3.1-informational?style=flat-square)
![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0-dev-f443d5d](https://img.shields.io/badge/AppVersion-1.4.0--dev--f443d5d-informational?style=flat-square)

A Helm chart for Testkube Cloud UI

Expand Down
6 changes: 3 additions & 3 deletions charts/testkube-enterprise/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
version: 1.14.0
- name: testkube-cloud-ui
repository: file://../testkube-cloud-ui
version: 1.13.79
version: 1.14.0
- name: dex
repository: https://charts.dexidp.io
version: 0.14.1
Expand All @@ -17,5 +17,5 @@ dependencies:
- name: nats
repository: https://nats-io.github.io/k8s/helm/charts/
version: 0.14.2
digest: sha256:3bcfc8ea1b577d1858c8618ae4d8cefede2debc370c7e7d80d4f54e5f9319e7c
generated: "2023-08-29T12:27:25.691763+02:00"
digest: sha256:929dcab66016c125f2810c023ca9108e8cfc4411c1e268ab5492122a6f513590
generated: "2023-08-29T13:32:11.175725+02:00"
2 changes: 1 addition & 1 deletion charts/testkube-enterprise/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
version: 1.14.0
repository: file://../testkube-cloud-api
- name: testkube-cloud-ui
version: 1.13.79
version: 1.14.0
repository: file://../testkube-cloud-ui
- name: dex
version: 0.14.1
Expand Down
6 changes: 3 additions & 3 deletions charts/testkube-enterprise/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ A Helm chart for Testkube Enterprise
| Repository | Name | Version |
|------------|------|---------|
| file://../testkube-cloud-api | testkube-cloud-api | 1.14.0 |
| file://../testkube-cloud-ui | testkube-cloud-ui | 1.13.79 |
| file://../testkube-cloud-ui | testkube-cloud-ui | 1.14.0 |
| https://charts.bitnami.com/bitnami | common | 2.2.5 |
| https://charts.bitnami.com/bitnami | mongodb | 13.10.2 |
| https://charts.dexidp.io | dex | 0.14.1 |
Expand Down Expand Up @@ -124,7 +124,7 @@ A Helm chart for Testkube Enterprise
| testkube-cloud-api.api.tls.tlsSecret | string | `"testkube-enterprise-api-tls"` | |
| testkube-cloud-api.fullnameOverride | string | `"testkube-enterprise-api"` | |
| testkube-cloud-api.image.repository | string | `"testkubeenterprise/testkube-enterprise-api"` | |
| testkube-cloud-api.image.tag | string | `"1.3.6"` | |
| testkube-cloud-api.image.tag | string | `"1.3.7"` | |
| testkube-cloud-api.ingress | string | `nil` | |
| testkube-cloud-api.minio.accessModes | list | `["ReadWriteOnce"]` | PVC Access Modes for Minio. The volume is mounted as read-write by a single node. |
| testkube-cloud-api.minio.affinity | object | `{}` | Affinity for pod assignment. |
Expand All @@ -147,7 +147,7 @@ A Helm chart for Testkube Enterprise
| testkube-cloud-api.prometheus.enabled | bool | `true` | |
| testkube-cloud-ui.fullnameOverride | string | `"testkube-enterprise-ui"` | |
| testkube-cloud-ui.image.repository | string | `"testkubeenterprise/testkube-enterprise-ui"` | |
| testkube-cloud-ui.image.tag | string | `"1.3.1"` | |
| testkube-cloud-ui.image.tag | string | `"1.4.0-dev-f443d5d"` | |
| testkube-cloud-ui.ingress.tlsSecretName | string | `"testkube-enterprise-ui-tls"` | Name of the TLS secret which contains the certificate files |

----------------------------------------------
Expand Down
Binary file modified charts/testkube-enterprise/charts/testkube-cloud-api-1.14.0.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions charts/testkube-enterprise/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ testkube-cloud-api:
fullnameOverride: testkube-enterprise-api
image:
repository: testkubeenterprise/testkube-enterprise-api
tag: 1.3.6
tag: 1.3.7
api:
# -- Configure which invitation mode to use (email|auto-accept): email uses SMTP protocol to send email invites and auto-accept immediately adds them
inviteMode: email
Expand Down Expand Up @@ -174,7 +174,7 @@ testkube-cloud-ui:
fullnameOverride: testkube-enterprise-ui
image:
repository: testkubeenterprise/testkube-enterprise-ui
tag: 1.3.1
tag: 1.4.0-dev-f443d5d
ingress:
# -- Name of the TLS secret which contains the certificate files
tlsSecretName: testkube-enterprise-ui-tls
Expand Down

0 comments on commit 496c156

Please sign in to comment.