Skip to content

Commit

Permalink
chore: update Helm chart versions and improve Taskfile commands
Browse files Browse the repository at this point in the history
  • Loading branch information
akafazov committed Feb 2, 2025
1 parent fd542c2 commit 2df5816
Show file tree
Hide file tree
Showing 32 changed files with 56 additions and 29 deletions.
4 changes: 2 additions & 2 deletions Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ tasks:
- "for chart in $(echo {{.CHARTS}} | tr ',' ' '); do helm dependency update $chart; done"
validate:
cmds:
- task: update
- task: test
- task: helm-docs
- task: update
- task: lint
- task: test
- task: oci
vulnerability:
deps:
Expand Down
2 changes: 1 addition & 1 deletion charts/account-operator-crds/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ description: A Helm chart for Kubernetes

type: application

version: 0.1.11
version: 0.1.12

appVersion: "0.0.0"
Binary file modified charts/account-operator/charts/account-operator-crds-0.1.11.tgz
Binary file not shown.
Binary file modified charts/account-operator/charts/common-0.2.7.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/common/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ description: A Helm chart containing reuse templates

type: library

version: 0.2.7
version: 0.2.8
2 changes: 1 addition & 1 deletion charts/example-content/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "0.140.0"
description: Helm Chart for the openmfp Portal
name: example-content
version: 0.111.18
version: 0.112.0
dependencies:
- name: common
version: 0.2.7
Expand Down
6 changes: 3 additions & 3 deletions charts/example-content/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Helm Chart for the openmfp Portal
|-----|------|---------|-------------|
| contentConfigurations.home | bool | `true` | This content configuration enables a basic homepage in the portal |
| image.name | string | `"ghcr.io/openmfp/example-content"` | The image name |
| istio.virtualService.hosts[0] | string | `"your-host.com"` | |
| istio.virtualService.matchers[0].match[0].uri.exact | string | `"/ui/example-content"` | |
| istio.virtualService.matchers[0].match[1].uri.prefix | string | `"/ui/example-content/"` | |
| istio.enabled | bool | `true` | |
| istio.virtualService.hosts[0] | string | `"*"` | |
| istio.virtualService.matchers[0].match[0].uri.prefix | string | `"/ui/"` | |

## Overriding Values

Expand Down
Binary file modified charts/example-content/charts/common-0.2.7.tgz
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,34 @@ matches the snapshot:
- emptyDir: {}
name: run-volume
3: |
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: RELEASE-NAME-example-content
namespace: NAMESPACE
spec:
gateways:
- NAMESPACE/gateway
hosts:
- '*'
http:
- match:
- uri:
prefix: /ui/
route:
- destination:
host: RELEASE-NAME-example-content.NAMESPACE.svc.cluster.local
port:
number: 8080
4: |
apiVersion: v1
imagePullSecrets:
- name: github
kind: ServiceAccount
metadata:
name: RELEASE-NAME-example-content
namespace: NAMESPACE
4: |
5: |
apiVersion: v1
kind: Service
metadata:
Expand Down
13 changes: 9 additions & 4 deletions charts/example-content/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@ image:
name: ghcr.io/openmfp/example-content

istio:
enabled: true
virtualService:
hosts:
- your-host.com
- "*"
matchers:
- match:
- uri:
exact: /ui/example-content
- uri:
prefix: /ui/example-content/
prefix: /ui/
# matchers:
# - match:
# - uri:
# exact: /ui/example-content
# - uri:
# prefix: /ui/example-content/

contentConfigurations:
# -- This content configuration enables a basic homepage in the portal
Expand Down
2 changes: 1 addition & 1 deletion charts/extension-manager-operator-crds/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ name: extension-manager-operator-crds
description: A Helm chart for Kubernetes

