Update openmfp chart and local-setup

--- On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov <akafazov@cst-bg.net>
openmfp · Feb 13, 2025 · d8ec075 · d8ec075
1 parent 1effc79
commit d8ec075
Show file tree

Hide file tree

Showing 31 changed files with 23 additions and 345 deletions.
diff --git a/.github/workflows/helm-docs.yaml b/.github/workflows/helm-docs.yaml
diff --git a/.github/workflows/kind-localsetup.yaml b/.github/workflows/kind-localsetup.yaml
@@ -59,7 +59,7 @@ jobs:
         echo "Describe all helmreleases which are not Ready yet"
         kubectl get helmreleases -A -o json | jq -r '.items[] | select(.status.conditions[]? | select(.type == "Ready" and .status != "True")) | "\(.metadata.namespace) \(.metadata.name)"' | while read namespace name; do kubectl describe helmrelease $name -n $namespace; done
         echo "Print imagePullSecret"
-        kubectl get secret ghcr-credentials -n openmfp-system -o yaml
+        kubectl get secret github -n openmfp-system -o yaml
         echo "Test docker login and pull"
         docker login ghcr.io -u ${{ github.repository_owner }} -p ${{ steps.generate-token.outputs.token }}
         docker pull ghcr.io/openmfp/portal:0.287.0

diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -43,10 +43,11 @@ tasks:
       - "for chart in $(echo {{.CHARTS}} | tr ',' ' '); do helm dependency update $chart; done"
   validate:
     cmds:
-      - task: lint
-      # - task: package
       - task: test
-      - task: vulnerability
+      - task: helm-docs
+      - task: update
+      - task: lint
+      - task: oci
   vulnerability:
     deps:
       - task: setup:kube-lint
@@ -65,3 +66,7 @@ tasks:
       - task: helmpackage
     cmds:
       - "for chart in $(echo {{.PACKAGED_CHARTS}} | tr ',' ' '); do helm push $chart oci://localhost:5000/openmfp; done"
