Merge branch 'main' into cassandra-make-tls-more-configurable

Signed-off-by: Tim Balzer <[email protected]>

.vib/cassandra/ginkgo/cassandra_suite_test.go

@@ -31,7 +31,7 @@ func init() {
 	flag.StringVar(&namespace, "namespace", "", "namespace where the application is running")
 	flag.StringVar(&username, "username", "", "database user")
 	flag.StringVar(&password, "password", "", "database password for username")
-	flag.IntVar(&timeoutSeconds, "timeout", 300, "timeout in seconds")
+	flag.IntVar(&timeoutSeconds, "timeout", 600, "timeout in seconds")
 	timeout = time.Duration(timeoutSeconds) * time.Second
 }
 

.vib/zipkin/cypress/cypress.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  defaultCommandTimeout: 90000,
+  e2e: {
+    setupNodeEvents(on, config) {},
+    baseUrl: 'http://35.196.250.6',
+  },
+}

.vib/zipkin/cypress/cypress/e2e/zipkin.cy.js

@@ -0,0 +1,18 @@
+/*
+ * Copyright Broadcom, Inc. All Rights Reserved.
+ * SPDX-License-Identifier: APACHE-2.0
+ */
+
+/// <reference types="cypress" />
+
+// We check the pushed trace in the Job
+it('should find pushed trace', () => {
+  cy.visit('/')
+  cy.contains('a', 'Dependencies').click();
+  cy.fixture('services').then((service) => {
+    cy.contains('div[class*="root"]', 'Start Time').get('input').eq(2).clear().type(service.checkTime);
+    cy.contains('button', 'Run Query').click();
+    cy.get('[role="combobox"]').click();
+    cy.contains(service.name);
+  });
+})

.vib/zipkin/cypress/cypress/fixtures/services.json

@@ -0,0 +1,4 @@
+{
+  "name": "yelp-main",
+  "checkTime": "09/03/2014 10:55:26"
+}

.vib/zipkin/cypress/cypress/support/e2e.js

@@ -0,0 +1,25 @@
+/*
+ * Copyright Broadcom, Inc. All Rights Reserved.
+ * SPDX-License-Identifier: APACHE-2.0
+ */
+
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+// import './commands';
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')

.vib/zipkin/goss/goss.yaml

@@ -0,0 +1,48 @@
+# Copyright Broadcom, Inc. All Rights Reserved.
+# SPDX-License-Identifier: APACHE-2.0
+
+http:
+  http://127.0.0.1:{{ .Vars.containerPorts.http }}/api/v2/services:
+    status: 200
+    body:
+      - /yelp-main/
+  http://zipkin:{{ .Vars.service.server.ports.http }}/api/v2/services:
+    status: 200
+    body:
+      - /yelp-main/
+  http://127.0.0.1:{{ .Vars.containerPorts.http }}/prometheus:
+    status: 200
+    body:
+      - /armeria_server/
+  http://zipkin:{{ .Vars.service.server.ports.http }}/prometheus:
+    status: 200
+    body:
+      - /armeria_server/
+
+command:
+  {{- $uid := .Vars.containerSecurityContext.runAsUser }}
+  {{- $gid := .Vars.podSecurityContext.fsGroup }}
+  check-user-info:
+    # The UID and GID should always be either the one specified as vars (always a bigger number that the default)
+    # or the one randomly defined by openshift (larger values). Otherwise, the chart is still using the default value.
+    exec: if [ $(id -u) -lt {{ $uid }} ] || [ $(id -G | awk '{print $2}') -lt {{ $gid }} ]; then exit 1; fi
+    exit-status: 0
+  check-configured-env-vars:
+    exec: env
+    exit-status: 0
+    stdout:
+      - /AUTOCOMPLETE_TTL.*{{ .Vars.configOverrides.AUTOCOMPLETE_TTL }}/
+      {{- if not .Vars.usePasswordFile }}
+      # The secret configuration should be set via env
+      - /QUERY_NAMES_MAX_AGE.*{{ .Vars.secretConfigOverrides.QUERY_NAMES_MAX_AGE }}/
+      {{- end }}
+
+{{- if .Vars.usePasswordFile }}
+# The secret configuration should be mounted as a file
+file:
+  /bitnami/zipkin/secrets/configuration/QUERY_NAMES_MAX_AGE:
+    exists: true
+    filetype: symlink
+    contents:
+      - /{{ .Vars.secretConfigOverrides.QUERY_NAMES_MAX_AGE }}/
+{{- end }}