Skip to content

Commit

Permalink
Hotfix 24.1.5 (#420)
Browse files Browse the repository at this point in the history
* Update chart deps and add Makefile with common commands

* Update service-ui image tag to 5.11.1-r1
  • Loading branch information
raikbitters authored Sep 10, 2024
1 parent db872c4 commit 596be3a
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 13 deletions.
109 changes: 109 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
APP_NAME=reportportal
SUPERADMIN_PASSWORD=superadmin
STORAGE_TYPE=filesystem
MINIKUBE_CPUS=4
MINIKUBE_MEMORY=8192
MINIKUBE_DISK_SIZE=50g
REPO_URL=oci://us-docker.pkg.dev
CHART_NAME=$(shell yq e '.name' reportportal/Chart.yaml)
CHART_VERSION=$(shell yq e '.version' reportportal/Chart.yaml)
CHART_BUMP_VERSION=$(shell yq e '.version | split(".") | .[0] + "." + .[1] + "." + (.[2] | tonumber + 1 | tostring)' reportportal/Chart.yaml)
HELM_PACKAGE=${CHART_NAME}-${CHART_VERSION}.tgz

ifeq ($(STORAGE_TYPE), minio)
MINIO_INSTALL=true
else
MINIO_INSTALL=false
endif

default: package

install: install-source

# Helm commands
package:
@ echo "Packaging ReportPortal as ${HELM_PACKAGE}"
@ helm package ./reportportal

push:
@ echo "Pushing ReportPortal as ${HELM_PACKAGE} to ${REPO_URL}"
@helm push ${HELM_PACKAGE} ${REPO_URL}

install-source: deps-update deps-build
@ echo "Installing ReportPortal as ${APP_NAME} from source."
@ echo "Superadmin password: ${SUPERADMIN_PASSWORD}, storage type: ${STORAGE_TYPE}"
@ helm install ${APP_NAME} \
./reportportal \
--set uat.superadminInitPasswd.password=${SUPERADMIN_PASSWORD} \
--set storage.type=${STORAGE_TYPE} \
--set minio.install=${MINIO_INSTALL}

install-repo: repo-add repo-update
@ echo "Installing ReportPortal as ${APP_NAME} from repository."
@ echo "Superadmin password: ${SUPERADMIN_PASSWORD}, storage type: ${STORAGE_TYPE}"
@ helm install ${APP_NAME} \
reportportal/reportportal \
--set uat.superadminInitPasswd.password=${SUPERADMIN_PASSWORD} \
--set storage.type=${STORAGE_TYPE} \
--set minio.install=${MINIO_INSTALL}

test:
@ echo "Testing ReportPortal as ${APP_NAME}"
@ helm test ${APP_NAME}

update:
@ echo "Updating ReportPortal as ${APP_NAME}"
@ helm upgrade ${APP_NAME} ./reportportal

uninstall:
@ echo "Uninstalling reportportal"
@ helm uninstall reportportal

deps-update:
@ echo "Updating dependencies for ReportPortal"
@ helm dependency update ./reportportal

deps-build:
@ echo "Building dependencies for ReportPortal"
@ helm dependency build ./reportportal

repo-add:
@ echo "Adding ReportPortal repository"
@ helm repo add reportportal https://reportportal.io/kubernetes

repo-update:
@ echo "Updating ReportPortal repository"
@ helm repo update reportportal

# Chart versioning
chart-info:
@ echo "Chart name: ${CHART_NAME}"
@ echo "Chart version: ${CHART_VERSION}"

chart-version-update: chart-info
@ echo "Updating chart version to ${NEW_VERSION}"
@ yq e -i '.version = "${NEW_VERSION}"' reportportal/Chart.yaml

chart-version-bump: chart-info
@ echo "Bumping chart version to ${CHART_BUMP_VERSION}"
@ yq e -i '.version = "${CHART_BUMP_VERSION}"' reportportal/Chart.yaml

chart-appversion-update:
@ echo "Updating chart app version to ${NEW_VERSION}"
@ yq e -i '.appVersion = "${NEW_VERSION}"' reportportal/Chart.yaml

# Minikube commands
minikube-start:
@ echo "Starting minikube with ${MINIKUBE_CPUS} CPUs, ${MINIKUBE_MEMORY} memory"
@ minikube start --cpus ${MINIKUBE_CPUS} --memory ${MINIKUBE_MEMORY} --addons ingress

minikube-stop:
@ echo "Stopping minikube"
@ minikube stop

minikube-delete:
@ echo "Deleting minikube"
@ minikube delete

minikube-address:
@ echo "Minikube address http://$(shell minikube ip)"
15 changes: 6 additions & 9 deletions reportportal/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "24.1"
description: ReportPortal.io AI-powered Test Automation Dashboard
name: reportportal
version: 24.1.4
version: 24.1.5
sources:
- https://github.com/reportportal/kubernetes
keywords:
Expand All @@ -11,24 +11,21 @@ maintainers:
- name: reportportal
email: support@reportportal.io
dependencies:
# If you update version, please update also postgresql.image.tag in values.yaml
# If you update version, please update also postgresql.image.tag in values.yaml
- name: postgresql
version: 15.5.26
version: 15.5.28
repository: https://charts.bitnami.com/bitnami
condition: postgresql.install

# If you update version, please update also rabbitmq.image.tag in values.yaml
- name: rabbitmq
version: 14.6.7
version: 14.6.9
repository: https://charts.bitnami.com/bitnami
condition: rabbitmq.install

- name: opensearch
version: 2.23.0
version: 2.24.0
repository: https://opensearch-project.github.io/helm-charts/
condition: opensearch.install

- name: minio
version: 14.7.2
version: 14.7.7
repository: https://charts.bitnami.com/bitnami
condition: minio.install
8 changes: 4 additions & 4 deletions reportportal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ serviceui:
name: ui
image:
repository: reportportal/service-ui
tag: 5.11.1
tag: 5.11.1-r1
pullPolicy: Always
resources:
requests:
Expand Down Expand Up @@ -832,7 +832,7 @@ postgresql:
install: true
image:
repository: bitnami/postgresql
tag: 16.4.0-debian-12-r4
tag: 16.4.0-debian-12-r7
auth:
postgresPassword: *dbpassword
username: *dbuser
Expand All @@ -850,7 +850,7 @@ rabbitmq:
install: true
image:
repository: bitnami/rabbitmq
tag: 3.13.7-debian-12-r0
tag: 3.13.7-debian-12-r2
auth:
username: *msgbrokerUser
password: *msgbrokerPass
Expand Down Expand Up @@ -895,7 +895,7 @@ minio:
install: true
image:
repository: bitnami/minio
tag: 2024.8.26-debian-12-r0
tag: 2024.9.9-debian-12-r0
auth:
rootUser: *storageAccessKey
rootPassword: *storageSecretKey
Expand Down

0 comments on commit 596be3a

Please sign in to comment.