diff --git a/otc/localtest.me/stacks/observability/grafana-operator/manifests/grafana.yaml b/otc/localtest.me/stacks/observability/grafana-operator/manifests/grafana.yaml deleted file mode 100644 index 2f92152..0000000 --- a/otc/localtest.me/stacks/observability/grafana-operator/manifests/grafana.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: grafana.integreatly.org/v1beta1 -kind: Grafana -metadata: - name: grafana - labels: - dashboards: "grafana" -spec: - persistentVolumeClaim: - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 10Gi diff --git a/otc/localtest.me/stacks/ref-implementation/metric-server.yaml b/otc/localtest.me/stacks/ref-implementation/metric-server.yaml deleted file mode 100644 index ff532ae..0000000 --- a/otc/localtest.me/stacks/ref-implementation/metric-server.yaml +++ /dev/null @@ -1,31 +0,0 @@ - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: metric-server - namespace: argocd - labels: - env: dev - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: default - source: - repoURL: https://kubernetes-sigs.github.io/metrics-server - targetRevision: 3.12.1 - helm: - releaseName: metrics-server - values: | - args: - - --kubelet-insecure-tls #required for kind/minikube - chart: metrics-server - destination: - server: 'https://kubernetes.default.svc' - namespace: kube-system - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true - diff --git a/otc/localtest.me/edfbuilder.yaml b/otc/localtest.me/work/edfbuilder.yaml similarity index 75% rename from otc/localtest.me/edfbuilder.yaml rename to otc/localtest.me/work/edfbuilder.yaml index 43afeb8..35b60ac 100644 --- a/otc/localtest.me/edfbuilder.yaml +++ b/otc/localtest.me/work/edfbuilder.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "otc/localtest.me/registry" - repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" + path: "//registry" + repoURL: "https:///" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/registry/core.yaml b/otc/localtest.me/work/registry/core.yaml similarity index 75% rename from otc/localtest.me/registry/core.yaml rename to otc/localtest.me/work/registry/core.yaml index 2506439..0816b79 100644 --- a/otc/localtest.me/registry/core.yaml +++ b/otc/localtest.me/work/registry/core.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "otc/localtest.me/stacks/core" - repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" + path: "//stacks/core" + repoURL: "https:///" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/registry/forgejo.yaml b/otc/localtest.me/work/registry/forgejo.yaml similarity index 75% rename from otc/localtest.me/registry/forgejo.yaml rename to otc/localtest.me/work/registry/forgejo.yaml index 8fcb981..593e86f 100644 --- a/otc/localtest.me/registry/forgejo.yaml +++ b/otc/localtest.me/work/registry/forgejo.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "otc/localtest.me/stacks/forgejo" - repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" + path: "//stacks/forgejo" + repoURL: "https:///" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/registry/local-backup.yaml b/otc/localtest.me/work/registry/local-backup.yaml similarity index 74% rename from otc/localtest.me/registry/local-backup.yaml rename to otc/localtest.me/work/registry/local-backup.yaml index a146995..e356084 100644 --- a/otc/localtest.me/registry/local-backup.yaml +++ b/otc/localtest.me/work/registry/local-backup.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "otc/localtest.me/stacks/local-backup" - repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" + path: "//stacks/local-backup" + repoURL: "https:///" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/registry/observability-client.yaml b/otc/localtest.me/work/registry/observability-client.yaml similarity index 73% rename from otc/localtest.me/registry/observability-client.yaml rename to otc/localtest.me/work/registry/observability-client.yaml index 74a6912..d097d04 100644 --- a/otc/localtest.me/registry/observability-client.yaml +++ b/otc/localtest.me/work/registry/observability-client.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "otc/localtest.me/stacks/observability-client" - repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" + path: "//stacks/observability-client" + repoURL: "https:///" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/registry/observability.yaml b/otc/localtest.me/work/registry/observability.yaml similarity index 74% rename from otc/localtest.me/registry/observability.yaml rename to otc/localtest.me/work/registry/observability.yaml index 0b092a2..fdfd4dc 100644 --- a/otc/localtest.me/registry/observability.yaml +++ b/otc/localtest.me/work/registry/observability.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "otc/localtest.me/stacks/observability" - repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" + path: "//stacks/observability" + repoURL: "https:///" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/registry/otc.yaml b/otc/localtest.me/work/registry/otc.yaml similarity index 75% rename from otc/localtest.me/registry/otc.yaml rename to otc/localtest.me/work/registry/otc.yaml index bf1f966..29ed300 100644 --- a/otc/localtest.me/registry/otc.yaml +++ b/otc/localtest.me/work/registry/otc.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "otc/localtest.me/stacks/otc" - repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" + path: "//stacks/otc" + repoURL: "https:///" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/registry/ref-implementation.yaml b/otc/localtest.me/work/registry/ref-implementation.yaml similarity index 74% rename from otc/localtest.me/registry/ref-implementation.yaml rename to otc/localtest.me/work/registry/ref-implementation.yaml index 079e0b7..c4602b0 100644 --- a/otc/localtest.me/registry/ref-implementation.yaml +++ b/otc/localtest.me/work/registry/ref-implementation.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "otc/localtest.me/stacks/ref-implementation" - repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" + path: "//stacks/ref-implementation" + repoURL: "https:///" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/stacks/core/argocd.yaml b/otc/localtest.me/work/stacks/core/argocd.yaml similarity index 74% rename from otc/localtest.me/stacks/core/argocd.yaml rename to otc/localtest.me/work/stacks/core/argocd.yaml index 6c190a9..251bfb1 100644 --- a/otc/localtest.me/stacks/core/argocd.yaml +++ b/otc/localtest.me/work/stacks/core/argocd.yaml @@ -26,10 +26,10 @@ spec: targetRevision: argo-cd-7.8.14-depends helm: valueFiles: - - $values/otc/localtest.me/stacks/core/argocd/values.yaml - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - $values///stacks/core/argocd/values.yaml + - repoURL: https:/// targetRevision: HEAD ref: values - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/core/argocd/manifests" \ No newline at end of file + path: "//stacks/core/argocd/manifests" \ No newline at end of file diff --git a/otc/localtest.me/stacks/core/argocd/manifests/argocd-server-ingress.yaml b/otc/localtest.me/work/stacks/core/argocd/manifests/argocd-server-ingress.yaml similarity index 90% rename from otc/localtest.me/stacks/core/argocd/manifests/argocd-server-ingress.yaml rename to otc/localtest.me/work/stacks/core/argocd/manifests/argocd-server-ingress.yaml index e193381..54abc78 100644 --- a/otc/localtest.me/stacks/core/argocd/manifests/argocd-server-ingress.yaml +++ b/otc/localtest.me/work/stacks/core/argocd/manifests/argocd-server-ingress.yaml @@ -11,7 +11,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: argocd.localtest.me + - host: http: paths: - backend: @@ -23,5 +23,5 @@ spec: pathType: Prefix tls: - hosts: - - argocd.localtest.me + - secretName: argocd-net-tls diff --git a/otc/localtest.me/stacks/core/argocd/values.yaml b/otc/localtest.me/work/stacks/core/argocd/values.yaml similarity index 88% rename from otc/localtest.me/stacks/core/argocd/values.yaml rename to otc/localtest.me/work/stacks/core/argocd/values.yaml index 0c6ae59..d01deec 100644 --- a/otc/localtest.me/stacks/core/argocd/values.yaml +++ b/otc/localtest.me/work/stacks/core/argocd/values.yaml @@ -1,5 +1,5 @@ global: - domain: argocd.localtest.me + domain: configs: params: @@ -19,7 +19,7 @@ configs: clusters: - "*" accounts.provider-argocd: apiKey - url: https://argocd.localtest.me + url: https:// rbac: policy.csv: 'g, provider-argocd, role:admin' diff --git a/otc/localtest.me/stacks/forgejo/forgejo-runner.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-runner.yaml similarity index 74% rename from otc/localtest.me/stacks/forgejo/forgejo-runner.yaml rename to otc/localtest.me/work/stacks/forgejo/forgejo-runner.yaml index 923a6c1..37b344e 100644 --- a/otc/localtest.me/stacks/forgejo/forgejo-runner.yaml +++ b/otc/localtest.me/work/stacks/forgejo/forgejo-runner.yaml @@ -19,6 +19,6 @@ spec: destination: server: "https://kubernetes.default.svc" source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/forgejo/forgejo-runner" + path: "//stacks/forgejo/forgejo-runner" diff --git a/otc/localtest.me/stacks/forgejo/forgejo-runner/dind-docker.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-runner/dind-docker.yaml similarity index 98% rename from otc/localtest.me/stacks/forgejo/forgejo-runner/dind-docker.yaml rename to otc/localtest.me/work/stacks/forgejo/forgejo-runner/dind-docker.yaml index 10a7feb..8a7e521 100644 --- a/otc/localtest.me/stacks/forgejo/forgejo-runner/dind-docker.yaml +++ b/otc/localtest.me/work/stacks/forgejo/forgejo-runner/dind-docker.yaml @@ -51,7 +51,7 @@ spec: name: forgejo-runner-token key: token - name: FORGEJO_INSTANCE_URL - value: https://gitea.localtest.me + value: https:// volumeMounts: - name: runner-data mountPath: /data diff --git a/otc/localtest.me/stacks/forgejo/forgejo-server.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-server.yaml similarity index 80% rename from otc/localtest.me/stacks/forgejo/forgejo-server.yaml rename to otc/localtest.me/work/stacks/forgejo/forgejo-server.yaml index 03239ef..a795663 100644 --- a/otc/localtest.me/stacks/forgejo/forgejo-server.yaml +++ b/otc/localtest.me/work/stacks/forgejo/forgejo-server.yaml @@ -29,10 +29,10 @@ spec: targetRevision: v9.0.0-depends helm: valueFiles: - - $values/otc/localtest.me/stacks/forgejo/forgejo-server/values.yaml - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - $values///stacks/forgejo/forgejo-server/values.yaml + - repoURL: https:/// targetRevision: HEAD ref: values - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/forgejo/forgejo-server/manifests" \ No newline at end of file + path: "//stacks/forgejo/forgejo-server/manifests" \ No newline at end of file diff --git a/otc/localtest.me/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml similarity index 90% rename from otc/localtest.me/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml rename to otc/localtest.me/work/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml index 1dc0b7c..4f5f29a 100644 --- a/otc/localtest.me/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml +++ b/otc/localtest.me/work/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml @@ -11,7 +11,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: gitea.localtest.me + - host: http: paths: - backend: @@ -23,5 +23,5 @@ spec: pathType: Prefix tls: - hosts: - - gitea.localtest.me + - secretName: forgejo-net-tls diff --git a/otc/localtest.me/stacks/forgejo/forgejo-server/values.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-server/values.yaml similarity index 96% rename from otc/localtest.me/stacks/forgejo/forgejo-server/values.yaml rename to otc/localtest.me/work/stacks/forgejo/forgejo-server/values.yaml index 2b64918..e333b7e 100644 --- a/otc/localtest.me/stacks/forgejo/forgejo-server/values.yaml +++ b/otc/localtest.me/work/stacks/forgejo/forgejo-server/values.yaml @@ -18,7 +18,7 @@ persistence: enabled: true size: 200Gi annotations: - everest.io/crypt-key-id: KMS + everest.io/crypt-key-id: test: enabled: false @@ -111,7 +111,7 @@ gitea: MINIO_ENDPOINT: obs.eu-de.otc.t-systems.com:443 STORAGE_TYPE: minio MINIO_LOCATION: eu-de - MINIO_BUCKET: edp-forgejo-kind + MINIO_BUCKET: edp-forgejo- MINIO_USE_SSL: true queue: @@ -136,8 +136,8 @@ gitea: SSL_MODE: verify-ca server: - DOMAIN: 'gitea.localtest.me' - ROOT_URL: 'https://gitea.localtest.me:443' + DOMAIN: '' + ROOT_URL: 'https://:443' mailer: ENABLED: true diff --git a/otc/localtest.me/stacks/local-backup/README.md b/otc/localtest.me/work/stacks/local-backup/README.md similarity index 100% rename from otc/localtest.me/stacks/local-backup/README.md rename to otc/localtest.me/work/stacks/local-backup/README.md diff --git a/otc/localtest.me/stacks/local-backup/demo/backup.yaml b/otc/localtest.me/work/stacks/local-backup/demo/backup.yaml similarity index 100% rename from otc/localtest.me/stacks/local-backup/demo/backup.yaml rename to otc/localtest.me/work/stacks/local-backup/demo/backup.yaml diff --git a/otc/localtest.me/stacks/local-backup/demo/restore.yaml b/otc/localtest.me/work/stacks/local-backup/demo/restore.yaml similarity index 100% rename from otc/localtest.me/stacks/local-backup/demo/restore.yaml rename to otc/localtest.me/work/stacks/local-backup/demo/restore.yaml diff --git a/otc/localtest.me/stacks/local-backup/minio.yaml b/otc/localtest.me/work/stacks/local-backup/minio.yaml similarity index 64% rename from otc/localtest.me/stacks/local-backup/minio.yaml rename to otc/localtest.me/work/stacks/local-backup/minio.yaml index cc0b8f8..6f678a6 100644 --- a/otc/localtest.me/stacks/local-backup/minio.yaml +++ b/otc/localtest.me/work/stacks/local-backup/minio.yaml @@ -15,14 +15,14 @@ spec: helm: releaseName: minio valueFiles: - - $values/otc/localtest.me/stacks/local-backup/minio/helm/values.yaml + - $values///stacks/local-backup/minio/helm/values.yaml chart: minio - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD ref: values - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/local-backup/minio/manifests" + path: "//stacks/local-backup/minio/manifests" destination: server: "https://kubernetes.default.svc" namespace: minio-backup diff --git a/otc/localtest.me/stacks/local-backup/minio/helm/values.yaml b/otc/localtest.me/work/stacks/local-backup/minio/helm/values.yaml similarity index 100% rename from otc/localtest.me/stacks/local-backup/minio/helm/values.yaml rename to otc/localtest.me/work/stacks/local-backup/minio/helm/values.yaml diff --git a/otc/localtest.me/stacks/local-backup/minio/manifests/minio-pv.yaml b/otc/localtest.me/work/stacks/local-backup/minio/manifests/minio-pv.yaml similarity index 100% rename from otc/localtest.me/stacks/local-backup/minio/manifests/minio-pv.yaml rename to otc/localtest.me/work/stacks/local-backup/minio/manifests/minio-pv.yaml diff --git a/otc/localtest.me/stacks/local-backup/minio/manifests/secret-sync.yaml b/otc/localtest.me/work/stacks/local-backup/minio/manifests/secret-sync.yaml similarity index 100% rename from otc/localtest.me/stacks/local-backup/minio/manifests/secret-sync.yaml rename to otc/localtest.me/work/stacks/local-backup/minio/manifests/secret-sync.yaml diff --git a/otc/localtest.me/stacks/local-backup/velero.yaml b/otc/localtest.me/work/stacks/local-backup/velero.yaml similarity index 78% rename from otc/localtest.me/stacks/local-backup/velero.yaml rename to otc/localtest.me/work/stacks/local-backup/velero.yaml index 59ef22f..832c7c7 100644 --- a/otc/localtest.me/stacks/local-backup/velero.yaml +++ b/otc/localtest.me/work/stacks/local-backup/velero.yaml @@ -15,9 +15,9 @@ spec: helm: releaseName: velero valueFiles: - - $values/otc/localtest.me/stacks/local-backup/velero/helm/values.yaml + - $values///stacks/local-backup/velero/helm/values.yaml chart: velero - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD ref: values destination: diff --git a/otc/localtest.me/stacks/local-backup/velero/helm/values.yaml b/otc/localtest.me/work/stacks/local-backup/velero/helm/values.yaml similarity index 100% rename from otc/localtest.me/stacks/local-backup/velero/helm/values.yaml rename to otc/localtest.me/work/stacks/local-backup/velero/helm/values.yaml diff --git a/otc/localtest.me/stacks/observability-client/metrics-server.yaml b/otc/localtest.me/work/stacks/observability-client/metrics-server.yaml similarity index 74% rename from otc/localtest.me/stacks/observability-client/metrics-server.yaml rename to otc/localtest.me/work/stacks/observability-client/metrics-server.yaml index cb78746..d32fad6 100644 --- a/otc/localtest.me/stacks/observability-client/metrics-server.yaml +++ b/otc/localtest.me/work/stacks/observability-client/metrics-server.yaml @@ -23,7 +23,7 @@ spec: targetRevision: 3.12.2 helm: valueFiles: - - $values/otc/localtest.me/stacks/observability-client/metrics-server/values.yaml - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - $values///stacks/observability-client/metrics-server/values.yaml + - repoURL: https:/// targetRevision: HEAD ref: values diff --git a/otc/localtest.me/stacks/observability-client/metrics-server/values.yaml b/otc/localtest.me/work/stacks/observability-client/metrics-server/values.yaml similarity index 100% rename from otc/localtest.me/stacks/observability-client/metrics-server/values.yaml rename to otc/localtest.me/work/stacks/observability-client/metrics-server/values.yaml diff --git a/otc/localtest.me/stacks/observability-client/vector.yaml b/otc/localtest.me/work/stacks/observability-client/vector.yaml similarity index 74% rename from otc/localtest.me/stacks/observability-client/vector.yaml rename to otc/localtest.me/work/stacks/observability-client/vector.yaml index a289adb..36dde20 100644 --- a/otc/localtest.me/stacks/observability-client/vector.yaml +++ b/otc/localtest.me/work/stacks/observability-client/vector.yaml @@ -23,7 +23,7 @@ spec: targetRevision: 0.43.0 helm: valueFiles: - - $values/otc/localtest.me/stacks/observability-client/vector/values.yaml - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - $values///stacks/observability-client/vector/values.yaml + - repoURL: https:/// targetRevision: HEAD ref: values diff --git a/otc/localtest.me/stacks/observability-client/vector/values.yaml b/otc/localtest.me/work/stacks/observability-client/vector/values.yaml similarity index 87% rename from otc/localtest.me/stacks/observability-client/vector/values.yaml rename to otc/localtest.me/work/stacks/observability-client/vector/values.yaml index 753d596..b6991ee 100644 --- a/otc/localtest.me/stacks/observability-client/vector/values.yaml +++ b/otc/localtest.me/work/stacks/observability-client/vector/values.yaml @@ -28,16 +28,16 @@ customConfig: type: remap inputs: [k8s] source: | - .log = parse_json(.message) ?? .message + ._msg = parse_json(.message) ?? .message del(.message) # Add the cluster environment to the log event - .cluster_environment = "kind" + .cluster_environment = "" sinks: vlogs: type: elasticsearch inputs: [parser] endpoints: - - https://o12y.observability.think-ahead.cloud/insert/elasticsearch/ + - https:///insert/elasticsearch/ auth: strategy: basic user: simple-user diff --git a/otc/localtest.me/stacks/observability-client/vm-client-stack.yaml b/otc/localtest.me/work/stacks/observability-client/vm-client-stack.yaml similarity index 58% rename from otc/localtest.me/stacks/observability-client/vm-client-stack.yaml rename to otc/localtest.me/work/stacks/observability-client/vm-client-stack.yaml index c23444e..78ed3d5 100644 --- a/otc/localtest.me/stacks/observability-client/vm-client-stack.yaml +++ b/otc/localtest.me/work/stacks/observability-client/vm-client-stack.yaml @@ -19,13 +19,12 @@ spec: - chart: victoria-metrics-k8s-stack repoURL: https://victoriametrics.github.io/helm-charts/ targetRevision: 0.48.1 - releaseName: vm-client helm: valueFiles: - - $values/otc/localtest.me/stacks/observability-client/vm-client-stack/values.yaml - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - $values///stacks/observability-client/vm-client-stack/values.yaml + - repoURL: https:/// targetRevision: HEAD ref: values - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/observability-client/vm-client-stack/manifests" + path: "//stacks/observability-client/vm-client-stack/manifests" diff --git a/otc/localtest.me/stacks/observability-client/vm-client-stack/manifests/simple-user-secret.yaml b/otc/localtest.me/work/stacks/observability-client/vm-client-stack/manifests/simple-user-secret.yaml similarity index 100% rename from otc/localtest.me/stacks/observability-client/vm-client-stack/manifests/simple-user-secret.yaml rename to otc/localtest.me/work/stacks/observability-client/vm-client-stack/manifests/simple-user-secret.yaml diff --git a/otc/localtest.me/stacks/observability-client/vm-client-stack/values.yaml b/otc/localtest.me/work/stacks/observability-client/vm-client-stack/values.yaml similarity index 99% rename from otc/localtest.me/stacks/observability-client/vm-client-stack/values.yaml rename to otc/localtest.me/work/stacks/observability-client/vm-client-stack/values.yaml index 5248116..f8b2a45 100644 --- a/otc/localtest.me/stacks/observability-client/vm-client-stack/values.yaml +++ b/otc/localtest.me/work/stacks/observability-client/vm-client-stack/values.yaml @@ -763,9 +763,9 @@ vmauth: annotations: nginx.ingress.kubernetes.io/force-ssl-redirect: "true" cert-manager.io/cluster-issuer: main - host: o12y.localtest.me + host: o12y. tlsHosts: - - o12y.localtest.me + - o12y. tlsSecretName: vmauth-tls-secret unauthorizedUserAccessSpec: {} selectAllByDefault: true @@ -778,7 +778,7 @@ vmagent: # -- Remote write configuration of VMAgent, allowed parameters defined in a [spec](https://docs.victoriametrics.com/operator/api#vmagentremotewritespec) additionalRemoteWrites: # [] - - url: https://o12y.observability.think-ahead.cloud/api/v1/write + - url: https:///api/v1/write basicAuth: username: name: simple-user-secret @@ -792,7 +792,7 @@ vmagent: selectAllByDefault: true scrapeInterval: 20s externalLabels: - cluster_environment: "kind" + cluster_environment: "" # For multi-cluster setups it is useful to use "cluster" label to identify the metrics source. # For example: # cluster: cluster-name diff --git a/otc/localtest.me/stacks/observability/grafana-operator.yaml b/otc/localtest.me/work/stacks/observability/grafana-operator.yaml similarity index 69% rename from otc/localtest.me/stacks/observability/grafana-operator.yaml rename to otc/localtest.me/work/stacks/observability/grafana-operator.yaml index 7591890..ea759a2 100644 --- a/otc/localtest.me/stacks/observability/grafana-operator.yaml +++ b/otc/localtest.me/work/stacks/observability/grafana-operator.yaml @@ -20,7 +20,6 @@ spec: - chart: grafana-operator repoURL: ghcr.io/grafana/helm-charts targetRevision: v5.18.0 - releaseName: grafana-operator - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/observability/grafana-operator/manifests" + path: "//stacks/observability/grafana-operator/manifests" diff --git a/otc/localtest.me/stacks/observability/grafana-operator/manifests/argocd.yaml b/otc/localtest.me/work/stacks/observability/grafana-operator/manifests/argocd.yaml similarity index 100% rename from otc/localtest.me/stacks/observability/grafana-operator/manifests/argocd.yaml rename to otc/localtest.me/work/stacks/observability/grafana-operator/manifests/argocd.yaml diff --git a/otc/localtest.me/work/stacks/observability/grafana-operator/manifests/grafana.yaml b/otc/localtest.me/work/stacks/observability/grafana-operator/manifests/grafana.yaml new file mode 100644 index 0000000..4dd0271 --- /dev/null +++ b/otc/localtest.me/work/stacks/observability/grafana-operator/manifests/grafana.yaml @@ -0,0 +1,36 @@ +apiVersion: grafana.integreatly.org/v1beta1 +kind: Grafana +metadata: + name: grafana + labels: + dashboards: "grafana" +spec: + persistentVolumeClaim: + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 10Gi + ingress: + metadata: + annotations: + cert-manager.io/cluster-issuer: main + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + spec: + ingressClassName: nginx + rules: + - host: o12y. + http: + paths: + - backend: + service: + name: grafana-service + port: + number: 3000 + path: / + pathType: Prefix + tls: + - hosts: + - o12y. + secretName: grafana-net-tls diff --git a/otc/localtest.me/stacks/observability/grafana-operator/manifests/ingress-nginx.yaml b/otc/localtest.me/work/stacks/observability/grafana-operator/manifests/ingress-nginx.yaml similarity index 100% rename from otc/localtest.me/stacks/observability/grafana-operator/manifests/ingress-nginx.yaml rename to otc/localtest.me/work/stacks/observability/grafana-operator/manifests/ingress-nginx.yaml diff --git a/otc/localtest.me/stacks/observability/grafana-operator/manifests/victoria-logs.yaml b/otc/localtest.me/work/stacks/observability/grafana-operator/manifests/victoria-logs.yaml similarity index 100% rename from otc/localtest.me/stacks/observability/grafana-operator/manifests/victoria-logs.yaml rename to otc/localtest.me/work/stacks/observability/grafana-operator/manifests/victoria-logs.yaml diff --git a/otc/localtest.me/stacks/observability/victoria-k8s-stack.yaml b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack.yaml similarity index 60% rename from otc/localtest.me/stacks/observability/victoria-k8s-stack.yaml rename to otc/localtest.me/work/stacks/observability/victoria-k8s-stack.yaml index 90ec3ee..c1bd5de 100644 --- a/otc/localtest.me/stacks/observability/victoria-k8s-stack.yaml +++ b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack.yaml @@ -20,13 +20,12 @@ spec: - chart: victoria-metrics-k8s-stack repoURL: https://victoriametrics.github.io/helm-charts/ targetRevision: 0.48.1 - releaseName: o12y helm: valueFiles: - - $values/otc/localtest.me/stacks/observability/victoria-k8s-stack/values.yaml - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - $values///stacks/observability/victoria-k8s-stack/values.yaml + - repoURL: https:/// targetRevision: HEAD ref: values - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/observability/victoria-k8s-stack/manifests" + path: "//stacks/observability/victoria-k8s-stack/manifests" diff --git a/otc/localtest.me/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml similarity index 83% rename from otc/localtest.me/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml rename to otc/localtest.me/work/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml index b74e71a..81a4329 100644 --- a/otc/localtest.me/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml +++ b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml @@ -6,6 +6,9 @@ metadata: spec: retentionPeriod: "12" removePvcAfterDelete: true + storageMetadata: + annotations: + everest.io/crypt-key-id: storage: accessModes: - ReadWriteOnce diff --git a/otc/localtest.me/stacks/observability/victoria-k8s-stack/manifests/vmauth.yaml b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/manifests/vmauth.yaml similarity index 100% rename from otc/localtest.me/stacks/observability/victoria-k8s-stack/manifests/vmauth.yaml rename to otc/localtest.me/work/stacks/observability/victoria-k8s-stack/manifests/vmauth.yaml diff --git a/otc/localtest.me/stacks/observability/victoria-k8s-stack/values.yaml b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/values.yaml similarity index 99% rename from otc/localtest.me/stacks/observability/victoria-k8s-stack/values.yaml rename to otc/localtest.me/work/stacks/observability/victoria-k8s-stack/values.yaml index d717918..79bc53f 100644 --- a/otc/localtest.me/stacks/observability/victoria-k8s-stack/values.yaml +++ b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/values.yaml @@ -286,6 +286,9 @@ vmsingle: retentionPeriod: "1" replicaCount: 1 extraArgs: {} + storageMetadata: + annotations: + everest.io/crypt-key-id: storage: accessModes: - ReadWriteOnce @@ -346,7 +349,7 @@ vmcluster: spec: resources: requests: - storage: 10Gi + storage: 10Gi resources: {} # limits: @@ -763,9 +766,9 @@ vmauth: annotations: nginx.ingress.kubernetes.io/force-ssl-redirect: "true" cert-manager.io/cluster-issuer: main - host: o12y.observability.think-ahead.cloud + host: tlsHosts: - - o12y.observability.think-ahead.cloud + - tlsSecretName: vmauth-tls-secret unauthorizedUserAccessSpec: {} selectAllByDefault: true diff --git a/otc/localtest.me/stacks/otc/cert-manager/manifests/clusterissuer.yaml b/otc/localtest.me/work/stacks/otc/cert-manager/manifests/clusterissuer.yaml similarity index 100% rename from otc/localtest.me/stacks/otc/cert-manager/manifests/clusterissuer.yaml rename to otc/localtest.me/work/stacks/otc/cert-manager/manifests/clusterissuer.yaml diff --git a/otc/localtest.me/stacks/otc/cert-manager/values.yaml b/otc/localtest.me/work/stacks/otc/cert-manager/values.yaml similarity index 100% rename from otc/localtest.me/stacks/otc/cert-manager/values.yaml rename to otc/localtest.me/work/stacks/otc/cert-manager/values.yaml diff --git a/otc/localtest.me/stacks/otc/cert-manger.yaml b/otc/localtest.me/work/stacks/otc/cert-manger.yaml similarity index 62% rename from otc/localtest.me/stacks/otc/cert-manger.yaml rename to otc/localtest.me/work/stacks/otc/cert-manger.yaml index 0f56e27..90bd1af 100644 --- a/otc/localtest.me/stacks/otc/cert-manger.yaml +++ b/otc/localtest.me/work/stacks/otc/cert-manger.yaml @@ -23,10 +23,10 @@ spec: targetRevision: v1.17.2 helm: valueFiles: - - $values/otc/localtest.me/stacks/otc/cert-manager/values.yaml - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - $values///stacks/otc/cert-manager/values.yaml + - repoURL: https:/// targetRevision: HEAD ref: values - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/otc/cert-manager/manifests" + path: "//stacks/otc/cert-manager/manifests" diff --git a/otc/localtest.me/stacks/otc/ingress-nginx.yaml b/otc/localtest.me/work/stacks/otc/ingress-nginx.yaml similarity index 78% rename from otc/localtest.me/stacks/otc/ingress-nginx.yaml rename to otc/localtest.me/work/stacks/otc/ingress-nginx.yaml index 73dd275..f753213 100644 --- a/otc/localtest.me/stacks/otc/ingress-nginx.yaml +++ b/otc/localtest.me/work/stacks/otc/ingress-nginx.yaml @@ -23,7 +23,7 @@ spec: targetRevision: helm-chart-4.12.1-depends helm: valueFiles: - - $values/otc/localtest.me/stacks/otc/ingress-nginx/values.yaml - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - $values///stacks/otc/ingress-nginx/values.yaml + - repoURL: https:/// targetRevision: HEAD ref: values diff --git a/otc/localtest.me/stacks/otc/ingress-nginx/values.yaml b/otc/localtest.me/work/stacks/otc/ingress-nginx/values.yaml similarity index 87% rename from otc/localtest.me/stacks/otc/ingress-nginx/values.yaml rename to otc/localtest.me/work/stacks/otc/ingress-nginx/values.yaml index 530e54b..b5aeffd 100644 --- a/otc/localtest.me/stacks/otc/ingress-nginx/values.yaml +++ b/otc/localtest.me/work/stacks/otc/ingress-nginx/values.yaml @@ -8,8 +8,8 @@ controller: annotations: kubernetes.io/elb.class: union kubernetes.io/elb.port: '80' - kubernetes.io/elb.id: ABC - kubernetes.io/elb.ip: ABC + kubernetes.io/elb.id: + kubernetes.io/elb.ip: ingressClassResource: name: nginx diff --git a/otc/localtest.me/stacks/otc/storageclass.yaml b/otc/localtest.me/work/stacks/otc/storageclass.yaml similarity index 75% rename from otc/localtest.me/stacks/otc/storageclass.yaml rename to otc/localtest.me/work/stacks/otc/storageclass.yaml index 790daf4..b3004c8 100644 --- a/otc/localtest.me/stacks/otc/storageclass.yaml +++ b/otc/localtest.me/work/stacks/otc/storageclass.yaml @@ -12,9 +12,9 @@ spec: namespace: default server: "https://kubernetes.default.svc" source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/otc/storageclass" + path: "//stacks/otc/storageclass" project: default syncPolicy: automated: diff --git a/otc/localtest.me/stacks/otc/storageclass/storageclass.yaml b/otc/localtest.me/work/stacks/otc/storageclass/storageclass.yaml similarity index 100% rename from otc/localtest.me/stacks/otc/storageclass/storageclass.yaml rename to otc/localtest.me/work/stacks/otc/storageclass/storageclass.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/README.md b/otc/localtest.me/work/stacks/ref-implementation/README.md similarity index 87% rename from otc/localtest.me/stacks/ref-implementation/README.md rename to otc/localtest.me/work/stacks/ref-implementation/README.md index 2738b48..4efd3fc 100644 --- a/otc/localtest.me/stacks/ref-implementation/README.md +++ b/otc/localtest.me/work/stacks/ref-implementation/README.md @@ -30,7 +30,7 @@ idpbuilder create --use-path-routing \ --package https://github.com/cnoe-io/stacks//ref-implementation ``` -This will take ~6 minutes for everything to come up. To track the progress, you can go to the [ArgoCD UI](https://localtest.me:8443/argocd/applications). +This will take ~6 minutes for everything to come up. To track the progress, you can go to the [ArgoCD UI](https://:8443/argocd/applications). ### What was installed? @@ -47,15 +47,15 @@ The only package that cannot be removed this way is Keycloak because other packa #### Accessing UIs -- Argo CD: https://localtest.me:8443/argocd -- Argo Workflows: https://localtest.me:8443/argo-workflows -- Backstage: https://localtest.me:8443/ -- Gitea: https://localtest.me:8443/gitea -- Keycloak: https://localtest.me:8443/keycloak/admin/master/console/ +- Argo CD: https://:8443/argocd +- Argo Workflows: https://:8443/argo-workflows +- Backstage: https://:8443/ +- Gitea: https://:8443/gitea +- Keycloak: https://:8443/keycloak/admin/master/console/ # Using it -For this example, we will walk through a few demonstrations. Once applications are ready, go to the [backstage URL](https://localtest.me:8443). +For this example, we will walk through a few demonstrations. Once applications are ready, go to the [backstage URL](https://:8443). Click on the Sign-In button, you will be asked to log into the Keycloak instance. There are two users set up in this configuration, and their password can be retrieved with the following command: @@ -70,7 +70,7 @@ Both users use the same password retrieved above. If you want to create a new user or change existing users: -1. Go to the [Keycloak UI](https://localtest.me:8443/keycloak/admin/master/console/). +1. Go to the [Keycloak UI](https://:8443/keycloak/admin/master/console/). Login with the username `cnoe-admin`. Password is the `KEYCLOAK_ADMIN_PASSWORD` field from the command above. 2. Select `cnoe` from the realms drop down menu. 3. Select users tab. @@ -97,9 +97,9 @@ You can click on the ArgoCD Application name to see more details. ### What just happened? -1. Backstage created [a git repository](https://localtest.me:8443/gitea/giteaAdmin/demo), then pushed templated contents to it. -2. Backstage created [an ArgoCD Application](https://localtest.me:8443/argocd/applications/argocd/demo?) and pointed it to the git repository. -3. Backstage registered the application as [a component](https://localtest.me:8443/gitea/giteaAdmin/demo/src/branch/main/catalog-info.yaml) in Backstage. +1. Backstage created [a git repository](https://:8443/gitea/giteaAdmin/demo), then pushed templated contents to it. +2. Backstage created [an ArgoCD Application](https://:8443/argocd/applications/argocd/demo?) and pointed it to the git repository. +3. Backstage registered the application as [a component](https://:8443/gitea/giteaAdmin/demo/src/branch/main/catalog-info.yaml) in Backstage. 4. ArgoCD deployed the manifests stored in the repo to the cluster. 5. Backstage retrieved application health from ArgoCD API, then displayed it. diff --git a/otc/localtest.me/stacks/ref-implementation/argo-workflows.yaml b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows.yaml similarity index 75% rename from otc/localtest.me/stacks/ref-implementation/argo-workflows.yaml rename to otc/localtest.me/work/stacks/ref-implementation/argo-workflows.yaml index e43a168..619d4a2 100644 --- a/otc/localtest.me/stacks/ref-implementation/argo-workflows.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows.yaml @@ -10,9 +10,9 @@ metadata: spec: project: default source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev" + path: "//stacks/ref-implementation/argo-workflows/manifests/dev" destination: server: "https://kubernetes.default.svc" namespace: argo diff --git a/otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/base/install.yaml b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/base/install.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/base/install.yaml rename to otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/base/install.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/base/kustomization.yaml b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/base/kustomization.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/base/kustomization.yaml rename to otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/base/kustomization.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/external-secret.yaml b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/external-secret.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/external-secret.yaml rename to otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/external-secret.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/kustomization.yaml b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/kustomization.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/kustomization.yaml rename to otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/kustomization.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml similarity index 77% rename from otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml rename to otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml index 0b9e607..758293a 100644 --- a/otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/patches/cm-argo-workflows.yaml @@ -7,14 +7,14 @@ data: config: | sso: insecureSkipVerify: true - issuer: https://localtest.me/keycloak/realms/cnoe + issuer: https:///keycloak/realms/cnoe clientId: name: keycloak-oidc key: client-id clientSecret: name: keycloak-oidc key: secret-key - redirectUrl: https://localtest.me:443/argo-workflows/oauth2/callback + redirectUrl: https://:443/argo-workflows/oauth2/callback rbac: enabled: true scopes: diff --git a/otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/patches/deployment-argo-server.yaml b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/patches/deployment-argo-server.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/patches/deployment-argo-server.yaml rename to otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/patches/deployment-argo-server.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/sa-admin.yaml b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/sa-admin.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev/sa-admin.yaml rename to otc/localtest.me/work/stacks/ref-implementation/argo-workflows/manifests/dev/sa-admin.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates.yaml similarity index 74% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates.yaml index f74e084..c9b9ad3 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates.yaml @@ -10,9 +10,9 @@ metadata: spec: project: default source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/ref-implementation/backstage-templates/entities" + path: "//stacks/ref-implementation/backstage-templates/entities" directory: exclude: "catalog-info.yaml" destination: diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml similarity index 96% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml index 9786188..38b093f 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/catalog-info.yaml @@ -20,7 +20,7 @@ metadata: backstage.io/kubernetes-namespace: default argocd/app-name: ${{values.name | dump}} links: - - url: https://gitea.localtest.me:443 + - url: https://:443 title: Repo URL icon: github spec: diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/idpbuilder.md b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/idpbuilder.md similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/idpbuilder.md rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/idpbuilder.md diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/images/cnoe-logo.png b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/images/cnoe-logo.png similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/images/cnoe-logo.png rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/images/cnoe-logo.png diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/index.md b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/index.md similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/index.md rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/docs/index.md diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/go.mod b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/go.mod similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/go.mod rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/go.mod diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/base/kustomization.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/base/kustomization.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/base/kustomization.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/base/kustomization.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/base/nginx.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/base/nginx.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/base/nginx.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/base/nginx.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/dev/kustomization.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/dev/kustomization.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/dev/kustomization.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/dev/kustomization.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/prod/kustomization.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/prod/kustomization.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/prod/kustomization.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/kustomize/prod/kustomization.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/main.go b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/main.go similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/main.go rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/main.go diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/mkdocs.yml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/mkdocs.yml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/mkdocs.yml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/skeleton/mkdocs.yml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml similarity index 96% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml index e1015c8..25345a0 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/app-with-bucket/template.yaml @@ -100,7 +100,7 @@ spec: input: description: This is an example app # Hard coded value for this demo purposes only. - repoUrl: gitea.localtest.me:443/?repo=${{parameters.name}} + repoUrl: :443/?repo=${{parameters.name}} defaultBranch: main - id: create-argocd-app name: Create ArgoCD App @@ -111,7 +111,7 @@ spec: argoInstance: in-cluster projectName: default # necessary until we generate our own cert - repoUrl: https://gitea.localtest.me:443/giteaAdmin/${{parameters.name}} + repoUrl: https://:443/giteaAdmin/${{parameters.name}} path: "kustomize/base" - id: register name: Register diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml similarity index 96% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml index 80fa323..b28ef1d 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/catalog-info.yaml @@ -14,7 +14,7 @@ metadata: apache-spark.cnoe.io/label-selector: env=dev,entity-id=${{values.name}} apache-spark.cnoe.io/cluster-name: local links: - - url: https://gitea.localtest.me:443 + - url: https://:443 title: Repo URL icon: github spec: diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/argo-workflows.md b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/argo-workflows.md similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/argo-workflows.md rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/argo-workflows.md diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/images/cnoe-logo.png b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/images/cnoe-logo.png similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/images/cnoe-logo.png rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/images/cnoe-logo.png diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/index.md b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/index.md similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/index.md rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/index.md diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/spark-operator.md b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/spark-operator.md similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/spark-operator.md rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/docs/spark-operator.md diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/manifests/deployment.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/manifests/deployment.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/manifests/deployment.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/manifests/deployment.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/mkdocs.yml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/mkdocs.yml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/mkdocs.yml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/skeleton/mkdocs.yml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml similarity index 92% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml index eb727f4..afbabbf 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/argo-workflows/template.yaml @@ -35,7 +35,7 @@ spec: input: description: This is an example app # Hard coded value for this demo purposes only. - repoUrl: gitea.localtest.me:443/?repo=${{parameters.name}} + repoUrl: :443/?repo=${{parameters.name}} defaultBranch: main - id: create-argocd-app name: Create ArgoCD App @@ -46,7 +46,7 @@ spec: argoInstance: in-cluster projectName: default # necessary until we generate our own cert - repoUrl: https://gitea.localtest.me:443/giteaAdmin/${{parameters.name}} + repoUrl: https://:443/giteaAdmin/${{parameters.name}} path: "manifests" - id: register name: Register diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/mkdocs.yml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/mkdocs.yml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/mkdocs.yml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/mkdocs.yml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml similarity index 95% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml index a3e9703..ba9c755 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/catalog-info.yaml @@ -10,7 +10,7 @@ metadata: backstage.io/kubernetes-namespace: default argocd/app-name: ${{values.name | dump}} links: - - url: https://gitea.localtest.me:443 + - url: https://:443 title: Repo URL icon: github spec: diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/idpbuilder.md b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/idpbuilder.md similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/idpbuilder.md rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/idpbuilder.md diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/images/cnoe-logo.png b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/images/cnoe-logo.png similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/images/cnoe-logo.png rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/images/cnoe-logo.png diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/index.md b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/index.md similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/index.md rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/docs/index.md diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/manifests/deployment.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/manifests/deployment.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/manifests/deployment.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/skeleton/manifests/deployment.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml similarity index 90% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml index e5d9ec7..7120774 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml @@ -31,7 +31,7 @@ spec: input: description: This is an example app # Hard coded value for this demo purposes only. - repoUrl: gitea.localtest.me:443/?repo=${{parameters.name}} + repoUrl: :443/?repo=${{parameters.name}} defaultBranch: main - id: create-argocd-app name: Create ArgoCD App @@ -42,7 +42,7 @@ spec: argoInstance: in-cluster projectName: default # necessary until we generate our own cert - repoUrl: https://gitea.localtest.me:443/giteaAdmin/${{parameters.name}} + repoUrl: https://:443/giteaAdmin/${{parameters.name}} path: "manifests" - id: register name: Register diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml similarity index 91% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml index 68ac3f9..521c435 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/catalog-info.yaml @@ -9,7 +9,7 @@ metadata: backstage.io/kubernetes-label-selector: 'entity-id=${{ values.name }}' backstage.io/kubernetes-namespace: gitea links: - - url: https://gitea.localtest.me:443 + - url: https://:443 title: Repo URL icon: git spec: @@ -26,7 +26,7 @@ metadata: annotations: backstage.io/techdocs-ref: dir:. links: - - url: https://gitea.localtest.me:443 + - url: https://:443 title: Gitea Repo icon: git spec: diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/main.go b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/main.go similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/main.go rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/skeleton/main.go diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml similarity index 95% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml index dcd0892..4652b83 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/demo-go-hello-world/template.yaml @@ -33,7 +33,7 @@ spec: name: Publish to Gitea action: publish:gitea input: - repoUrl: gitea.localtest.me:443/?repo=${{parameters.name}} + repoUrl: :443/?repo=${{parameters.name}} description: This is the repository for ${{ parameters.name }} sourcePath: ./skeleton defaultBranch: main diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/organization/guests.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/organization/guests.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/organization/guests.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/organization/guests.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/README.md b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/README.md similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/README.md rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/README.md diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml similarity index 90% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml index 4d9856e..0b11993 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/.github/workflows/maven-build.yml @@ -33,7 +33,7 @@ jobs: #run: ./mvnw spring-boot:build-image # the original image build run: | export CONTAINER_REPO=$(echo {% raw %}${{ env.GITHUB_REPOSITORY }}{% endraw %} | tr '[:upper:]' '[:lower:]') - ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:build -Djib.allowInsecureRegistries=true -Dimage=gitea.localtest.me/${CONTAINER_REPO}:latest -Djib.to.auth.username={% raw %}${{ secrets.PACKAGES_USER }}{% endraw %} -Djib.to.auth.password={% raw %}${{ secrets.PACKAGES_TOKEN }}{% endraw %} -Djib.from.platforms=linux/arm64,linux/amd64 + ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:build -Djib.allowInsecureRegistries=true -Dimage=/${CONTAINER_REPO}:latest -Djib.to.auth.username={% raw %}${{ secrets.PACKAGES_USER }}{% endraw %} -Djib.to.auth.password={% raw %}${{ secrets.PACKAGES_TOKEN }}{% endraw %} -Djib.from.platforms=linux/arm64,linux/amd64 - name: Build image as tar run: | ./mvnw com.google.cloud.tools:jib-maven-plugin:3.4.4:buildTar -Djib.allowInsecureRegistries=true diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml similarity index 91% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml index fc4b30f..ebed830 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/catalog-info.yaml @@ -9,7 +9,7 @@ metadata: backstage.io/kubernetes-label-selector: 'entity-id=${{ values.name }}' backstage.io/kubernetes-namespace: gitea links: - - url: https://gitea.localtest.me:443 + - url: https://:443 title: Repo URL icon: git spec: @@ -26,7 +26,7 @@ metadata: annotations: backstage.io/techdocs-ref: dir:. links: - - url: https://gitea.localtest.me:443 + - url: https://:443 title: Gitea Repo icon: git spec: diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/db.yml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/db.yml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/db.yml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/db.yml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml similarity index 96% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml index 9657ead..5a230da 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/skeleton/k8s/petclinic.yml @@ -28,7 +28,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: ${{ values.namespace }}.localtest.me + - host: ${{ values.namespace }}. http: paths: - backend: @@ -58,7 +58,7 @@ spec: spec: containers: - name: workload - image: gitea.localtest.me/giteaadmin/${{ values.name }} + image: /giteaadmin/${{ values.name }} env: - name: SPRING_PROFILES_ACTIVE value: postgres diff --git a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml similarity index 94% rename from otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml index a49d1d0..356e20c 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/spring-petclinic/template.yaml @@ -50,7 +50,7 @@ spec: name: Publish to Gitea action: publish:gitea input: - repoUrl: gitea.localtest.me:443/?repo=${{parameters.name}} + repoUrl: :443/?repo=${{parameters.name}} description: This is the repository for ${{ parameters.name }} sourcePath: ./ defaultBranch: main @@ -64,7 +64,7 @@ spec: argoInstance: in-cluster projectName: default # necessary until we generate our own cert - repoUrl: https://gitea.localtest.me:443/giteaAdmin/${{parameters.name}} + repoUrl: https://:443/giteaAdmin/${{parameters.name}} path: "k8s" - id: register diff --git a/otc/localtest.me/stacks/ref-implementation/backstage.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage.yaml similarity index 76% rename from otc/localtest.me/stacks/ref-implementation/backstage.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage.yaml index f0f51e1..3a193af 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage.yaml @@ -10,9 +10,9 @@ metadata: spec: project: default source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/ref-implementation/backstage/manifests" + path: "//stacks/ref-implementation/backstage/manifests" destination: server: "https://kubernetes.default.svc" namespace: backstage diff --git a/otc/localtest.me/stacks/ref-implementation/backstage/manifests/argocd-secrets.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage/manifests/argocd-secrets.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/backstage/manifests/argocd-secrets.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage/manifests/argocd-secrets.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/backstage/manifests/install.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage/manifests/install.yaml similarity index 93% rename from otc/localtest.me/stacks/ref-implementation/backstage/manifests/install.yaml rename to otc/localtest.me/work/stacks/ref-implementation/backstage/manifests/install.yaml index 615fcb5..ba1118c 100644 --- a/otc/localtest.me/stacks/ref-implementation/backstage/manifests/install.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/backstage/manifests/install.yaml @@ -70,7 +70,7 @@ data: app-config.yaml: | app: title: CNOE Backstage - baseUrl: https://localtest.me:443 + baseUrl: https://:443 organization: name: CNOE backend: @@ -80,7 +80,7 @@ data: # auth: # keys: # - secret: ${BACKEND_SECRET} - baseUrl: https://localtest.me:443 + baseUrl: https://:443 listen: port: 7007 # Uncomment the following host directive to bind to specific interfaces @@ -90,7 +90,7 @@ data: # Content-Security-Policy directives follow the Helmet format: https://helmetjs.github.io/#reference # Default Helmet Content-Security-Policy values can be removed by setting the key to false cors: - origin: https://localtest.me:443 + origin: https://:443 methods: [GET, HEAD, PATCH, POST, PUT, DELETE] credentials: true database: @@ -106,12 +106,12 @@ data: integrations: gitea: - - baseUrl: https://gitea.localtest.me:443 - host: gitea.localtest.me:443 + - baseUrl: https://:443 + host: :443 username: ${GITEA_USERNAME} password: ${GITEA_PASSWORD} - - baseUrl: https://gitea.localtest.me - host: gitea.localtest.me + - baseUrl: https:// + host: username: ${GITEA_USERNAME} password: ${GITEA_PASSWORD} - baseUrl: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live @@ -167,7 +167,7 @@ data: locations: # Examples from a public GitHub repository. - type: url - target: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live:443/DevFW-CICD/stacks-instances/raw/branch/main/otc/localtest.me/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml + target: https://:443//raw/branch/main///stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml rules: - allow: [Component, System, API, Resource, Location, Template, User, Group] kubernetes: @@ -182,7 +182,7 @@ data: - type: 'config' instances: - name: in-cluster - url: https://localtest.me:443/argocd + url: https://:443/argocd username: admin password: ${ARGOCD_ADMIN_PASSWORD} argoWorkflows: @@ -379,17 +379,17 @@ spec: template: engineVersion: v2 data: - BACKSTAGE_FRONTEND_URL: https://localtest.me:443/backstage + BACKSTAGE_FRONTEND_URL: https://:443/backstage POSTGRES_HOST: postgresql.backstage.svc.cluster.local POSTGRES_PORT: '5432' POSTGRES_DB: backstage POSTGRES_USER: backstage POSTGRES_PASSWORD: "{{.POSTGRES_PASSWORD}}" - ARGO_WORKFLOWS_URL: https://localtest.me:443/argo-workflows - KEYCLOAK_NAME_METADATA: https://localtest.me:443/keycloak/realms/cnoe/.well-known/openid-configuration + ARGO_WORKFLOWS_URL: https://:443/argo-workflows + KEYCLOAK_NAME_METADATA: https://:443/keycloak/realms/cnoe/.well-known/openid-configuration KEYCLOAK_CLIENT_SECRET: "{{.BACKSTAGE_CLIENT_SECRET}}" ARGOCD_AUTH_TOKEN: "argocd.token={{.ARGOCD_SESSION_TOKEN}}" - ARGO_CD_URL: 'https://localtest.me/argocd/api/v1/' + ARGO_CD_URL: 'https:///argocd/api/v1/' data: - secretKey: ARGOCD_SESSION_TOKEN remoteRef: diff --git a/otc/localtest.me/stacks/ref-implementation/codespaces.md b/otc/localtest.me/work/stacks/ref-implementation/codespaces.md similarity index 98% rename from otc/localtest.me/stacks/ref-implementation/codespaces.md rename to otc/localtest.me/work/stacks/ref-implementation/codespaces.md index 4b94dd6..76bc538 100644 --- a/otc/localtest.me/stacks/ref-implementation/codespaces.md +++ b/otc/localtest.me/work/stacks/ref-implementation/codespaces.md @@ -69,5 +69,5 @@ From here on, you can follow the instructions in the [README](./README.md) file. echo https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN} ``` -For example, if you need to access Argo Workflows UI, instead of going to `https://localtest.me:8443/argo`, +For example, if you need to access Argo Workflows UI, instead of going to `https://:8443/argo`, you go to `https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}/argo` diff --git a/otc/localtest.me/stacks/ref-implementation/external-secrets.yaml b/otc/localtest.me/work/stacks/ref-implementation/external-secrets.yaml similarity index 71% rename from otc/localtest.me/stacks/ref-implementation/external-secrets.yaml rename to otc/localtest.me/work/stacks/ref-implementation/external-secrets.yaml index e9fc648..7a30423 100644 --- a/otc/localtest.me/stacks/ref-implementation/external-secrets.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/external-secrets.yaml @@ -12,9 +12,9 @@ spec: namespace: external-secrets server: "https://kubernetes.default.svc" source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/ref-implementation/external-secrets/manifests" + path: "//stacks/ref-implementation/external-secrets/manifests" project: default syncPolicy: automated: diff --git a/otc/localtest.me/stacks/ref-implementation/external-secrets/generate-manifests.sh b/otc/localtest.me/work/stacks/ref-implementation/external-secrets/generate-manifests.sh old mode 100755 new mode 100644 similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/external-secrets/generate-manifests.sh rename to otc/localtest.me/work/stacks/ref-implementation/external-secrets/generate-manifests.sh diff --git a/otc/localtest.me/stacks/ref-implementation/external-secrets/manifests/install.yaml b/otc/localtest.me/work/stacks/ref-implementation/external-secrets/manifests/install.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/external-secrets/manifests/install.yaml rename to otc/localtest.me/work/stacks/ref-implementation/external-secrets/manifests/install.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/external-secrets/manifests/role.yaml b/otc/localtest.me/work/stacks/ref-implementation/external-secrets/manifests/role.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/external-secrets/manifests/role.yaml rename to otc/localtest.me/work/stacks/ref-implementation/external-secrets/manifests/role.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/external-secrets/manifests/rolebinding.yaml b/otc/localtest.me/work/stacks/ref-implementation/external-secrets/manifests/rolebinding.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/external-secrets/manifests/rolebinding.yaml rename to otc/localtest.me/work/stacks/ref-implementation/external-secrets/manifests/rolebinding.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/external-secrets/manifests/secret-store.yaml b/otc/localtest.me/work/stacks/ref-implementation/external-secrets/manifests/secret-store.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/external-secrets/manifests/secret-store.yaml rename to otc/localtest.me/work/stacks/ref-implementation/external-secrets/manifests/secret-store.yaml diff --git a/otc/localtest.me/work/stacks/ref-implementation/external-secrets/values.yaml b/otc/localtest.me/work/stacks/ref-implementation/external-secrets/values.yaml new file mode 100644 index 0000000..e69de29 diff --git a/otc/localtest.me/stacks/ref-implementation/keycloak.yaml b/otc/localtest.me/work/stacks/ref-implementation/keycloak.yaml similarity index 72% rename from otc/localtest.me/stacks/ref-implementation/keycloak.yaml rename to otc/localtest.me/work/stacks/ref-implementation/keycloak.yaml index 11654c4..6f86b36 100644 --- a/otc/localtest.me/stacks/ref-implementation/keycloak.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/keycloak.yaml @@ -12,9 +12,9 @@ spec: namespace: keycloak server: "https://kubernetes.default.svc" source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/ref-implementation/keycloak/manifests" + path: "//stacks/ref-implementation/keycloak/manifests" project: default syncPolicy: automated: diff --git a/otc/localtest.me/stacks/ref-implementation/keycloak/manifests/install.yaml b/otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/install.yaml similarity index 99% rename from otc/localtest.me/stacks/ref-implementation/keycloak/manifests/install.yaml rename to otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/install.yaml index 5680ded..125afb4 100644 --- a/otc/localtest.me/stacks/ref-implementation/keycloak/manifests/install.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/install.yaml @@ -83,7 +83,7 @@ data: proxy=edge # hostname configuration - hostname=localtest.me + hostname= http-relative-path=keycloak # the admin url requires its own configuration to reflect correct url diff --git a/otc/localtest.me/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml similarity index 96% rename from otc/localtest.me/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml rename to otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index 26e30c1..141d1f5 100644 --- a/otc/localtest.me/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml @@ -145,7 +145,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https://localtest.me:443/argo-workflows/oauth2/callback" + "https://:443/argo-workflows/oauth2/callback" ], "webOrigins": [ "/*" @@ -174,7 +174,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https://localtest.me:443/api/auth/keycloak-oidc/handler/frame" + "https://:443/api/auth/keycloak-oidc/handler/frame" ], "webOrigins": [ "/*" @@ -186,15 +186,15 @@ data: "clientId": "grafana", "name": "Grafana Client", "description": "Used for Grafana SSO", - "rootUrl": "https://localtest.me/grafana", - "adminUrl": "https://localtest.me/grafana", - "baseUrl": "https://localtest.me/grafana", + "rootUrl": "https:///grafana", + "adminUrl": "https:///grafana", + "baseUrl": "https:///grafana", "alwaysDisplayInConsole": false, "redirectUris": [ - "http://localtest.me/grafana/*" + "http:///grafana/*" ], "webOrigins": [ - "https://localtest.me/grafana" + "https:///grafana" ], "standardFlowEnabled": true, "implicitFlowEnabled": false, @@ -241,7 +241,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https://localtest.me/*" + "https:///*" ], "webOrigins": [ "/*" @@ -270,7 +270,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https://gitea.localtest.me/*" + "https:///*" ], "webOrigins": [ "/*" @@ -322,8 +322,6 @@ spec: USER1_PASSWORD=$(cat /var/secrets/USER_PASSWORD) - KEYCLOAK_URL=http://keycloak.keycloak.svc.cluster.local:8080/keycloak - KEYCLOAK_TOKEN=$(curl -sS --fail-with-body -X POST -H "Content-Type: application/x-www-form-urlencoded" \ @@ -519,7 +517,7 @@ spec: ARGOCD_PASSWORD=$(./kubectl -n argocd get secret argocd-initial-admin-secret -o go-template='{{.data.password | base64decode }}') - ARGOCD_SESSION_TOKEN=$(curl -sS https://localtest.me/argocd/api/v1/session -H 'Content-Type: application/json' -d "{\"username\":\"admin\",\"password\":\"${ARGOCD_PASSWORD}\"}" | jq -r .token) + ARGOCD_SESSION_TOKEN=$(curl -sS https:///argocd/api/v1/session -H 'Content-Type: application/json' -d "{\"username\":\"admin\",\"password\":\"${ARGOCD_PASSWORD}\"}" | jq -r .token) echo \ "apiVersion: v1 diff --git a/otc/localtest.me/stacks/ref-implementation/keycloak/manifests/secret-gen.yaml b/otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/secret-gen.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/keycloak/manifests/secret-gen.yaml rename to otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/secret-gen.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/mailhog.yaml b/otc/localtest.me/work/stacks/ref-implementation/mailhog.yaml similarity index 74% rename from otc/localtest.me/stacks/ref-implementation/mailhog.yaml rename to otc/localtest.me/work/stacks/ref-implementation/mailhog.yaml index 36ba272..0809dff 100644 --- a/otc/localtest.me/stacks/ref-implementation/mailhog.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/mailhog.yaml @@ -10,9 +10,9 @@ metadata: spec: project: default source: - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/ref-implementation/mailhog" + path: "//stacks/ref-implementation/mailhog" destination: server: "https://kubernetes.default.svc" namespace: mailhog diff --git a/otc/localtest.me/stacks/ref-implementation/mailhog/README.md b/otc/localtest.me/work/stacks/ref-implementation/mailhog/README.md similarity index 92% rename from otc/localtest.me/stacks/ref-implementation/mailhog/README.md rename to otc/localtest.me/work/stacks/ref-implementation/mailhog/README.md index 64a8fba..2df0022 100644 --- a/otc/localtest.me/stacks/ref-implementation/mailhog/README.md +++ b/otc/localtest.me/work/stacks/ref-implementation/mailhog/README.md @@ -19,14 +19,14 @@ spec: ## Ingress -Mailhog offers both WebUi and API at `https://localtest.me/mailhog`. +Mailhog offers both WebUi and API at `https:///mailhog`. The ingress definition is in `stacks/core/ingress-apps/mailhog.yaml` (BTW, why isn't this ingress file here in this folder ??) routing to the mailhog' service ```yaml spec: rules: - - host: localtest.me + - host: http: paths: - backend: diff --git a/otc/localtest.me/stacks/ref-implementation/mailhog/deployment.yaml b/otc/localtest.me/work/stacks/ref-implementation/mailhog/deployment.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/mailhog/deployment.yaml rename to otc/localtest.me/work/stacks/ref-implementation/mailhog/deployment.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/mailhog/service.yaml b/otc/localtest.me/work/stacks/ref-implementation/mailhog/service.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/mailhog/service.yaml rename to otc/localtest.me/work/stacks/ref-implementation/mailhog/service.yaml diff --git a/otc/localtest.me/work/stacks/ref-implementation/metric-server.yaml b/otc/localtest.me/work/stacks/ref-implementation/metric-server.yaml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/otc/localtest.me/work/stacks/ref-implementation/metric-server.yaml @@ -0,0 +1 @@ + diff --git a/otc/localtest.me/stacks/ref-implementation/openbao.yaml b/otc/localtest.me/work/stacks/ref-implementation/openbao.yaml similarity index 68% rename from otc/localtest.me/stacks/ref-implementation/openbao.yaml rename to otc/localtest.me/work/stacks/ref-implementation/openbao.yaml index 261d401..c8992cf 100644 --- a/otc/localtest.me/stacks/ref-implementation/openbao.yaml +++ b/otc/localtest.me/work/stacks/ref-implementation/openbao.yaml @@ -23,13 +23,13 @@ spec: targetRevision: HEAD helm: valueFiles: - - $values/otc/localtest.me/stacks/ref-implementation/openbao/values.yaml - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - $values///stacks/ref-implementation/openbao/values.yaml + - repoURL: https:/// targetRevision: HEAD ref: values - - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances + - repoURL: https:/// targetRevision: HEAD - path: "otc/localtest.me/stacks/ref-implementation/openbao/manifests" + path: "//stacks/ref-implementation/openbao/manifests" ignoreDifferences: - group: admissionregistration.k8s.io kind: MutatingWebhookConfiguration diff --git a/otc/localtest.me/stacks/ref-implementation/openbao/manifests/role.yaml b/otc/localtest.me/work/stacks/ref-implementation/openbao/manifests/role.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/openbao/manifests/role.yaml rename to otc/localtest.me/work/stacks/ref-implementation/openbao/manifests/role.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/openbao/manifests/rolebinding.yaml b/otc/localtest.me/work/stacks/ref-implementation/openbao/manifests/rolebinding.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/openbao/manifests/rolebinding.yaml rename to otc/localtest.me/work/stacks/ref-implementation/openbao/manifests/rolebinding.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/openbao/values.yaml b/otc/localtest.me/work/stacks/ref-implementation/openbao/values.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/openbao/values.yaml rename to otc/localtest.me/work/stacks/ref-implementation/openbao/values.yaml diff --git a/otc/localtest.me/stacks/ref-implementation/replace.sh b/otc/localtest.me/work/stacks/ref-implementation/replace.sh old mode 100755 new mode 100644 similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/replace.sh rename to otc/localtest.me/work/stacks/ref-implementation/replace.sh diff --git a/otc/localtest.me/stacks/ref-implementation/spark-operator.yaml b/otc/localtest.me/work/stacks/ref-implementation/spark-operator.yaml similarity index 100% rename from otc/localtest.me/stacks/ref-implementation/spark-operator.yaml rename to otc/localtest.me/work/stacks/ref-implementation/spark-operator.yaml