type: application
version: 0.1.7
version: 0.1.8
appVersion: "0.0.0"
Binary file modified charts/extension-manager-operator/charts/common-0.2.7.tgz
Binary file not shown.
Binary file not shown.
Binary file modified charts/infra/charts/common-0.2.7.tgz
Binary file not shown.
Binary file modified charts/keycloak/charts/common-0.2.7.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/keycloak/templates/crossplane/realm.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if eq (include "common.getNestedValue" (dict "Values" .Values "key" "crossplane.enabled")) "true" -}}
{{- if eq (include "common.getKeyValue" (dict "Values" .Values "key" "crossplane.enabled")) "true" -}}
apiVersion: realm.keycloak.crossplane.io/v1alpha1
kind: Realm
metadata:
Expand Down
2 changes: 1 addition & 1 deletion charts/openmfp-crds/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: openmfp-crds
description: A chart containing CRD Definitions for OpenMFP
type: application
version: 0.0.15
version: 0.0.16
appVersion: "0.0.0"

dependencies:
Expand Down
Binary file modified charts/openmfp-crds/charts/account-operator-crds-0.1.11.tgz
Binary file not shown.
Binary file not shown.
12 changes: 6 additions & 6 deletions charts/openmfp/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dependencies:
- name: example-content
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.111.18
repository: file://../example-content
version: 0.112.0
- name: portal
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.71.38
repository: file://../portal
version: 0.72.0
- name: infra
repository: file://../infra
version: 0.61.0
Expand All @@ -14,5 +14,5 @@ dependencies:
- name: keycloak
repository: file://../keycloak
version: 0.61.0
digest: sha256:816c23bc1b5b909df62bb115afd0859d18df81a022c69f51dadbd72f69311dd1
generated: "2025-01-31T18:09:17.84755411+02:00"
digest: sha256:f9cc5e3295cf49f040846d7c7283027d5e3f644480be622a0c1746c4479ff467
generated: "2025-02-01T16:29:13.469948+02:00"
8 changes: 4 additions & 4 deletions charts/openmfp/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ appVersion: "0.0.0"

dependencies:
- name: example-content
version: 0.111.18
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.112.0
repository: file://../example-content
condition: components.example-content.enabled
- name: portal
version: 0.71.38
repository: oci://ghcr.io/openmfp/helm-charts
version: 0.72.0
repository: file://../portal
condition: components.portal.enabled
- name: infra
version: 0.61.0
Expand Down
Binary file removed charts/openmfp/charts/example-content-0.111.18.tgz
Binary file not shown.
Binary file not shown.
Binary file modified charts/openmfp/charts/extension-manager-operator-0.23.0.tgz
Binary file not shown.
Binary file modified charts/openmfp/charts/infra-0.61.0.tgz
Binary file not shown.
Binary file modified charts/openmfp/charts/keycloak-0.61.0.tgz
Binary file not shown.
Binary file removed charts/openmfp/charts/portal-0.71.38.tgz
Binary file not shown.
Binary file added charts/openmfp/charts/portal-0.72.0.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion charts/portal/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: Helm Chart for the openmfp Portal
name: portal
version: 0.71.38
version: 0.72.0
appVersion: "0.324.0"
dependencies:
- name: common
Expand Down
2 changes: 1 addition & 1 deletion charts/portal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Helm Chart for the openmfp Portal
| cookieDomain | string | `"localhost"` | cookie domain |
| developmentLandcsape | string | `"true"` | development landscape toggle |
| environment | string | `"local"` | environment |
| extraEnvVars | object | `{}` | A way to provide additional experimental environment variables |
| extraEnvVars | list | `[{"name":"CRD_GATEWAY_API_URL","value":"http://localhost:8000/example-gateway/graphql"}]` | A way to provide additional experimental environment variables |
| featureToggles | string | `"enableSessionAutoRefresh=true"` | |
| frontendPort | int | `8000` | frontend port |
| health.liveness.path | string | `"/rest/health"` | path used for the liveness probe |
Expand Down
Binary file modified charts/portal/charts/common-0.2.7.tgz
Binary file not shown.
4 changes: 3 additions & 1 deletion charts/portal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ baseDomains:
cookieDomain: "localhost"

# -- A way to provide additional experimental environment variables
extraEnvVars: {}
extraEnvVars:
- name: CRD_GATEWAY_API_URL
value: http://localhost:8000/example-gateway/graphql

trust:
openmfp:
Expand Down

0 comments on commit 2df5816

Please sign in to comment.