diff --git a/.githooks/pre-commit b/.githooks/pre-commit index eda4da7..b0507e4 100644 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -54,7 +54,7 @@ check_file_content() { CONTEXT=$(echo "$FILE_CONTENT" | sed -n "${START_LINE},${END_LINE}p") # Only flag if associated with our repo - if echo "$CONTEXT" | grep -q "repoURL:.*NeuroTech-Platform/mip-infra"; then + if echo "$CONTEXT" | grep -q "repoURL:.*Medical-Informatics-Platform/mip-infra"; then if [[ -n "$TARGET_REVISION_ISSUES" ]]; then TARGET_REVISION_ISSUES+=$'\n' fi @@ -147,7 +147,7 @@ if [[ "$ERROR_FOUND" -ne 0 ]]; then echo "Deployment command for branch '$CURRENT_BRANCH' (after ensuring files are correct):" SAFE_BRANCH_NAME=$(echo "$CURRENT_BRANCH" | sed 's/[^a-zA-Z0-9]/-/g') echo " argocd app create ${SAFE_BRANCH_NAME}-infra-clusterset \\" - echo " --repo https://github.com/NeuroTech-Platform/mip-infra.git \\" + echo " --repo https://github.com/Medical-Informatics-Platform/mip-infra.git \\" echo " --path base/mip-infrastructure \\" echo " --revision $CURRENT_BRANCH \\" echo " --dest-server https://kubernetes.default.svc \\" diff --git a/.github/workflows/check-main-revisions.yml b/.github/workflows/check-main-revisions.yml index d7ab08b..5716e46 100644 --- a/.github/workflows/check-main-revisions.yml +++ b/.github/workflows/check-main-revisions.yml @@ -48,7 +48,7 @@ jobs: done # Only add to problems if the closest repoURL is our repo - if echo "$REPO_LINE" | grep -q "NeuroTech-Platform/mip-infra"; then + if echo "$REPO_LINE" | grep -q "Medical-Informatics-Platform/mip-infra"; then TARGET_REVISION_PROBLEMS+="$LINE"$'\n' fi done <<< "$TARGET_REVISIONS" diff --git a/README.md b/README.md index 2b399f5..91c81ed 100644 --- a/README.md +++ b/README.md @@ -303,7 +303,7 @@ chmod +x scripts/gen_secrets.sh ```bash # Clone the repository -git clone https://github.com/NeuroTech-Platform/mip-infra.git +git clone https://github.com/Medical-Informatics-Platform/mip-infra.git cd mip-infra # Checkout the desired branch (main for production, or your feature branch) @@ -337,7 +337,7 @@ CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) SAFE_BRANCH_NAME=$(echo "$CURRENT_BRANCH" | sed 's/[^a-zA-Z0-9]/-/g') argocd app create ${SAFE_BRANCH_NAME}-argo-projects \ - --repo https://github.com/NeuroTech-Platform/mip-infra.git \ + --repo https://github.com/Medical-Informatics-Platform/mip-infra.git \ --path base \ --revision $CURRENT_BRANCH \ --dest-server https://kubernetes.default.svc \ @@ -360,7 +360,7 @@ kubectl get appprojects -n argocd-mip-team # Create the infrastructure application using Argo CD CLI argocd app create ${SAFE_BRANCH_NAME}-infra-clusterset \ - --repo https://github.com/NeuroTech-Platform/mip-infra.git \ + --repo https://github.com/Medical-Informatics-Platform/mip-infra.git \ --path base/mip-infrastructure \ --revision $CURRENT_BRANCH \ --project mip-argo-project-infrastructure \ @@ -447,7 +447,7 @@ SAFE_BRANCH_NAME=$(echo "$CURRENT_BRANCH" | sed 's/[^a-zA-Z0-9]/-/g') # Create and sync the Argo CD application for your branch argocd app create ${SAFE_BRANCH_NAME}-infra-clusterset \ - --repo https://github.com/NeuroTech-Platform/mip-infra.git \ + --repo https://github.com/Medical-Informatics-Platform/mip-infra.git \ --path base/mip-infrastructure \ --revision $CURRENT_BRANCH \ --project mip-argo-project-infrastructure \ diff --git a/base/argo-projects.yaml b/base/argo-projects.yaml index 406a558..5947cf0 100644 --- a/base/argo-projects.yaml +++ b/base/argo-projects.yaml @@ -35,7 +35,7 @@ spec: spec: project: mip-argo-project-infrastructure source: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: projects/static/{{ .fileName }} destination: @@ -78,7 +78,7 @@ spec: spec: project: mip-argo-project-infrastructure source: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: projects/templates/federation helm: diff --git a/base/mip-infrastructure/mip-infrastructure.yaml b/base/mip-infrastructure/mip-infrastructure.yaml index 2941290..610ec86 100644 --- a/base/mip-infrastructure/mip-infrastructure.yaml +++ b/base/mip-infrastructure/mip-infrastructure.yaml @@ -29,7 +29,7 @@ spec: - matrix: generators: - git: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git revision: main directories: # Cluster-wide applications (not for use for the federations, use deployments/shared-apps instead and not declared here) @@ -42,7 +42,7 @@ spec: - cluster: https://kubernetes.default.svc namespace: argocd-mip-team clusterName: default - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git goTemplate: true # for | lower template: metadata: diff --git a/common/datacatalog/datacatalog.yaml b/common/datacatalog/datacatalog.yaml index 0908150..92b7a16 100644 --- a/common/datacatalog/datacatalog.yaml +++ b/common/datacatalog/datacatalog.yaml @@ -13,7 +13,7 @@ spec: path: kubernetes helm: valueFiles: [values.yaml, $values/common/datacatalog/values.yaml] - - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + - repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main ref: values destination: diff --git a/common/nginx-ingress/nginx-ingress.yaml b/common/nginx-ingress/nginx-ingress.yaml index 0dae106..750e44e 100644 --- a/common/nginx-ingress/nginx-ingress.yaml +++ b/common/nginx-ingress/nginx-ingress.yaml @@ -8,7 +8,7 @@ metadata: spec: project: mip-argo-project-common source: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: common/nginx-ingress/manifests destination: diff --git a/common/security/Chart.yaml b/common/security/Chart.yaml index 9d7bfb7..e0ea40a 100644 --- a/common/security/Chart.yaml +++ b/common/security/Chart.yaml @@ -6,6 +6,6 @@ type: application version: 1.0.0 appVersion: 1.0.0 keywords: [security, networkpolicy, isolation] -sources: [https://github.com/NeuroTech-Platform/mip-infra] +sources: [https://github.com/Medical-Informatics-Platform/mip-infra] maintainers: - name: MIP Team diff --git a/common/security/common-templates/Chart.yaml b/common/security/common-templates/Chart.yaml index 9448457..c55b6d8 100644 --- a/common/security/common-templates/Chart.yaml +++ b/common/security/common-templates/Chart.yaml @@ -6,6 +6,6 @@ type: application version: 1.0.0 appVersion: 1.0.0 keywords: [security, networkpolicy, common, isolation] -sources: [https://github.com/NeuroTech-Platform/mip-infra] +sources: [https://github.com/Medical-Informatics-Platform/mip-infra] maintainers: - name: MIP Team diff --git a/common/security/federation/Chart.yaml b/common/security/federation/Chart.yaml index 91820e6..9663bde 100644 --- a/common/security/federation/Chart.yaml +++ b/common/security/federation/Chart.yaml @@ -6,6 +6,6 @@ type: application version: 1.0.0 appVersion: 1.0.0 keywords: [security, networkpolicy, federation, isolation] -sources: [https://github.com/NeuroTech-Platform/mip-infra] +sources: [https://github.com/Medical-Informatics-Platform/mip-infra] maintainers: - name: MIP Team diff --git a/common/security/netpol.yaml b/common/security/netpol.yaml index 7540c77..c895af1 100644 --- a/common/security/netpol.yaml +++ b/common/security/netpol.yaml @@ -40,7 +40,7 @@ spec: spec: project: mip-argo-project-security source: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: common/security/federation helm: @@ -93,7 +93,7 @@ spec: spec: project: mip-argo-project-security source: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: common/security/common-templates helm: diff --git a/common/submariner/submariner.yaml b/common/submariner/submariner.yaml index 4ae6abc..12bcc3d 100644 --- a/common/submariner/submariner.yaml +++ b/common/submariner/submariner.yaml @@ -11,7 +11,7 @@ metadata: spec: project: mip-argo-project-submariner sources: - - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + - repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: common/submariner/broker destination: @@ -35,7 +35,7 @@ metadata: spec: project: mip-argo-project-submariner sources: - - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + - repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: common/submariner/operator destination: diff --git a/deployments/README.md b/deployments/README.md index 327a2d5..cabffa4 100644 --- a/deployments/README.md +++ b/deployments/README.md @@ -14,10 +14,12 @@ However, you must run the following commands from the root directory of this rep cd mip-infra # Switch any private git URLs to the public repo -sed -i 's|git@github.com:Medical-Informatics-Platform/mip-deployments.git|https://github.com/NeuroTech-Platform/mip-infra.git|g' base/mip-infrastructure/mip-infrastructure.yaml -sed -i 's|git@github.com:Medical-Informatics-Platform/mip-deployments.git|https://github.com/NeuroTech-Platform/mip-infra.git|g' base/argo-projects.yaml -sed -i 's|git@github.com:Medical-Informatics-Platform/mip-deployments.git|https://github.com/NeuroTech-Platform/mip-infra.git|g' deployments/shared-apps/mip-stack/mip-stack.yaml -sed -i 's|git@github.com:Medical-Informatics-Platform/mip-deployments.git|https://github.com/NeuroTech-Platform/mip-infra.git|g' deployments/shared-apps/exareme2/exareme2.yaml + +sed -i 's|git@github.com:Medical-Informatics-Platform/mip-deployments.git|https://github.com/Medical-Informatics-Platform/mip-infra.git|g' base/mip-infrastructure/mip-infrastructure.yaml +sed -i 's|git@github.com:Medical-Informatics-Platform/mip-deployments.git|https://github.com/Medical-Informatics-Platform/mip-infra.git|g' base/argo-projects.yaml +sed -i 's|git@github.com:Medical-Informatics-Platform/mip-deployments.git|https://github.com/Medical-Informatics-Platform/mip-infra.git|g' deployments/shared-apps/mip-stack/mip-stack.yaml +sed -i 's|git@github.com:Medical-Informatics-Platform/mip-deployments.git|https://github.com/Medical-Informatics-Platform/mip-infra.git|g' deployments/shared-apps/exareme2/exareme2.yaml + sed -i '/git@github.com:NeuroTech-Platform\/mip-deployments.git/d' projects/static/mip-federations/mip-federations.yaml sed -i '/git@github.com:NeuroTech-Platform\/mip-deployments.git/d' projects/templates/federation/values.yaml diff --git a/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/exareme2-kustomize.yaml b/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/exareme2-kustomize.yaml index 8993d13..4595cf5 100644 --- a/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/exareme2-kustomize.yaml +++ b/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/exareme2-kustomize.yaml @@ -18,7 +18,7 @@ spec: - values.yaml - $values/deployments/shared-apps/exareme2/values.yaml - $values/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/exareme2-values.yaml - - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + - repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main ref: values syncPolicy: diff --git a/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/mip-stack-kustomize.yaml b/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/mip-stack-kustomize.yaml index d00d137..8fdb982 100644 --- a/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/mip-stack-kustomize.yaml +++ b/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/mip-stack-kustomize.yaml @@ -30,7 +30,7 @@ spec: - values.yaml - $values/deployments/shared-apps/mip-stack/values.yaml - $values/deployments/hybrid/federations/federation-Z/mip-infrastructure/customizations/mip-stack-values.yaml - - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + - repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main ref: values syncPolicy: diff --git a/deployments/hybrid/federations/federation-Z/mip-infrastructure/federation-z.yaml b/deployments/hybrid/federations/federation-Z/mip-infrastructure/federation-z.yaml index e562c71..5621c6a 100644 --- a/deployments/hybrid/federations/federation-Z/mip-infrastructure/federation-z.yaml +++ b/deployments/hybrid/federations/federation-Z/mip-infrastructure/federation-z.yaml @@ -11,7 +11,7 @@ metadata: spec: project: mip-argo-project-federations source: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: deployments/hybrid/federations/federation-Z destination: diff --git a/deployments/hybrid/federations/federation-Z/mip-infrastructure/network-policies.yaml b/deployments/hybrid/federations/federation-Z/mip-infrastructure/network-policies.yaml index 48f28a1..81950ca 100644 --- a/deployments/hybrid/federations/federation-Z/mip-infrastructure/network-policies.yaml +++ b/deployments/hybrid/federations/federation-Z/mip-infrastructure/network-policies.yaml @@ -8,7 +8,7 @@ metadata: spec: project: mip-argo-project-federation-z source: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: deployments/hybrid/federations/federation-Z/mip-infrastructure/submariner-policies/ destination: diff --git a/deployments/local/federations/federation-A/customizations/exareme2-overlay-app.yaml b/deployments/local/federations/federation-A/customizations/exareme2-overlay-app.yaml index d27948a..7435ec5 100644 --- a/deployments/local/federations/federation-A/customizations/exareme2-overlay-app.yaml +++ b/deployments/local/federations/federation-A/customizations/exareme2-overlay-app.yaml @@ -18,7 +18,7 @@ spec: server: https://kubernetes.default.svc namespace: federation-a source: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: deployments/local/federations/federation-A/customizations/overlays/exareme2 syncPolicy: diff --git a/deployments/local/federations/federation-A/federation-a.yaml b/deployments/local/federations/federation-A/federation-a.yaml index ff3f3bb..297ec7d 100644 --- a/deployments/local/federations/federation-A/federation-a.yaml +++ b/deployments/local/federations/federation-A/federation-a.yaml @@ -7,7 +7,7 @@ metadata: spec: project: mip-argo-project-federations source: - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main path: deployments/local/federations/federation-A destination: diff --git a/deployments/shared-apps/exareme2/exareme2.yaml b/deployments/shared-apps/exareme2/exareme2.yaml index c202068..96aa51a 100644 --- a/deployments/shared-apps/exareme2/exareme2.yaml +++ b/deployments/shared-apps/exareme2/exareme2.yaml @@ -17,7 +17,7 @@ spec: valueFiles: - values.yaml - $values/deployments/shared-apps/exareme2/values.yaml - - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + - repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main ref: values destination: diff --git a/deployments/shared-apps/mip-stack/mip-stack.yaml b/deployments/shared-apps/mip-stack/mip-stack.yaml index 583a194..4f140f2 100644 --- a/deployments/shared-apps/mip-stack/mip-stack.yaml +++ b/deployments/shared-apps/mip-stack/mip-stack.yaml @@ -18,7 +18,7 @@ spec: valueFiles: - values.yaml - $values/deployments/shared-apps/mip-stack/values.yaml - - repoURL: https://github.com/NeuroTech-Platform/mip-infra.git + - repoURL: https://github.com/Medical-Informatics-Platform/mip-infra.git targetRevision: main ref: values destination: diff --git a/projects/mip-infrastructure.yaml b/projects/mip-infrastructure.yaml index 79a6c23..23b0d97 100644 --- a/projects/mip-infrastructure.yaml +++ b/projects/mip-infrastructure.yaml @@ -7,8 +7,8 @@ metadata: spec: description: Core infrastructure components and ApplicationSets sourceRepos: - - https://github.com/NeuroTech-Platform/mip-infra.git - - git@github.com:Medical-Informatics-Platform/mip-deployments.git + - https://github.com/Medical-Informatics-Platform/mip-infra.git + - git@github.com:NeuroTech-Platform/mip-deployments.git destinations: - namespace: argocd-mip-team server: https://kubernetes.default.svc diff --git a/projects/static/mip-common/mip-common.yaml b/projects/static/mip-common/mip-common.yaml index 33b4af2..c96bc00 100644 --- a/projects/static/mip-common/mip-common.yaml +++ b/projects/static/mip-common/mip-common.yaml @@ -7,7 +7,7 @@ metadata: spec: description: Common resources like monitoring, security, and datacatalog sourceRepos: - - https://github.com/NeuroTech-Platform/mip-infra.git + - https://github.com/Medical-Informatics-Platform/mip-infra.git - https://github.com/madgik/datacatalog - https://prometheus-community.github.io/helm-charts - https://grafana.github.io/helm-charts diff --git a/projects/static/mip-federations/mip-federations.yaml b/projects/static/mip-federations/mip-federations.yaml index af25457..1d79826 100644 --- a/projects/static/mip-federations/mip-federations.yaml +++ b/projects/static/mip-federations/mip-federations.yaml @@ -7,7 +7,7 @@ metadata: spec: description: Federation-specific applications and configurations sourceRepos: - - https://github.com/NeuroTech-Platform/mip-infra.git + - https://github.com/Medical-Informatics-Platform/mip-infra.git - git@github.com:Medical-Informatics-Platform/mip-deployments.git - https://github.com/madgik/exareme2 - https://github.com/HBPMedical/mip-deployment diff --git a/projects/static/mip-security/mip-security.yaml b/projects/static/mip-security/mip-security.yaml index 1a587fa..68ff85f 100644 --- a/projects/static/mip-security/mip-security.yaml +++ b/projects/static/mip-security/mip-security.yaml @@ -7,7 +7,7 @@ metadata: spec: description: Network security policies and isolation controls for MIP infrastructure sourceRepos: - - https://github.com/NeuroTech-Platform/mip-infra.git + - https://github.com/Medical-Informatics-Platform/mip-infra.git - git@github.com:Medical-Informatics-Platform/mip-deployments.git destinations: # Allow deployment to federation namespaces for network policies diff --git a/projects/static/mip-shared-apps/mip-shared-apps.yaml b/projects/static/mip-shared-apps/mip-shared-apps.yaml index d23e583..274d3c5 100644 --- a/projects/static/mip-shared-apps/mip-shared-apps.yaml +++ b/projects/static/mip-shared-apps/mip-shared-apps.yaml @@ -7,7 +7,7 @@ metadata: spec: description: Shared applications like exareme2 and mip-stack sourceRepos: - - https://github.com/NeuroTech-Platform/mip-infra.git + - https://github.com/Medical-Informatics-Platform/mip-infra.git - https://github.com/madgik/exareme2 - https://github.com/HBPMedical/mip-deployment destinations: diff --git a/projects/static/submariner/submariner-project.yaml b/projects/static/submariner/submariner-project.yaml index 4116963..3cd39cd 100644 --- a/projects/static/submariner/submariner-project.yaml +++ b/projects/static/submariner/submariner-project.yaml @@ -8,7 +8,7 @@ metadata: spec: description: Project for Submariner deployment sourceRepos: - - https://github.com/NeuroTech-Platform/mip-infra.git + - https://github.com/Medical-Informatics-Platform/mip-infra.git - https://submariner-io.github.io/submariner-charts/charts destinations: - namespace: submariner-k8s-broker diff --git a/projects/static/submariner/submariner-rbac-project.yaml b/projects/static/submariner/submariner-rbac-project.yaml index f8cad9a..ad195de 100644 --- a/projects/static/submariner/submariner-rbac-project.yaml +++ b/projects/static/submariner/submariner-rbac-project.yaml @@ -6,7 +6,8 @@ metadata: namespace: argocd-mip-team spec: description: Privileged project for Submariner RBAC resources - sourceRepos: [https://github.com/NeuroTech-Platform/mip-infra.git] + sourceRepos: + - https://github.com/Medical-Informatics-Platform/mip-infra.git destinations: - namespace: submariner-k8s-broker server: https://kubernetes.default.svc diff --git a/projects/templates/federation/values.yaml b/projects/templates/federation/values.yaml index 4ad14ee..7f679a9 100644 --- a/projects/templates/federation/values.yaml +++ b/projects/templates/federation/values.yaml @@ -2,7 +2,7 @@ federationName: federation-a # This will be overridden by ApplicationSet # Default repositories that all federations can use sourceRepos: - - https://github.com/NeuroTech-Platform/mip-infra.git + - https://github.com/Medical-Informatics-Platform/mip-infra.git - git@github.com:Medical-Informatics-Platform/mip-deployments.git - https://github.com/madgik/exareme2 - https://github.com/HBPMedical/mip-deployment