+  oci:
+    cmds:
+      - "rm oci/* || true"
+      - task: helmpackage
diff --git a/charts/account-operator-crds/README.md.gotmpl b/charts/account-operator-crds/README.md.gotmpl
@@ -1,33 +0,0 @@
-{{ template "chart.header" . }}
-{{ template "chart.description" . }}
-
-{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
-
-## Additional Information
-
-The `common` chart is a library of common resources that are shared across all other charts in the repository. It has no templates, but provides helm template functions and default values that can be used by other charts.
-
-{{ template "chart.requirementsSection" . }}
-
-{{ template "chart.valuesHeader" . }}
-
-The values in the `defaults:` section can be reused from other charts by using the lookup function "common.getKeyValue". It implements lookup on three levels:
-
-1. Looks for `keyOverride` in the chart's values.yaml
-2. Looks for `global.key` in the chart's or parent chart's values.yaml
-3. Uses the `key` in the chart's values.yaml
-4. Uses the `common.defaults.key` value from the table below.
-
-1 has precendence over 2 over 3 over 4 respectively. This approach allows for individual charts to have minimal configuration, while still being able to override parameters locally.
-
-Example 
-```
-1) .Values.deployment.resources.limits.memoryOveride =  4096MB
-2) .Values.global.deployment.resources.limits.memory =  2048MB
-3) .Values.deployment.resources.limits.memory =  1024MB
-4) .Values.common.defaults.deployment.resources.limits.memory = default 512MB
-```
-
-{{ template "chart.valuesTable" . }}
-
-{{ template "helm-docs.versionFooter" . }}

diff --git a/charts/account-operator/README.md b/charts/account-operator/README.md
@@ -4,12 +4,6 @@ A Helm chart to deploy OpenMFP Account-Operator
 
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
-![Version: 0.4.25](https://img.shields.io/badge/Version-0.4.25-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.109.0](https://img.shields.io/badge/AppVersion-0.109.0-informational?style=flat-square)
-
-## Additional Information
-
-The `common` chart is a library of common resources that are shared across all other charts in the repository. It has no templates, but provides helm template functions and default values that can be used by other charts.
-
 ## Requirements
 
 | Repository | Name | Description | Sources |

diff --git a/charts/example-content/README.md b/charts/example-content/README.md
@@ -2,12 +2,6 @@
 
 Helm Chart for the openmfp Portal
 
-![Version: 0.110.9](https://img.shields.io/badge/Version-0.110.9-informational?style=flat-square) ![AppVersion: 0.126.0](https://img.shields.io/badge/AppVersion-0.126.0-informational?style=flat-square)
-
-## Additional Information
-
-The `common` chart is a library of common resources that are shared across all other charts in the repository. It has no templates, but provides helm template functions and default values that can be used by other charts.
-
 ## Requirements
 
 | Repository | Name | Description | Sources |

diff --git a/charts/extension-manager-operator-crds/README.md.gotmpl b/charts/extension-manager-operator-crds/README.md.gotmpl
@@ -1,33 +0,0 @@
-{{ template "chart.header" . }}
-{{ template "chart.description" . }}
-
-{{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
-
-## Additional Information
-
-The `common` chart is a library of common resources that are shared across all other charts in the repository. It has no templates, but provides helm template functions and default values that can be used by other charts.
-
-{{ template "chart.requirementsSection" . }}
-
-{{ template "chart.valuesHeader" . }}
-
-The values in the `defaults:` section can be reused from other charts by using the lookup function "common.getKeyValue". It implements lookup on three levels:
-
-1. Looks for `keyOverride` in the chart's values.yaml
-2. Looks for `global.key` in the chart's or parent chart's values.yaml
-3. Uses the `key` in the chart's values.yaml
-4. Uses the `common.defaults.key` value from the table below.
-
-1 has precendence over 2 over 3 over 4 respectively. This approach allows for individual charts to have minimal configuration, while still being able to override parameters locally.
-
-Example 
-```
-1) .Values.deployment.resources.limits.memoryOveride =  4096MB
-2) .Values.global.deployment.resources.limits.memory =  2048MB
-3) .Values.deployment.resources.limits.memory =  1024MB
-4) .Values.common.defaults.deployment.resources.limits.memory = default 512MB
-```
-
-{{ template "chart.valuesTable" . }}
-
-{{ template "helm-docs.versionFooter" . }}

diff --git a/charts/extension-manager-operator/README.md b/charts/extension-manager-operator/README.md
@@ -4,12 +4,6 @@ A Helm chart for extension-manager-operator which manages resources like Content
 
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
-![Version: 0.22.36](https://img.shields.io/badge/Version-0.22.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.77.0](https://img.shields.io/badge/AppVersion-0.77.0-informational?style=flat-square)
-
-## Additional Information
-
-The `common` chart is a library of common resources that are shared across all other charts in the repository. It has no templates, but provides helm template functions and default values that can be used by other charts.
-
 ## Requirements
 
 | Repository | Name | Description | Sources |

diff --git a/charts/infra/templates/cluster-role.yaml b/charts/infra/templates/cluster-role.yaml
diff --git a/charts/infra/templates/external-secret-account-operator.yaml b/charts/infra/templates/external-secret-account-operator.yaml
diff --git a/charts/infra/templates/gateway.yaml b/charts/infra/templates/gateway.yaml
@@ -1,15 +1,16 @@
-apiVersion: {{ .Values.gateway.apiVersion }}
+{{- if eq (include "common.getKeyValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}}
+apiVersion: {{ .Values.istio.networking.apiVersion }}
 kind: Gateway
 metadata:
-  name: {{ .Values.gateway.name}}
+  name: {{ .Values.istio.gateway.name}}
   namespace: {{ .Release.Namespace }}
-{{- if .Values.gateway.annotations }}
+{{- if .Values.istio.gateway.annotations }}
   annotations:
-    {{- toYaml .Values.gateway.annotations | nindent 4 }}
+    {{- toYaml .Values.istio.gateway.annotations | nindent 4 }}
 {{- end }}
 spec:
   selector:
-{{ .Values.gateway.selector | toYaml | indent 4 }}
+{{ .Values.istio.gateway.selector | toYaml | indent 4 }}
   servers:
 {{ toYaml .Values.istio.gateway.servers | indent 4 }}
-{{- end -}}
+{{- end -}}
diff --git a/charts/infra/templates/kcp-service-entry.yaml b/charts/infra/templates/kcp-service-entry.yaml
diff --git a/charts/infra/templates/keycloak-service-entry.yaml b/charts/infra/templates/keycloak-service-entry.yaml
diff --git a/charts/infra/templates/store.yaml b/charts/infra/templates/store.yaml
diff --git a/charts/keycloak/templates/istio-virtualservice.yaml b/charts/keycloak/templates/istio-virtualservice.yaml
@@ -1,4 +1,4 @@
-{{- if eq (include "common.getNestedValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}}
+{{- if eq (include "common.getKeyValue" (dict "Values" .Values "key" "istio.enabled")) "true" -}}
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:

diff --git a/charts/openmfp-crds/charts/account-operator-crds-0.1.11.tgz b/charts/openmfp-crds/charts/account-operator-crds-0.1.11.tgz
diff --git a/charts/openmfp-crds/charts/extension-manager-operator-crds-0.2.0.tgz b/charts/openmfp-crds/charts/extension-manager-operator-crds-0.2.0.tgz
diff --git a/charts/openmfp/Chart.yaml b/charts/openmfp/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: openmfp
 description: The OpenMFP chart for Kubernetes
 type: application
-version: 0.0.235
+version: 0.1.0
 appVersion: "0.0.0"
 
 dependencies:

diff --git a/charts/openmfp/README.md b/charts/openmfp/README.md
@@ -16,7 +16,7 @@ The OpenMFP chart for Kubernetes
 ## Values
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| components.example-content.enabled | bool | `false` | enable example-content component |
+| components.example-content.enabled | bool | `true` | enable example-content component |
 | components.extension-manager-operator.enabled | bool | `true` | enable extension-manager-operator component |
 | components.infra.enabled | bool | `true` | enable infra component |
 | components.keycloak.enabled | bool | `true` | enable keycloak component |

diff --git a/charts/openmfp/tmpcharts-1369650/example-content-0.114.0.tgz b/charts/openmfp/tmpcharts-1369650/example-content-0.114.0.tgz
diff --git a/charts/openmfp/tmpcharts-1369650/extension-manager-operator-0.24.0.tgz b/charts/openmfp/tmpcharts-1369650/extension-manager-operator-0.24.0.tgz
diff --git a/charts/openmfp/tmpcharts-1369650/infra-0.61.0.tgz b/charts/openmfp/tmpcharts-1369650/infra-0.61.0.tgz
diff --git a/charts/openmfp/tmpcharts-1369650/portal-0.73.0.tgz b/charts/openmfp/tmpcharts-1369650/portal-0.73.0.tgz
diff --git a/charts/openmfp/values.yaml b/charts/openmfp/values.yaml
@@ -1,7 +1,7 @@
 components:
   example-content:
     # -- enable example-content component
-    enabled: false
+    enabled: true
   portal:
     # -- enable portal component
     enabled: true

diff --git a/charts/portal/README.md b/charts/portal/README.md
@@ -2,12 +2,6 @@
 
 Helm Chart for the openmfp Portal
 
-![Version: 0.69.150](https://img.shields.io/badge/Version-0.69.150-informational?style=flat-square) ![AppVersion: 0.227.0](https://img.shields.io/badge/AppVersion-0.227.0-informational?style=flat-square)
-
-## Additional Information
-
-The `common` chart is a library of common resources that are shared across all other charts in the repository. It has no templates, but provides helm template functions and default values that can be used by other charts.
-
 ## Requirements
 
 | Repository | Name | Description | Sources |

diff --git a/local-setup/kustomize/components/openmfp-crds/repository.yaml b/local-setup/kustomize/components/openmfp-crds/repository.yaml
@@ -9,5 +9,3 @@ spec:
   ref:
     # renovate: datasource=docker registryUrl=https://ghcr.io depName=ghcr.io/openmfp/helm-charts/openmfp-crds
     semver: 0.0.16
-  secretRef:
-    name: ghcr-credentials