Merge branch 'update-gluon-to-0.4.7' into 'main'

Update gluon to 0.4.8

See merge request !53

CHANGELOG.md

@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ---
 
+## [7.2.1-bb.5] - 2024-02-02
+### Added
+- Update Gluon to 0.4.8
+
 ## [7.2.1-bb.4] - 2024-01-29
 ### Added
 - Added support for Istio Authorization Policies

README.md

 # grafana
 
-![Version: 7.2.1-bb.4](https://img.shields.io/badge/Version-7.2.1--bb.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.2.3](https://img.shields.io/badge/AppVersion-10.2.3-informational?style=flat-square)
+![Version: 7.2.1-bb.5](https://img.shields.io/badge/Version-7.2.1--bb.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.2.3](https://img.shields.io/badge/AppVersion-10.2.3-informational?style=flat-square)
 
 The leading tool for querying and visualizing time series and metrics.
 
@@ -400,6 +400,8 @@ helm install grafana chart/
 | bbtests.cypress.envs.cypress_grafana_url | string | `"http://grafana:80"` |  |
 | bbtests.cypress.resources.requests.cpu | int | `2` |  |
 | bbtests.cypress.resources.requests.memory | string | `"2Gi"` |  |
+| bbtests.cypress.resources.limits.cpu | int | `2` |  |
+| bbtests.cypress.resources.limits.memory | string | `"2Gi"` |  |
 | bbtests.istio.sidecar.resources.cpu.requests | string | `"100m"` |  |
 | bbtests.istio.sidecar.resources.cpu.limits | string | `"2000m"` |  |
 | bbtests.istio.sidecar.resources.memory.requests | string | `"512Mi"` |  |

chart/Chart.lock

 dependencies:
 - name: gluon
   repository: oci://registry1.dso.mil/bigbang
-  version: 0.4.4
-digest: sha256:306ebeeb7af982b73ea4d7ffb6a6467c2be21d957b2f2af92973e859c03c05a9
-generated: "2024-01-17T11:39:07.79952528-07:00"
+  version: 0.4.8
+digest: sha256:64d057845fda0a0da70b22c8105bcad90a26fe641a38eff20be80a1825698f12
+generated: "2024-02-02T11:18:13.747839-05:00"

chart/Chart.yaml

 apiVersion: v2
 name: grafana
-version: 7.2.1-bb.4
+version: 7.2.1-bb.5
 appVersion: 10.2.3
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
@@ -45,7 +45,7 @@ maintainers:
 type: application
 dependencies:
   - name: gluon
-    version: "0.4.4"
+    version: "0.4.8"
     repository: oci://registry1.dso.mil/bigbang
 keywords:
   - monitoring

chart/tests/cypress.config.js

-const { defineConfig } = require('cypress')
-
-module.exports = defineConfig({
-  e2e: {
-    env: {
-      baseUrl: "https://grafana.bigbang.dev"
-    },
-    video: true,
-    screenshot: true,
-    supportFile: false,
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-    },
-  },
-})
\ No newline at end of file

chart/tests/cypress/e2e/01-grafana-healthspec.cy.js

+before(function () {
+  cy.visit(Cypress.env('grafana_url'));
+
+  if (Cypress.env('keycloak_test_enable')) {
+    cy.wait(500);
+    cy.contains('SSO').click();
+    cy.performKeycloakLogin(Cypress.env('tnr_username'), Cypress.env('tnr_password'))
+  } else {
+    cy.visit(Cypress.env('grafana_url'));;
+    cy.performGrafanaLogin('admin', 'prom-operator')
+  }
+});
+
+describe('Grafana Unit Testing', function () {
+  it('Test for Grafana Dashboard', function () {
+    cy.visit(`${Cypress.env('grafana_url')}/dashboards`); 
+    cy.wait(1000);
+    cy.loadGrafanaDashboard("CoreDNS")
+    cy.get('[data-testid="data-testid Panel header Requests (total)"]').should('not.contain', 'No data');
+  });
+});

chart/tests/cypress/e2e/grafana-healthspec.cy.js

-before(function () {
-  cy.visit(Cypress.env('grafana_url'));
-
-  if (Cypress.env('keycloak_test_enable')) {
-    cy.task('log', 'Selecting SSO...');
-    cy.wait(500);
-    cy.contains('SSO').click();
-
-    cy.task('log', 'Filling out login form...');
-    cy.get('input[id="username"]')
-      .type(Cypress.env('tnr_username'))
-      .should('have.value', Cypress.env('tnr_username'));
-
-    cy.get('input[id="password"]')
-      .type(Cypress.env('tnr_password'))
-      .should('have value', Cypress.env('tnr_password'));
-
-    cy.get('form').submit();
-
-    cy.task('log', 'Logging in...');
-    cy.get('input[id="kc-accept"]').click();
-    cy.get('input[id="kc-login"]').click();
-  } else {
-    cy.visit(Cypress.env('grafana_url'));;
-    cy.get('input[name="user"]').type('admin');
-    cy.get('input[name="password"]').type('prom-operator');
-    cy.contains("Log in").click();
-    cy.get('.page-dashboard');
-  }
-});
-
-describe('Grafana Unit Testing', function () {
-  it('Test for Grafana Dashboard', function () {
-    // This test no longer requires login steps since they are performed in beforeEach.
-    // You can place the test-specific code here.
-    cy.visit(`${Cypress.env('grafana_url')}/dashboards`); 
-    cy.wait(1000);
-    cy.get('a').contains('CoreDNS').click();
-    cy.wait(1000);
-    // Start intercept to use later in wait to ensure data actually finishes loading
-    cy.intercept('POST', '**/query*').as('apiQuery');
-    // Should not take longer than 30 seconds for this query to complete
-    // If it does, then there is likely something wrong with the data source
-    // cy.wait('@apiQuery', { timeout: 30000 }).then((interception) => {
-    //   expect(interception.response.statusCode).to equal(200);
-    // });
-    cy.get('[data-testid="data-testid Panel header Requests (total)"]').should('not.contain', 'No data');
-  });
-});

chart/tests/cypress/e2e/login.cy.js

-Cypress.Commands.add('login', () => {
-  if (Cypress.env('keycloak_test_enable')) {
-    cy.task('log', 'logging in via keycloak...');
-
-    cy.session('keycloak', () => {
-      cy.visit('/'); // Replace with your login page URL
-      cy.get('body').then(($body) => {
-        // If there's a screen that makes you click on an OAuth button, click on it
-        if ($body.find('.login-content-box').length > 0) {
-          cy.task('log', 'Clicking on the OAuth button...');
-          cy.contains('OAuth').click();
-          cy.wait(1000);
-        }
-      });
-
-      cy.get('body').then(($body) => {
-        // Return successfully if there's no box for a username (which is how this is detecting if it's on a login page)
-        if ($body.find('#username').length == 0) {
-          if ($body.find('#user').length == 0) {
-            cy.task('log', 'No login screen, returning from login()...');
-            return 0;
-          }
-        }
-
-        if ($body.find('#username').length > 0) {
-          cy.task('log', 'keycloak is displaying the login/password screen...');
-          cy.get('input[id="username"]').type(Cypress.env('keycloak_username'));
-          cy.get('input[id="password"]').type(Cypress.env('keycloak_password'));
-          cy.get('input[id="kc-login"]').click();
-
-          cy.intercept('GET', '**/*').as('landingpage');
-          cy.get('input[id="kc-accept"]').click();
-
-          // Though the cookies will clear, the consent will be kept in keycloak between tests, so we have to see
-          // whether that page comes up and skip it if not.
-          cy.get('body').then(($kconsent) => {
-            if ($kconsent.find('input[id="kc-login"]').length > 0) {
-              // Need to reset the intercept now that it will be looking at this click instead of the one above
-              cy.intercept('GET', '**/*').as('landingpage');
-              cy.get('input[id="kc-login"]').click();
-            }
-          });
-
-          // After hitting "yes" on the consent page, there should be a redirect back to the app (for grafana it's 302)
-          // It also might catch a 200 code, which is also OK
-          cy.wait('@landingpage').its('response.statusCode').should('match', (/200|302/));
-          cy.task('log', 'keycloak has redirected back to the app...');
-
-          // Then the app's page should load
-          cy.wait('@landingpage').its('response.statusCode').should('match', (/200|302/));
-          cy.task('log', 'app homepage has loaded successfully...');
-        }
-      });
-    });
-  } else {
-    cy.task('log', 'skipping sso test...');
-    cy.get('body').then(($body) => {
-      if ($body.find('input[name="user"]').length != 0) {
-        cy.task('log', 'detected login page, logging in with static username and password...');
-        cy.get('input[name="user"]').type('admin');
-        cy.get('input[name="password"]').type('prom-operator');
-        cy.contains("Log in").click();
-        cy.get('.page-dashboard');
-        cy.task('log', 'app homepage has loaded successfully...');
-      }
-    });
-  }
-});

chart/values.yaml

@@ -1394,6 +1394,9 @@ bbtests:
       requests:
         cpu: 2
         memory: 2Gi
+      limits:
+        cpu: 2
+        memory: 2Gi
   istio:
     sidecar:
       resources: