diff --git a/.DS_Store b/.DS_Store index 1cba4f7..ad5287b 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/argocd/repo.yaml b/argocd/repo.yaml index d15db8e..52d80ed 100644 --- a/argocd/repo.yaml +++ b/argocd/repo.yaml @@ -1,13 +1,27 @@ apiVersion: v1 kind: Secret metadata: - name: build-node-gitea + name: build-node-undercloud-infrastructure namespace: argocd labels: argocd.argoproj.io/secret-type: repository type: Opaque stringData: # URL de ton dépôt Git - url: http://build-node.undercloud.local:3000/admin/undercloud-infrastructure.git + url: https://build-node.undercloud.local/Undercloud/undercloud-infrastructure.git # Mets "true" si HTTP clair ou certificat non fiable insecure: "true" +--- +apiVersion: v1 +kind: Secret +metadata: + name: build-node-k8s-apps + namespace: argocd + labels: + argocd.argoproj.io/secret-type: repository +type: Opaque +stringData: + # URL de ton dépôt Git + url: https://build-node.undercloud.local/Undercloud/k8s-apps.git + # Mets "true" si HTTP clair ou certificat non fiable + insecure: "true" \ No newline at end of file diff --git a/terraform/control-plane1.bu b/terraform/control-plane1.bu index 7ffec33..a66a499 100644 --- a/terraform/control-plane1.bu +++ b/terraform/control-plane1.bu @@ -119,22 +119,22 @@ storage: - path: /opt/bin/kubeadm mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" - path: /opt/bin/kubelet mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" - path: /opt/bin/kubectl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" - path: /opt/bin/calicoctl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" - path: /etc/kubernetes/kubeadm-init.yaml mode: 0644 @@ -358,21 +358,21 @@ systemd: ExecStart=/bin/sh -c 'echo "witing 30s..."' ExecStart=/bin/sleep 30s ExecStart=/bin/sh -c 'echo "create calico namespace..."' - ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/calico-config/namespace.yaml + ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/calico-config/namespace.yaml ExecStart=/bin/sh -c 'echo "install tigera operator..."' - ExecStart=-/opt/bin/kubectl create -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/calico-config/operator-crds.yaml - ExecStart=-/opt/bin/kubectl create -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/calico-config/tigera-operator.yaml + ExecStart=-/opt/bin/kubectl create -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/calico-config/operator-crds.yaml + ExecStart=-/opt/bin/kubectl create -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/calico-config/tigera-operator.yaml ExecStart=/bin/sh -c 'echo "witing 60s..."' ExecStart=/bin/sleep 60s ExecStart=/bin/sh -c 'echo "witing for tigera operator... (20mini max)"' ExecStart=/opt/bin/kubectl wait deployment -n tigera-operator tigera-operator --for condition=Available=True --timeout=1200s ExecStart=/bin/sh -c 'echo "create clico custom ressources..."' - ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/calico-config/custom-resources.yaml + ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/calico-config/custom-resources.yaml ExecStart=/bin/sh -c 'echo "witing 3m.."' ExecStart=/bin/sleep 3m #ExecStart=/bin/sh -c 'echo "apply calico (calico-apiserver)..."' - #ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/calico-config/calico.yaml + #ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/calico-config/calico.yaml #ExecStart=/bin/sh -c 'echo "witing 1m..."' #ExecStart=/bin/sleep 2m ExecStart=/bin/sh -c 'echo "witing calico-apiserver... (20mini max)"' @@ -380,11 +380,11 @@ systemd: ExecStart=/bin/sh -c 'echo "witing 120s..."' ExecStart=/bin/sleep 2m ExecStart=/bin/sh -c 'echo "apply calico-peers..."' - ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/calico-config/calico-peer.yaml + ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/calico-config/calico-peer.yaml ExecStart=/bin/sh -c 'echo "witing 60s..."' ExecStart=/bin/sleep 1m ExecStart=/bin/sh -c 'echo "apply calico-ippools..."' - ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/calico-config/ippools.yaml + ExecStart=-/opt/bin/kubectl apply -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/calico-config/ippools.yaml #ExecStart=/bin/sh -c 'echo "witing for whisker.."' #ExecStart=/opt/bin/kubectl wait deployment -n calico-system whisker --for condition=Available=True --timeout=1200s @@ -415,11 +415,11 @@ systemd: ExecStart=/opt/bin/kubectl wait deployment -n kube-system coredns --for condition=Available=True --timeout=600s ExecStart=/bin/sleep 1m - ExecStart=/opt/bin/kubectl apply -n argocd -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/argocd/namespace.yaml - ExecStart=/opt/bin/kubectl apply -n argocd -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/argocd/install.yaml + ExecStart=/opt/bin/kubectl apply -n argocd -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/argocd/namespace.yaml + ExecStart=/opt/bin/kubectl apply -n argocd -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/argocd/install.yaml ExecStart=/opt/bin/kubectl wait deployment -n argocd argocd-server --for condition=Available=True --timeout=600s - ExecStart=/opt/bin/kubectl apply -n argocd -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/argocd/repo.yaml + ExecStart=/opt/bin/kubectl apply -n argocd -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/argocd/repo.yaml #ExecStart=/bin/sleep 10s #ExecStart=/opt/bin/kubectl apply -n argocd -f http://aux-balancer.undercloud.cf:3000/undercloud/k8aux-bootstrap/raw/branch/main/repos/k8aux-bootstrap.yaml @@ -467,9 +467,9 @@ systemd: kubectl -n kube-system delete svc kube-dns --ignore-not-found ; \ kubectl apply -f /etc/kubernetes/addons/kube-dns-fixed-svc.yaml ; \ kubectl -n argocd delete svc argocd-server --ignore-not-found ; \ - kubectl apply -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/argocd/service.yaml ; \ + kubectl apply -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/argocd/service.yaml ; \ kubectl -n calico-system delete svc whisker --ignore-not-found || true ; \ - kubectl create -f http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/calico-config/whisker.yaml || true ; \ + kubectl create -f http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/calico-config/whisker.yaml || true ; \ echo "[pin-service-ips] done." \ ' diff --git a/terraform/control-plane2.bu b/terraform/control-plane2.bu index 44721d1..fbbc1ee 100644 --- a/terraform/control-plane2.bu +++ b/terraform/control-plane2.bu @@ -113,22 +113,22 @@ storage: - path: /opt/bin/kubeadm mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" - path: /opt/bin/kubelet mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" - path: /opt/bin/kubectl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" - path: /opt/bin/calicoctl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" - path: /etc/kubernetes/kubeadm-join.yaml mode: 0644 diff --git a/terraform/control-plane3.bu b/terraform/control-plane3.bu index b731fb0..9b7bd08 100644 --- a/terraform/control-plane3.bu +++ b/terraform/control-plane3.bu @@ -113,22 +113,22 @@ storage: - path: /opt/bin/kubeadm mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" - path: /opt/bin/kubelet mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" - path: /opt/bin/kubectl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" - path: /opt/bin/calicoctl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" - path: /etc/kubernetes/kubeadm-join.yaml mode: 0644 diff --git a/terraform/worker1.bu b/terraform/worker1.bu index 1328aaf..2be4a86 100644 --- a/terraform/worker1.bu +++ b/terraform/worker1.bu @@ -113,22 +113,22 @@ storage: - path: /opt/bin/kubeadm mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" - path: /opt/bin/kubelet mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" - path: /opt/bin/kubectl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" - path: /opt/bin/calicoctl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" - path: /etc/kubernetes/kubeadm-join.yaml mode: 0644 diff --git a/terraform/worker2.bu b/terraform/worker2.bu index e90aec4..dd760e4 100644 --- a/terraform/worker2.bu +++ b/terraform/worker2.bu @@ -113,22 +113,22 @@ storage: - path: /opt/bin/kubeadm mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" - path: /opt/bin/kubelet mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" - path: /opt/bin/kubectl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" - path: /opt/bin/calicoctl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" - path: /etc/kubernetes/kubeadm-join.yaml mode: 0644 diff --git a/terraform/worker3.bu b/terraform/worker3.bu index 78c9d78..9074cc4 100644 --- a/terraform/worker3.bu +++ b/terraform/worker3.bu @@ -113,22 +113,22 @@ storage: - path: /opt/bin/kubeadm mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubeadm" - path: /opt/bin/kubelet mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubelet" - path: /opt/bin/kubectl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/kubectl" - path: /opt/bin/calicoctl mode: 0755 contents: - source: "http://build-node.undercloud.local:3000/admin/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" + source: "http://build-node.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/calicoctl" - path: /etc/kubernetes/kubeadm-join.yaml mode: 0644