From 08e07a315bf1df93c771ae91e5cac807a4bfe6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Thu, 11 Jul 2024 11:24:33 +0200 Subject: [PATCH 1/4] [DNM] Test GHA --- charts/ems-server/values.yaml | 2 +- charts/sal/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ems-server/values.yaml b/charts/ems-server/values.yaml index 2bca632..f3aff85 100644 --- a/charts/ems-server/values.yaml +++ b/charts/ems-server/values.yaml @@ -11,7 +11,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -replicaCount: 1 +replicaCount: 2 image: repository: "registry.gitlab.com/nebulous-project/ems-main/ems-server" diff --git a/charts/sal/values.yaml b/charts/sal/values.yaml index a4782da..fb6a3a6 100644 --- a/charts/sal/values.yaml +++ b/charts/sal/values.yaml @@ -1,4 +1,4 @@ -replicaCount: 1 +replicaCount: 2 image: mariadb: mariadb From f649cd01abfddba1e20ed331459b950e73b6a3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Thu, 11 Jul 2024 11:55:31 +0200 Subject: [PATCH 2/4] Bump ver --- charts/ems-server/Chart.yaml | 2 +- charts/sal/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ems-server/Chart.yaml b/charts/ems-server/Chart.yaml index 4536e1d..01755b4 100644 --- a/charts/ems-server/Chart.yaml +++ b/charts/ems-server/Chart.yaml @@ -3,4 +3,4 @@ appVersion: 7.0.0-SNAPSHOT description: EMS server Helm chart for Kubernetes name: ems-server type: application -version: 0.1.0 +version: 0.1.1 diff --git a/charts/sal/Chart.yaml b/charts/sal/Chart.yaml index 859294d..e89a358 100644 --- a/charts/sal/Chart.yaml +++ b/charts/sal/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to From 8ceb42ae04f0e22e5bbac9ada9854382c334e185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Thu, 11 Jul 2024 11:59:00 +0200 Subject: [PATCH 3/4] Fix some reported issues --- charts/ems-server/values.yaml | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/charts/ems-server/values.yaml b/charts/ems-server/values.yaml index f3aff85..8710115 100644 --- a/charts/ems-server/values.yaml +++ b/charts/ems-server/values.yaml @@ -119,12 +119,12 @@ env: # # ===== Development and Debug settings ===== # - #- name: APPLICATION_ID - # value: "" - #- name: METRIC_MODEL_URL - # value: "https://gitlab.com/nebulous-project/tests-new/-/raw/master/ems-at-nebulous/models/nebulous/test2.yml" - #- name: EMS_PRELOAD_APP_MODEL - # value: "test2.yml" + # - name: APPLICATION_ID + # value: "" + # - name: METRIC_MODEL_URL + # value: "https://gitlab.com/nebulous-project/tests-new/-/raw/master/ems-at-nebulous/models/nebulous/test2.yml" + # - name: EMS_PRELOAD_APP_MODEL + # value: "test2.yml" # # ===== EMS server configuration ===== @@ -174,14 +174,14 @@ env: # ===== External Broker settings ===== - name: EXTERNAL_ENABLED value: 'true' - #- name: EXTERNAL_BROKER_ADDRESS - # value: '' - #- name: EXTERNAL_BROKER_PORT - # value: '5672' - #- name: EXTERNAL_BROKER_USERNAME - # value: '' - #- name: EXTERNAL_BROKER_PASSWORD - # value: '' + # - name: EXTERNAL_BROKER_ADDRESS + # value: '' + # - name: EXTERNAL_BROKER_PORT + # value: '5672' + # - name: EXTERNAL_BROKER_USERNAME + # value: '' + # - name: EXTERNAL_BROKER_PASSWORD + # value: '' # ===== Broker settings ===== - name: BROKERCEP_ADDITIONAL_BROKER_CREDENTIALS @@ -206,8 +206,8 @@ env: value: "monitoring-configmap" - name: EMS_CLIENT_CONFIG_MAP_NAME value: "ems-client-configmap" - #- name: EMS_CLIENT_DAEMONSET_SPECIFICATION_FILE - # value: "/ems-client-daemonset.yaml" + # - name: EMS_CLIENT_DAEMONSET_SPECIFICATION_FILE + # value: "/ems-client-daemonset.yaml" - name: EMS_CLIENT_DAEMONSET_NAME value: "ems-client-daemonset" - name: EMS_CLIENT_DAEMONSET_IMAGE_REPOSITORY @@ -222,11 +222,11 @@ env: - name: EMS_CLIENT_ADDITIONAL_BROKER_CREDENTIALS value: 'aaa/111, bbb/222' # value: "ENC(axeJUxNHajYfBffUwvuT3kwTgLTpRliDMz/ZQ9hROZ3BNOv0Idw72NJsawzIZRuZ)" - #- name: EMS_CLIENT_BROKER_USERNAME # It is appended to EMS_CLIENT_ADDITIONAL_BROKER_CREDENTIALS - # value: "ccc" - #- name: EMS_CLIENT_BROKER_PASSWORD - # value: "333" + # - name: EMS_CLIENT_BROKER_USERNAME # It is appended to EMS_CLIENT_ADDITIONAL_BROKER_CREDENTIALS + # value: "ccc" + # - name: EMS_CLIENT_BROKER_PASSWORD + # value: "333" - name: EMS_CLIENT_KEYSTORE_SECRET value: "" - name: EMS_CLIENT_TRUSTSTORE_SECRET - value: "" \ No newline at end of file + value: "" From b2a0b7c433a9afbeac49baa168d0537ecd94b47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Thu, 11 Jul 2024 12:02:42 +0200 Subject: [PATCH 4/4] Turn off maintainer validation --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 33c064f..286fd7a 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -34,4 +34,4 @@ jobs: - name: Run chart-testing (lint) if: steps.list-changed.outputs.changed == 'true' - run: ct lint --target-branch ${{ github.event.pull_request.base.ref }} + run: ct lint --validate-maintainers=false --target-branch ${{ github.event.pull_request.base.ref }}