Skip to content

Commit

Permalink
add logs
Browse files Browse the repository at this point in the history
Signed-off-by: Coleen Iona Quadros <coleen.quadros27@gmail.com>
  • Loading branch information
coleenquadros committed Oct 23, 2024
1 parent d8fa8b6 commit 25ebce3
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 2 deletions.
2 changes: 2 additions & 0 deletions cicd-scripts/run-e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ printf "\n baseDomain: ${base_domain}" >>${OPTIONSFILE}
printf "\n kubeconfig: ${kubeconfig_hub_path}" >>${OPTIONSFILE}
printf "\n kubecontext: ${kubecontext}" >>${OPTIONSFILE}



if command -v ginkgo &>/dev/null; then
GINKGO_CMD=ginkgo
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -372,13 +372,13 @@ func (r *MultiClusterObservabilityReconciler) Reconcile(ctx context.Context, req

// create an Observatorium CR
result, err = GenerateObservatoriumCR(r.Client, r.Scheme, instance)
if result != nil {
if err != nil {
return *result, err
}

// generate grafana datasource to point to observatorium api gateway
result, err = GenerateGrafanaDataSource(r.Client, r.Scheme, instance)
if result != nil {
if err != nil {
return *result, err
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ func GenerateObservatoriumCR(
oldSpec := observatoriumCRFound.Spec
newSpec := observatoriumCR.Spec

log.Info("Coleen Old observatorium CR spec", "oldSpec", oldSpec)
log.Info("Coleen New observatorium CR spec", "newSpec", newSpec)

// keep the tenant id unchanged and ensure the new spec has the same tenant ID as the old spec to prevent Observatorium
// from updating
for i, newTenant := range newSpec.API.Tenants {
Expand Down
17 changes: 17 additions & 0 deletions tests/run-in-kind/kind/kind-managed.config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
nodes:
- role: control-plane
extraPortMappings:
- containerPort: 80
hostPort: 81
listenAddress: "0.0.0.0"
- containerPort: 443
hostPort: 444
listenAddress: "0.0.0.0"
- containerPort: 6443
hostPort: 32807
listenAddress: "0.0.0.0"
- containerPort: 31001
hostPort: 31002
listenAddress: "127.0.0.1"

0 comments on commit 25ebce3

Please sign in to comment.