diff --git a/otc/localtest.me/work/edfbuilder.yaml b/otc/localtest.me/work/edfbuilder.yaml index 35b60ac..43afeb8 100644 --- a/otc/localtest.me/work/edfbuilder.yaml +++ b/otc/localtest.me/work/edfbuilder.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "//registry" - repoURL: "https:///" + path: "otc/localtest.me/registry" + repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/work/registry/core.yaml b/otc/localtest.me/work/registry/core.yaml index 0816b79..2506439 100644 --- a/otc/localtest.me/work/registry/core.yaml +++ b/otc/localtest.me/work/registry/core.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "//stacks/core" - repoURL: "https:///" + path: "otc/localtest.me/stacks/core" + repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/work/registry/forgejo.yaml b/otc/localtest.me/work/registry/forgejo.yaml index 593e86f..8fcb981 100644 --- a/otc/localtest.me/work/registry/forgejo.yaml +++ b/otc/localtest.me/work/registry/forgejo.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "//stacks/forgejo" - repoURL: "https:///" + path: "otc/localtest.me/stacks/forgejo" + repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/work/registry/local-backup.yaml b/otc/localtest.me/work/registry/local-backup.yaml index e356084..a146995 100644 --- a/otc/localtest.me/work/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: "//stacks/local-backup" - repoURL: "https:///" + path: "otc/localtest.me/stacks/local-backup" + repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/work/registry/observability-client.yaml b/otc/localtest.me/work/registry/observability-client.yaml index d097d04..74a6912 100644 --- a/otc/localtest.me/work/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: "//stacks/observability-client" - repoURL: "https:///" + path: "otc/localtest.me/stacks/observability-client" + repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/work/registry/observability.yaml b/otc/localtest.me/work/registry/observability.yaml index fdfd4dc..0b092a2 100644 --- a/otc/localtest.me/work/registry/observability.yaml +++ b/otc/localtest.me/work/registry/observability.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "//stacks/observability" - repoURL: "https:///" + path: "otc/localtest.me/stacks/observability" + repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/work/registry/otc.yaml b/otc/localtest.me/work/registry/otc.yaml index 29ed300..bf1f966 100644 --- a/otc/localtest.me/work/registry/otc.yaml +++ b/otc/localtest.me/work/registry/otc.yaml @@ -12,8 +12,8 @@ spec: name: in-cluster namespace: argocd source: - path: "//stacks/otc" - repoURL: "https:///" + path: "otc/localtest.me/stacks/otc" + repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/work/registry/ref-implementation.yaml b/otc/localtest.me/work/registry/ref-implementation.yaml index c4602b0..079e0b7 100644 --- a/otc/localtest.me/work/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: "//stacks/ref-implementation" - repoURL: "https:///" + path: "otc/localtest.me/stacks/ref-implementation" + repoURL: "https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances" targetRevision: HEAD project: default syncPolicy: diff --git a/otc/localtest.me/work/stacks/core/argocd.yaml b/otc/localtest.me/work/stacks/core/argocd.yaml index 251bfb1..6c190a9 100644 --- a/otc/localtest.me/work/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///stacks/core/argocd/values.yaml - - repoURL: https:/// + - $values/otc/localtest.me/stacks/core/argocd/values.yaml + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD ref: values - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/core/argocd/manifests" \ No newline at end of file + path: "otc/localtest.me/stacks/core/argocd/manifests" \ No newline at end of file diff --git a/otc/localtest.me/work/stacks/core/argocd/manifests/argocd-server-ingress.yaml b/otc/localtest.me/work/stacks/core/argocd/manifests/argocd-server-ingress.yaml index 54abc78..e193381 100644 --- a/otc/localtest.me/work/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: + - host: argocd.localtest.me 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/work/stacks/core/argocd/values.yaml b/otc/localtest.me/work/stacks/core/argocd/values.yaml index d01deec..0c6ae59 100644 --- a/otc/localtest.me/work/stacks/core/argocd/values.yaml +++ b/otc/localtest.me/work/stacks/core/argocd/values.yaml @@ -1,5 +1,5 @@ global: - domain: + domain: argocd.localtest.me configs: params: @@ -19,7 +19,7 @@ configs: clusters: - "*" accounts.provider-argocd: apiKey - url: https:// + url: https://argocd.localtest.me rbac: policy.csv: 'g, provider-argocd, role:admin' diff --git a/otc/localtest.me/work/stacks/forgejo/forgejo-runner.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-runner.yaml index 37b344e..923a6c1 100644 --- a/otc/localtest.me/work/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:/// + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/forgejo/forgejo-runner" + path: "otc/localtest.me/stacks/forgejo/forgejo-runner" diff --git a/otc/localtest.me/work/stacks/forgejo/forgejo-runner/dind-docker.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-runner/dind-docker.yaml index 8a7e521..10a7feb 100644 --- a/otc/localtest.me/work/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:// + value: https://gitea.localtest.me volumeMounts: - name: runner-data mountPath: /data diff --git a/otc/localtest.me/work/stacks/forgejo/forgejo-server.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-server.yaml index a795663..03239ef 100644 --- a/otc/localtest.me/work/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///stacks/forgejo/forgejo-server/values.yaml - - repoURL: https:/// + - $values/otc/localtest.me/stacks/forgejo/forgejo-server/values.yaml + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD ref: values - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/forgejo/forgejo-server/manifests" \ No newline at end of file + path: "otc/localtest.me/stacks/forgejo/forgejo-server/manifests" \ No newline at end of file diff --git a/otc/localtest.me/work/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-server/manifests/forgejo-ingress.yaml index 4f5f29a..1dc0b7c 100644 --- a/otc/localtest.me/work/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: + - host: gitea.localtest.me 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/work/stacks/forgejo/forgejo-server/values.yaml b/otc/localtest.me/work/stacks/forgejo/forgejo-server/values.yaml index e333b7e..f06e015 100644 --- a/otc/localtest.me/work/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: + everest.io/crypt-key-id: test: enabled: false @@ -136,8 +136,8 @@ gitea: SSL_MODE: verify-ca server: - DOMAIN: '' - ROOT_URL: 'https://:443' + DOMAIN: 'gitea.localtest.me' + ROOT_URL: 'https://gitea.localtest.me:443' mailer: ENABLED: true diff --git a/otc/localtest.me/work/stacks/local-backup/minio.yaml b/otc/localtest.me/work/stacks/local-backup/minio.yaml index 6f678a6..cc0b8f8 100644 --- a/otc/localtest.me/work/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///stacks/local-backup/minio/helm/values.yaml + - $values/otc/localtest.me/stacks/local-backup/minio/helm/values.yaml chart: minio - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD ref: values - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/local-backup/minio/manifests" + path: "otc/localtest.me/stacks/local-backup/minio/manifests" destination: server: "https://kubernetes.default.svc" namespace: minio-backup diff --git a/otc/localtest.me/work/stacks/local-backup/velero.yaml b/otc/localtest.me/work/stacks/local-backup/velero.yaml index 832c7c7..59ef22f 100644 --- a/otc/localtest.me/work/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///stacks/local-backup/velero/helm/values.yaml + - $values/otc/localtest.me/stacks/local-backup/velero/helm/values.yaml chart: velero - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD ref: values destination: diff --git a/otc/localtest.me/work/stacks/observability-client/metrics-server.yaml b/otc/localtest.me/work/stacks/observability-client/metrics-server.yaml index d32fad6..cb78746 100644 --- a/otc/localtest.me/work/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///stacks/observability-client/metrics-server/values.yaml - - repoURL: https:/// + - $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 targetRevision: HEAD ref: values diff --git a/otc/localtest.me/work/stacks/observability-client/vector.yaml b/otc/localtest.me/work/stacks/observability-client/vector.yaml index 36dde20..a289adb 100644 --- a/otc/localtest.me/work/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///stacks/observability-client/vector/values.yaml - - repoURL: https:/// + - $values/otc/localtest.me/stacks/observability-client/vector/values.yaml + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD ref: values diff --git a/otc/localtest.me/work/stacks/observability-client/vm-client-stack.yaml b/otc/localtest.me/work/stacks/observability-client/vm-client-stack.yaml index 78ed3d5..f96110d 100644 --- a/otc/localtest.me/work/stacks/observability-client/vm-client-stack.yaml +++ b/otc/localtest.me/work/stacks/observability-client/vm-client-stack.yaml @@ -21,10 +21,10 @@ spec: targetRevision: 0.48.1 helm: valueFiles: - - $values///stacks/observability-client/vm-client-stack/values.yaml - - repoURL: https:/// + - $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 targetRevision: HEAD ref: values - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/observability-client/vm-client-stack/manifests" + path: "otc/localtest.me/stacks/observability-client/vm-client-stack/manifests" diff --git a/otc/localtest.me/work/stacks/observability-client/vm-client-stack/values.yaml b/otc/localtest.me/work/stacks/observability-client/vm-client-stack/values.yaml index f8b2a45..d1ad14b 100644 --- a/otc/localtest.me/work/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. + host: o12y.localtest.me tlsHosts: - - o12y. + - o12y.localtest.me tlsSecretName: vmauth-tls-secret unauthorizedUserAccessSpec: {} selectAllByDefault: true diff --git a/otc/localtest.me/work/stacks/observability/grafana-operator.yaml b/otc/localtest.me/work/stacks/observability/grafana-operator.yaml index ea759a2..9b143c7 100644 --- a/otc/localtest.me/work/stacks/observability/grafana-operator.yaml +++ b/otc/localtest.me/work/stacks/observability/grafana-operator.yaml @@ -20,6 +20,6 @@ spec: - chart: grafana-operator repoURL: ghcr.io/grafana/helm-charts targetRevision: v5.18.0 - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/observability/grafana-operator/manifests" + path: "otc/localtest.me/stacks/observability/grafana-operator/manifests" 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 index 4dd0271..3208fa6 100644 --- a/otc/localtest.me/work/stacks/observability/grafana-operator/manifests/grafana.yaml +++ b/otc/localtest.me/work/stacks/observability/grafana-operator/manifests/grafana.yaml @@ -20,7 +20,7 @@ spec: spec: ingressClassName: nginx rules: - - host: o12y. + - host: o12y.gitea.localtest.me http: paths: - backend: @@ -32,5 +32,5 @@ spec: pathType: Prefix tls: - hosts: - - o12y. + - o12y.gitea.localtest.me secretName: grafana-net-tls diff --git a/otc/localtest.me/work/stacks/observability/victoria-k8s-stack.yaml b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack.yaml index c1bd5de..1dbf931 100644 --- a/otc/localtest.me/work/stacks/observability/victoria-k8s-stack.yaml +++ b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack.yaml @@ -22,10 +22,10 @@ spec: targetRevision: 0.48.1 helm: valueFiles: - - $values///stacks/observability/victoria-k8s-stack/values.yaml - - repoURL: https:/// + - $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 targetRevision: HEAD ref: values - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/observability/victoria-k8s-stack/manifests" + path: "otc/localtest.me/stacks/observability/victoria-k8s-stack/manifests" diff --git a/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml index 81a4329..4de3222 100644 --- a/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml +++ b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/manifests/vlogs.yaml @@ -8,7 +8,7 @@ spec: removePvcAfterDelete: true storageMetadata: annotations: - everest.io/crypt-key-id: + everest.io/crypt-key-id: storage: accessModes: - ReadWriteOnce diff --git a/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/values.yaml b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/values.yaml index 79bc53f..ab7e3ac 100644 --- a/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/values.yaml +++ b/otc/localtest.me/work/stacks/observability/victoria-k8s-stack/values.yaml @@ -288,7 +288,7 @@ vmsingle: extraArgs: {} storageMetadata: annotations: - everest.io/crypt-key-id: + everest.io/crypt-key-id: storage: accessModes: - ReadWriteOnce diff --git a/otc/localtest.me/work/stacks/otc/cert-manger.yaml b/otc/localtest.me/work/stacks/otc/cert-manger.yaml index 90bd1af..0f56e27 100644 --- a/otc/localtest.me/work/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///stacks/otc/cert-manager/values.yaml - - repoURL: https:/// + - $values/otc/localtest.me/stacks/otc/cert-manager/values.yaml + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD ref: values - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/otc/cert-manager/manifests" + path: "otc/localtest.me/stacks/otc/cert-manager/manifests" diff --git a/otc/localtest.me/work/stacks/otc/ingress-nginx.yaml b/otc/localtest.me/work/stacks/otc/ingress-nginx.yaml index f753213..73dd275 100644 --- a/otc/localtest.me/work/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///stacks/otc/ingress-nginx/values.yaml - - repoURL: https:/// + - $values/otc/localtest.me/stacks/otc/ingress-nginx/values.yaml + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD ref: values diff --git a/otc/localtest.me/work/stacks/otc/storageclass.yaml b/otc/localtest.me/work/stacks/otc/storageclass.yaml index b3004c8..790daf4 100644 --- a/otc/localtest.me/work/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:/// + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/otc/storageclass" + path: "otc/localtest.me/stacks/otc/storageclass" project: default syncPolicy: automated: diff --git a/otc/localtest.me/work/stacks/ref-implementation/README.md b/otc/localtest.me/work/stacks/ref-implementation/README.md index 4efd3fc..2738b48 100644 --- a/otc/localtest.me/work/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://: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://localtest.me: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://:8443/argocd -- Argo Workflows: https://:8443/argo-workflows -- Backstage: https://:8443/ -- Gitea: https://:8443/gitea -- Keycloak: https://:8443/keycloak/admin/master/console/ +- 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/ # Using it -For this example, we will walk through a few demonstrations. Once applications are ready, go to the [backstage URL](https://:8443). +For this example, we will walk through a few demonstrations. Once applications are ready, go to the [backstage URL](https://localtest.me: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://:8443/keycloak/admin/master/console/). +1. Go to the [Keycloak UI](https://localtest.me: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://: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. +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. 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/work/stacks/ref-implementation/argo-workflows.yaml b/otc/localtest.me/work/stacks/ref-implementation/argo-workflows.yaml index 619d4a2..e43a168 100644 --- a/otc/localtest.me/work/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:/// + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/ref-implementation/argo-workflows/manifests/dev" + path: "otc/localtest.me/stacks/ref-implementation/argo-workflows/manifests/dev" destination: server: "https://kubernetes.default.svc" namespace: argo diff --git a/otc/localtest.me/work/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 index 758293a..0b9e607 100644 --- a/otc/localtest.me/work/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:///keycloak/realms/cnoe + issuer: https://localtest.me/keycloak/realms/cnoe clientId: name: keycloak-oidc key: client-id clientSecret: name: keycloak-oidc key: secret-key - redirectUrl: https://:443/argo-workflows/oauth2/callback + redirectUrl: https://localtest.me:443/argo-workflows/oauth2/callback rbac: enabled: true scopes: diff --git a/otc/localtest.me/work/stacks/ref-implementation/backstage-templates.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates.yaml index c9b9ad3..f74e084 100644 --- a/otc/localtest.me/work/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:/// + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/ref-implementation/backstage-templates/entities" + path: "otc/localtest.me/stacks/ref-implementation/backstage-templates/entities" directory: exclude: "catalog-info.yaml" destination: diff --git a/otc/localtest.me/work/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 index 38b093f..9786188 100644 --- a/otc/localtest.me/work/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://:443 + - url: https://gitea.localtest.me:443 title: Repo URL icon: github spec: diff --git a/otc/localtest.me/work/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 index 25345a0..e1015c8 100644 --- a/otc/localtest.me/work/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: :443/?repo=${{parameters.name}} + repoUrl: gitea.localtest.me: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://:443/giteaAdmin/${{parameters.name}} + repoUrl: https://gitea.localtest.me:443/giteaAdmin/${{parameters.name}} path: "kustomize/base" - id: register name: Register diff --git a/otc/localtest.me/work/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 index b28ef1d..80fa323 100644 --- a/otc/localtest.me/work/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://:443 + - url: https://gitea.localtest.me:443 title: Repo URL icon: github spec: diff --git a/otc/localtest.me/work/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 index afbabbf..eb727f4 100644 --- a/otc/localtest.me/work/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: :443/?repo=${{parameters.name}} + repoUrl: gitea.localtest.me: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://:443/giteaAdmin/${{parameters.name}} + repoUrl: https://gitea.localtest.me:443/giteaAdmin/${{parameters.name}} path: "manifests" - id: register name: Register diff --git a/otc/localtest.me/work/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 index ba9c755..a3e9703 100644 --- a/otc/localtest.me/work/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://:443 + - url: https://gitea.localtest.me:443 title: Repo URL icon: github spec: diff --git a/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage-templates/entities/basic/template.yaml index 7120774..e5d9ec7 100644 --- a/otc/localtest.me/work/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: :443/?repo=${{parameters.name}} + repoUrl: gitea.localtest.me: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://:443/giteaAdmin/${{parameters.name}} + repoUrl: https://gitea.localtest.me:443/giteaAdmin/${{parameters.name}} path: "manifests" - id: register name: Register diff --git a/otc/localtest.me/work/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 index 521c435..68ac3f9 100644 --- a/otc/localtest.me/work/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://:443 + - url: https://gitea.localtest.me:443 title: Repo URL icon: git spec: @@ -26,7 +26,7 @@ metadata: annotations: backstage.io/techdocs-ref: dir:. links: - - url: https://:443 + - url: https://gitea.localtest.me:443 title: Gitea Repo icon: git spec: diff --git a/otc/localtest.me/work/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 index 4652b83..dcd0892 100644 --- a/otc/localtest.me/work/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: :443/?repo=${{parameters.name}} + repoUrl: gitea.localtest.me:443/?repo=${{parameters.name}} description: This is the repository for ${{ parameters.name }} sourcePath: ./skeleton defaultBranch: main diff --git a/otc/localtest.me/work/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 index 0b11993..4d9856e 100644 --- a/otc/localtest.me/work/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=/${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=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 - 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/work/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 index ebed830..fc4b30f 100644 --- a/otc/localtest.me/work/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://:443 + - url: https://gitea.localtest.me:443 title: Repo URL icon: git spec: @@ -26,7 +26,7 @@ metadata: annotations: backstage.io/techdocs-ref: dir:. links: - - url: https://:443 + - url: https://gitea.localtest.me:443 title: Gitea Repo icon: git spec: diff --git a/otc/localtest.me/work/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 index 5a230da..9657ead 100644 --- a/otc/localtest.me/work/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 }}. + - host: ${{ values.namespace }}.localtest.me http: paths: - backend: @@ -58,7 +58,7 @@ spec: spec: containers: - name: workload - image: /giteaadmin/${{ values.name }} + image: gitea.localtest.me/giteaadmin/${{ values.name }} env: - name: SPRING_PROFILES_ACTIVE value: postgres diff --git a/otc/localtest.me/work/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 index 356e20c..a49d1d0 100644 --- a/otc/localtest.me/work/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: :443/?repo=${{parameters.name}} + repoUrl: gitea.localtest.me: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://:443/giteaAdmin/${{parameters.name}} + repoUrl: https://gitea.localtest.me:443/giteaAdmin/${{parameters.name}} path: "k8s" - id: register diff --git a/otc/localtest.me/work/stacks/ref-implementation/backstage.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage.yaml index 3a193af..f0f51e1 100644 --- a/otc/localtest.me/work/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:/// + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/ref-implementation/backstage/manifests" + path: "otc/localtest.me/stacks/ref-implementation/backstage/manifests" destination: server: "https://kubernetes.default.svc" namespace: backstage diff --git a/otc/localtest.me/work/stacks/ref-implementation/backstage/manifests/install.yaml b/otc/localtest.me/work/stacks/ref-implementation/backstage/manifests/install.yaml index ba1118c..615fcb5 100644 --- a/otc/localtest.me/work/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://:443 + baseUrl: https://localtest.me:443 organization: name: CNOE backend: @@ -80,7 +80,7 @@ data: # auth: # keys: # - secret: ${BACKEND_SECRET} - baseUrl: https://:443 + baseUrl: https://localtest.me: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://:443 + origin: https://localtest.me:443 methods: [GET, HEAD, PATCH, POST, PUT, DELETE] credentials: true database: @@ -106,12 +106,12 @@ data: integrations: gitea: - - baseUrl: https://:443 - host: :443 + - baseUrl: https://gitea.localtest.me:443 + host: gitea.localtest.me:443 username: ${GITEA_USERNAME} password: ${GITEA_PASSWORD} - - baseUrl: https:// - host: + - baseUrl: https://gitea.localtest.me + host: gitea.localtest.me 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://:443//raw/branch/main///stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml + 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 rules: - allow: [Component, System, API, Resource, Location, Template, User, Group] kubernetes: @@ -182,7 +182,7 @@ data: - type: 'config' instances: - name: in-cluster - url: https://:443/argocd + url: https://localtest.me:443/argocd username: admin password: ${ARGOCD_ADMIN_PASSWORD} argoWorkflows: @@ -379,17 +379,17 @@ spec: template: engineVersion: v2 data: - BACKSTAGE_FRONTEND_URL: https://:443/backstage + BACKSTAGE_FRONTEND_URL: https://localtest.me: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://:443/argo-workflows - KEYCLOAK_NAME_METADATA: https://:443/keycloak/realms/cnoe/.well-known/openid-configuration + ARGO_WORKFLOWS_URL: https://localtest.me:443/argo-workflows + KEYCLOAK_NAME_METADATA: https://localtest.me: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:///argocd/api/v1/' + ARGO_CD_URL: 'https://localtest.me/argocd/api/v1/' data: - secretKey: ARGOCD_SESSION_TOKEN remoteRef: diff --git a/otc/localtest.me/work/stacks/ref-implementation/codespaces.md b/otc/localtest.me/work/stacks/ref-implementation/codespaces.md index 76bc538..4b94dd6 100644 --- a/otc/localtest.me/work/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://:8443/argo`, +For example, if you need to access Argo Workflows UI, instead of going to `https://localtest.me:8443/argo`, you go to `https://${CODESPACE_NAME}-8080.${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN}/argo` diff --git a/otc/localtest.me/work/stacks/ref-implementation/external-secrets.yaml b/otc/localtest.me/work/stacks/ref-implementation/external-secrets.yaml index 7a30423..e9fc648 100644 --- a/otc/localtest.me/work/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:/// + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/ref-implementation/external-secrets/manifests" + path: "otc/localtest.me/stacks/ref-implementation/external-secrets/manifests" project: default syncPolicy: automated: diff --git a/otc/localtest.me/work/stacks/ref-implementation/keycloak.yaml b/otc/localtest.me/work/stacks/ref-implementation/keycloak.yaml index 6f86b36..11654c4 100644 --- a/otc/localtest.me/work/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:/// + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/ref-implementation/keycloak/manifests" + path: "otc/localtest.me/stacks/ref-implementation/keycloak/manifests" project: default syncPolicy: automated: diff --git a/otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/install.yaml b/otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/install.yaml index 125afb4..5680ded 100644 --- a/otc/localtest.me/work/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= + hostname=localtest.me http-relative-path=keycloak # the admin url requires its own configuration to reflect correct url diff --git a/otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/otc/localtest.me/work/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml index 141d1f5..43299f5 100644 --- a/otc/localtest.me/work/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://:443/argo-workflows/oauth2/callback" + "https://localtest.me:443/argo-workflows/oauth2/callback" ], "webOrigins": [ "/*" @@ -174,7 +174,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https://:443/api/auth/keycloak-oidc/handler/frame" + "https://localtest.me: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:///grafana", - "adminUrl": "https:///grafana", - "baseUrl": "https:///grafana", + "rootUrl": "https://localtest.me/grafana", + "adminUrl": "https://localtest.me/grafana", + "baseUrl": "https://localtest.me/grafana", "alwaysDisplayInConsole": false, "redirectUris": [ - "http:///grafana/*" + "http://localtest.me/grafana/*" ], "webOrigins": [ - "https:///grafana" + "https://localtest.me/grafana" ], "standardFlowEnabled": true, "implicitFlowEnabled": false, @@ -241,7 +241,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https:///*" + "https://localtest.me/*" ], "webOrigins": [ "/*" @@ -270,7 +270,7 @@ data: "rootUrl": "", "baseUrl": "", "redirectUris": [ - "https:///*" + "https://gitea.localtest.me/*" ], "webOrigins": [ "/*" @@ -517,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:///argocd/api/v1/session -H 'Content-Type: application/json' -d "{\"username\":\"admin\",\"password\":\"${ARGOCD_PASSWORD}\"}" | jq -r .token) + 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) echo \ "apiVersion: v1 diff --git a/otc/localtest.me/work/stacks/ref-implementation/mailhog.yaml b/otc/localtest.me/work/stacks/ref-implementation/mailhog.yaml index 0809dff..36ba272 100644 --- a/otc/localtest.me/work/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:/// + repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/ref-implementation/mailhog" + path: "otc/localtest.me/stacks/ref-implementation/mailhog" destination: server: "https://kubernetes.default.svc" namespace: mailhog diff --git a/otc/localtest.me/work/stacks/ref-implementation/mailhog/README.md b/otc/localtest.me/work/stacks/ref-implementation/mailhog/README.md index 2df0022..64a8fba 100644 --- a/otc/localtest.me/work/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:///mailhog`. +Mailhog offers both WebUi and API at `https://localtest.me/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: + - host: localtest.me http: paths: - backend: diff --git a/otc/localtest.me/work/stacks/ref-implementation/openbao.yaml b/otc/localtest.me/work/stacks/ref-implementation/openbao.yaml index c8992cf..261d401 100644 --- a/otc/localtest.me/work/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///stacks/ref-implementation/openbao/values.yaml - - repoURL: https:/// + - $values/otc/localtest.me/stacks/ref-implementation/openbao/values.yaml + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD ref: values - - repoURL: https:/// + - repoURL: https://forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/DevFW-CICD/stacks-instances targetRevision: HEAD - path: "//stacks/ref-implementation/openbao/manifests" + path: "otc/localtest.me/stacks/ref-implementation/openbao/manifests" ignoreDifferences: - group: admissionregistration.k8s.io kind: MutatingWebhookConfiguration