Roll back 18.3 to 18.2

2026-09-10 10:03:15 +00:00
2 changed files with 146 additions and 140 deletions
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -8,11 +8,11 @@ metadata:
    backstage.io/environment: "dev"
    app.kubernetes.io/managed-by: "backstage"
  tags:
-  - deployment
-  - argocd
-
-  - opentelemetry
-
+    - deployment
+    - argocd
+    
+    - opentelemetry
+    
  annotations:
    argocd/app-name: "petclinic"
    argocd/app-namespace: "argocd"
@@ -23,41 +23,41 @@ metadata:
    backstage.io/kubernetes-label-selector: "app.kubernetes.io/managed-by=backstage"
    gitea.kyndemo.live/repo-slug: "validate/petclinic"
    sonarqube.org/project-key: petclinic
-
+    
    grafana/grafana-instance: "default"
    grafana/alert-label-selector: "app=petclinic"
    grafana/dashboard-selector: "uid == 'otel-app-observability-v2'"
    grafana.com/alert-label-selector: "app=petclinic"
    grafana.com/dashboard-url: "https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-app=petclinic"
+    
  links:
-  - url: https://petclinic.kyndemo.live
-    title: Live Application
-    icon: web
-  - url: https://gitea.kyndemo.live/validate/petclinic
-    title: Repository
-    icon: github
-  - url: https://argocd.kyndemo.live/applications/petclinic
-    title: ArgoCD App
-    icon: dashboard
-
-  - url: 
-      https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-app=petclinic
-    title: Grafana Dashboard
-    icon: dashboard
-
+    - url: https://petclinic.kyndemo.live
+      title: Live Application
+      icon: web
+    - url: https://gitea.kyndemo.live/validate/petclinic
+      title: Repository
+      icon: github
+    - url: https://argocd.kyndemo.live/applications/petclinic
+      title: ArgoCD App
+      icon: dashboard
+    
+    - url: https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-app=petclinic
+      title: Grafana Dashboard
+      icon: dashboard
+    
 spec:
  owner: "platform-engineering"
  domain: apps
  dependsOn:
-  - component:default/argocd-service
-
-  - resource:default/veterinary-platform
-
-
-  - resource:default/otel-collector
-  - resource:default/otel-operator
-
-  - resource:default/k6-operator
+    - component:default/argocd-service
+    
+    - resource:default/veterinary-platform
+    
+    
+    - resource:default/otel-collector
+    - resource:default/otel-operator
+    
+    - resource:default/k6-operator

 # ─── Primary Component (always present, matches component_id) ───────
 ---
@@ -70,17 +70,17 @@ metadata:
    backstage.io/environment: "dev"
    app.kubernetes.io/managed-by: "backstage"
  tags:
-  - deployment
-  - argocd
-
-  - opentelemetry
-
-  - load-testing
-  - k6
-
-  - chaos-engineering
-  - chaos-mesh
-
+    - deployment
+    - argocd
+    
+    - opentelemetry
+    
+    - load-testing
+    - k6
+    
+    - chaos-engineering
+    - chaos-mesh
+    

  annotations:
    argocd/app-name: "petclinic"
@@ -92,34 +92,35 @@ metadata:
    backstage.io/kubernetes-label-selector: "app.kubernetes.io/instance=petclinic"
    gitea.kyndemo.live/repo-slug: "validate/petclinic"
    sonarqube.org/project-key: petclinic
-
+    
    grafana/grafana-instance: "default"
    grafana/alert-label-selector: "app.kubernetes.io/instance=petclinic"
    grafana/dashboard-selector: "uid == 'otel-app-observability-v2'"
    grafana.com/alert-label-selector: "app.kubernetes.io/instance=petclinic"
    grafana.com/dashboard-url: "https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-app=petclinic"
+    
    k6/enabled: "true"
    k6/test-configmap: "k6-test-petclinic"
    k6/test-namespace: "demo-apps"
    k6/target-service: "petclinic"
+    
    chaos-mesh/enabled: "true"
-    docs.kyndemo.live/readme: catalog/component/default/petclinic/README.md
+    
  links:
-  - url: https://petclinic.kyndemo.live
-    title: Live Application
-    icon: web
-  - url: https://gitea.kyndemo.live/validate/petclinic
-    title: Repository
-    icon: github
-  - url: https://argocd.kyndemo.live/applications/petclinic
-    title: ArgoCD App
-    icon: dashboard
-
-  - url: 
-      https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-app=petclinic
-    title: Grafana Dashboard
-    icon: dashboard
-
+    - url: https://petclinic.kyndemo.live
+      title: Live Application
+      icon: web
+    - url: https://gitea.kyndemo.live/validate/petclinic
+      title: Repository
+      icon: github
+    - url: https://argocd.kyndemo.live/applications/petclinic
+      title: ArgoCD App
+      icon: dashboard
+    
+    - url: https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-app=petclinic
+      title: Grafana Dashboard
+      icon: dashboard
+    
 spec:
  type: service
  owner: "platform-engineering"
@@ -127,14 +128,14 @@ spec:

  system: petclinic
  dependsOn:
-  - component:default/argocd-service
-
-  - resource:default/veterinary-platform
-
-
-  - resource:default/otel-collector
-
-  - resource:default/k6-operator
+    - component:default/argocd-service
+    
+    - resource:default/veterinary-platform
+    
+    
+    - resource:default/otel-collector
+    
+    - resource:default/k6-operator

 # ─── Per-service Components (from Watcher discovery) ─────────────────

@@ -149,18 +150,18 @@ metadata:
    backstage.io/environment: "dev"
    app.kubernetes.io/managed-by: "backstage"
  tags:
