Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \\"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-main-revisions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions base/argo-projects.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions base/mip-infrastructure/mip-infrastructure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion common/datacatalog/datacatalog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion common/nginx-ingress/nginx-ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion common/security/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion common/security/common-templates/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion common/security/federation/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions common/security/netpol.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions common/submariner/submariner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
10 changes: 6 additions & 4 deletions deployments/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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|[email protected]:Medical-Informatics-Platform/mip-deployments.git|https://github.com/NeuroTech-Platform/mip-infra.git|g' base/mip-infrastructure/mip-infrastructure.yaml
sed -i 's|[email protected]:Medical-Informatics-Platform/mip-deployments.git|https://github.com/NeuroTech-Platform/mip-infra.git|g' base/argo-projects.yaml
sed -i 's|[email protected]: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|[email protected]:Medical-Informatics-Platform/mip-deployments.git|https://github.com/NeuroTech-Platform/mip-infra.git|g' deployments/shared-apps/exareme2/exareme2.yaml

sed -i 's|[email protected]: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|[email protected]:Medical-Informatics-Platform/mip-deployments.git|https://github.com/Medical-Informatics-Platform/mip-infra.git|g' base/argo-projects.yaml
sed -i 's|[email protected]: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|[email protected]:Medical-Informatics-Platform/mip-deployments.git|https://github.com/Medical-Informatics-Platform/mip-infra.git|g' deployments/shared-apps/exareme2/exareme2.yaml

sed -i '/[email protected]:NeuroTech-Platform\/mip-deployments.git/d' projects/static/mip-federations/mip-federations.yaml
sed -i '/[email protected]:NeuroTech-Platform\/mip-deployments.git/d' projects/templates/federation/values.yaml

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deployments/shared-apps/exareme2/exareme2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion deployments/shared-apps/mip-stack/mip-stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions projects/mip-infrastructure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ metadata:
spec:
description: Core infrastructure components and ApplicationSets
sourceRepos:
- https://github.com/NeuroTech-Platform/mip-infra.git
- [email protected]:Medical-Informatics-Platform/mip-deployments.git
- https://github.com/Medical-Informatics-Platform/mip-infra.git
- [email protected]:NeuroTech-Platform/mip-deployments.git
destinations:
- namespace: argocd-mip-team
server: https://kubernetes.default.svc
Expand Down
2 changes: 1 addition & 1 deletion projects/static/mip-common/mip-common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion projects/static/mip-federations/mip-federations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- [email protected]:Medical-Informatics-Platform/mip-deployments.git
- https://github.com/madgik/exareme2
- https://github.com/HBPMedical/mip-deployment
Expand Down
2 changes: 1 addition & 1 deletion projects/static/mip-security/mip-security.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- [email protected]:Medical-Informatics-Platform/mip-deployments.git
destinations:
# Allow deployment to federation namespaces for network policies
Expand Down
2 changes: 1 addition & 1 deletion projects/static/mip-shared-apps/mip-shared-apps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion projects/static/submariner/submariner-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion projects/static/submariner/submariner-rbac-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion projects/templates/federation/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
- [email protected]:Medical-Informatics-Platform/mip-deployments.git
- https://github.com/madgik/exareme2
- https://github.com/HBPMedical/mip-deployment
Expand Down