-  - deployment
-  - argocd
-
-  - opentelemetry
-
-  - load-testing
-  - k6
-
-  - chaos-engineering
-  - chaos-mesh
-
-
+    - deployment
+    - argocd
+    
+    - opentelemetry
+    
+    - load-testing
+    - k6
+    
+    - chaos-engineering
+    - chaos-mesh
+    
+    
  annotations:
    argocd/app-name: "petclinic"
    argocd/app-namespace: "argocd"
@@ -171,33 +172,35 @@ metadata:
    backstage.io/techdocs-ref: dir:.
    gitea.kyndemo.live/repo-slug: "validate/petclinic"
    sonarqube.org/project-key: petclinic
-
+    
    grafana/grafana-instance: "default"
    grafana/alert-label-selector: "app=demo-db"
    grafana/dashboard-selector: "uid == 'otel-app-observability-v2'"
    grafana.com/alert-label-selector: "app=demo-db"
    grafana.com/dashboard-url: "https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=demo-db"
+    
    k6/enabled: "true"
    k6/test-configmap: "k6-test-petclinic"
    k6/test-namespace: "demo-apps"
    k6/target-service: "demo-db"
+    
    chaos-mesh/enabled: "true"
+    
  links:
-  - url: https://petclinic.kyndemo.live
-    title: Live Application
-    icon: web
-  - url: https://gitea.kyndemo.live/validate/petclinic
-    title: Repository
-    icon: github
-  - url: https://argocd.kyndemo.live/applications/petclinic
-    title: ArgoCD App
-    icon: dashboard
-
-  - url: 
-      https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=demo-db
-    title: Grafana Dashboard
-    icon: dashboard
-
+    - url: https://petclinic.kyndemo.live
+      title: Live Application
+      icon: web
+    - url: https://gitea.kyndemo.live/validate/petclinic
+      title: Repository
+      icon: github
+    - url: https://argocd.kyndemo.live/applications/petclinic
+      title: ArgoCD App
+      icon: dashboard
+    
+    - url: https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=demo-db
+      title: Grafana Dashboard
+      icon: dashboard
+    
 spec:
  type: service
  owner: "platform-engineering"
@@ -205,14 +208,15 @@ spec:

  system: petclinic
  dependsOn:
-  - component:default/argocd-service
+    - component:default/argocd-service
+    
+    - resource:default/veterinary-platform
+    
+    
+    - resource:default/otel-collector
+    
+    - resource:default/k6-operator

-  - resource:default/veterinary-platform
-
-
-  - resource:default/otel-collector
-
-  - resource:default/k6-operator
 ---
 apiVersion: backstage.io/v1alpha1
 kind: Component
@@ -223,20 +227,20 @@ metadata:
    backstage.io/environment: "dev"
    app.kubernetes.io/managed-by: "backstage"
  tags:
-  - deployment
-  - argocd
-
-  - opentelemetry
-
-  - load-testing
-  - k6
-
-  - chaos-engineering
-  - chaos-mesh
-
-
-  - java
-
+    - deployment
+    - argocd
+    
+    - opentelemetry
+    
+    - load-testing
+    - k6
+    
+    - chaos-engineering
+    - chaos-mesh
+    
+    
+    - java
+    
  annotations:
    argocd/app-name: "petclinic"
    argocd/app-namespace: "argocd"
@@ -247,33 +251,35 @@ metadata:
    backstage.io/techdocs-ref: dir:.
    gitea.kyndemo.live/repo-slug: "validate/petclinic"
    sonarqube.org/project-key: petclinic
-
+    
    grafana/grafana-instance: "default"
    grafana/alert-label-selector: "app=petclinic"
    grafana/dashboard-selector: "uid == 'otel-app-observability-v2'"
    grafana.com/alert-label-selector: "app=petclinic"
    grafana.com/dashboard-url: "https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=petclinic"
+    
    k6/enabled: "true"
    k6/test-configmap: "k6-test-petclinic"
    k6/test-namespace: "demo-apps"
    k6/target-service: "petclinic"
+    
    chaos-mesh/enabled: "true"
+    
  links:
-  - url: https://petclinic.kyndemo.live
-    title: Live Application
-    icon: web
-  - url: https://gitea.kyndemo.live/validate/petclinic
-    title: Repository
-    icon: github
-  - url: https://argocd.kyndemo.live/applications/petclinic
-    title: ArgoCD App
-    icon: dashboard
-
-  - url: 
-      https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=petclinic
-    title: Grafana Dashboard
-    icon: dashboard
-
+    - url: https://petclinic.kyndemo.live
+      title: Live Application
+      icon: web
+    - url: https://gitea.kyndemo.live/validate/petclinic
+      title: Repository
+      icon: github
+    - url: https://argocd.kyndemo.live/applications/petclinic
+      title: ArgoCD App
+      icon: dashboard
+    
+    - url: https://grafana.kyndemo.live/d/otel-app-observability-v2/opentelemetry-application-observability?orgId=1&var-service=petclinic
+      title: Grafana Dashboard
+      icon: dashboard
+    
 spec:
  type: service
  owner: "platform-engineering"
@@ -281,13 +287,13 @@ spec:

  system: petclinic
  dependsOn:
-  - component:default/argocd-service
-
-  - resource:default/veterinary-platform
-
-
-  - resource:default/otel-collector
-
-  - resource:default/k6-operator
+    - component:default/argocd-service
+    
+    - resource:default/veterinary-platform
+    
+    
+    - resource:default/otel-collector
+    
+    - resource:default/k6-operator


--- a/k8s/db.yml
+++ b/k8s/db.yml
@@ -41,7 +41,7 @@ spec:
        app: demo-db
    spec:
      containers:
-        - image: postgres:18.3
+        - image: postgres:18.2
          name: postgresql
          env:
            - name: POSTGRES_USER