commit

2025-09-01 21:13:20 +02:00
parent 23ef2ce590
commit 666088c80d
24 changed files with 822 additions and 180 deletions
--- a/gitea/db.yaml
+++ b/gitea/db.yaml
@@ -1,32 +1,3 @@
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: db
-# Change "rook-ceph" provisioner prefix to match the operator namespace if needed
-provisioner: rook-ceph.cephfs.csi.ceph.com
-parameters:
-  # clusterID is the namespace where the rook cluster is running
-  # If you change this namespace, also change the namespace below where the secret namespaces are defined
-  clusterID: rook-ceph
-
-  # CephFS filesystem name into which the volume shall be created
-  fsName: gitea
-
-  # Ceph pool into which the volume shall be created
-  # Required for provisionVolume: "true"
-  pool: gitea-replicated
-
-  # The secrets contain Ceph admin credentials. These are generated automatically by the operator
-  # in the same namespace as the cluster.
-  csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner
-  csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
-  csi.storage.k8s.io/controller-expand-secret-name: rook-csi-cephfs-provisioner
-  csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph
-  csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node
-  csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph
-
-reclaimPolicy: Delete
---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -38,7 +9,7 @@ spec:
  resources:
    requests:
      storage: 16Gi
-  storageClassName: db
+  storageClassName: cephfs-hyper
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -129,35 +100,6 @@ spec:
  sessionAffinity: None
  type: ClusterIP
 ---
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: db-backup
-# Change "rook-ceph" provisioner prefix to match the operator namespace if needed
-provisioner: rook-ceph.cephfs.csi.ceph.com
-parameters:
-  # clusterID is the namespace where the rook cluster is running
-  # If you change this namespace, also change the namespace below where the secret namespaces are defined
-  clusterID: rook-ceph
-
-  # CephFS filesystem name into which the volume shall be created
-  fsName: gitea
-
-  # Ceph pool into which the volume shall be created
-  # Required for provisionVolume: "true"
-  pool: gitea-replicated
-
-  # The secrets contain Ceph admin credentials. These are generated automatically by the operator
-  # in the same namespace as the cluster.
-  csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner
-  csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
-  csi.storage.k8s.io/controller-expand-secret-name: rook-csi-cephfs-provisioner
-  csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph
-  csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node
-  csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph
-
-reclaimPolicy: Delete
---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -169,7 +111,7 @@ spec:
  resources:
    requests:
      storage: 10Gi
-  storageClassName: db-backup
+  storageClassName: cephfs-hyper
 ---
 apiVersion: apps/v1
 kind: Deployment
--- a/gitea/filesystem.yaml
+++ b/gitea/filesystem.yaml
@@ -1,42 +0,0 @@
-apiVersion: ceph.rook.io/v1
-kind: CephFilesystem
-metadata:
-  name: gitea
-  namespace: rook-ceph
-spec:
-  metadataPool:
-    failureDomain: host
-    replicated:
-      size: 3
-  dataPools:
-    - name: replicated
-      failureDomain: host
-      replicated:
-        size: 3
-  preserveFilesystemOnDelete: false
-  metadataServer:
-    activeCount: 1
-    activeStandby: true
-    placement:
-    #  nodeAffinity:
-    #    requiredDuringSchedulingIgnoredDuringExecution:
-    #      nodeSelectorTerms:
-    #      - matchExpressions:
-    #        - key: role
-    #          operator: In
-    #          values:
-    #          - mds-node
-      tolerations:
-      - key: node-role.kubernetes.io/storage-node
-        operator: Exists
-        effect: NoSchedule
-    #  podAffinity:
-    #  podAntiAffinity:
-    #  topologySpreadConstraints:
-    #resources:
-    #  limits:
-    #    cpu: "80m"
-    #    memory: "1024Mi"
-    #  requests:
-    #    cpu: "500m"
-    #    memory: "1024Mi"
--- a/gitea/gitea.yaml
+++ b/gitea/gitea.yaml
@@ -27,7 +27,7 @@ data:
    DOMAIN           = localhost
    SSH_DOMAIN       = localhost
    HTTP_PORT        = 3000
-    ROOT_URL         = https://gitea.undercloud.cf/
+    ROOT_URL         = https://gitea.apps.undercloud.dev/
    DISABLE_SSH      = false
    SSH_PORT         = 22
    SSH_LISTEN_PORT  = 22
@@ -127,14 +127,14 @@ data:
      echo $ARGOCD_PW
      su git -c 'echo $ARGOCD_PW' 
      su git -c 'SHODAN_PW=`cat /data/shodan.pw` && gitea admin user create --username shodan --admin --password $SHODAN_PW --email thrawn235@gmail.com'
-      su git -c 'ARGOCD_PW=`cat /data/argocd.pw` && gitea admin user create --username argocd --password $ARGOCD_PW --email argocd@undercloud.cf --must-change-password=false'
-      su git -c 'GITEA_PW=`cat /data/gitea.pw` && gitea admin auth add-ldap --name ldap --security-protocol StartTLS --host ldap.undercloud.cf. --port 389 --user-search-base "ou=users,dc=undercloud,dc=cf" --user-filter "(&(objectClass=person)(uid=%s))" --admin-filter "(&(memberOf=cn=gitea-admins,ou=groups,dc=undercloud,dc=cf))" --email-attribute mail --avatar-attribute jpegPhoto --synchronize-users --skip-tls-verify --username-attribute uid --bind-dn "cn=gitea,ou=serviceaccounts,ou=users,dc=undercloud,dc=cf" --bind-password $GITEA_PW --attributes-in-bind --firstname-attribute cn --surname-attribute sn'
+      su git -c 'ARGOCD_PW=`cat /data/argocd.pw` && gitea admin user create --username argocd --password $ARGOCD_PW --email argocd@undercloud.local --must-change-password=false'
+      su git -c 'GITEA_PW=`cat /data/gitea.pw` && gitea admin auth add-ldap --name ldap --security-protocol StartTLS --host ldap.undercloud.local. --port 389 --user-search-base "ou=users,dc=undercloud,dc=cf" --user-filter "(&(objectClass=person)(uid=%s))" --admin-filter "(&(memberOf=cn=gitea-admins,ou=groups,dc=undercloud,dc=cf))" --email-attribute mail --avatar-attribute jpegPhoto --synchronize-users --skip-tls-verify --username-attribute uid --bind-dn "cn=gitea,ou=serviceaccounts,ou=users,dc=undercloud,dc=cf" --bind-password $GITEA_PW --attributes-in-bind --firstname-attribute cn --surname-attribute sn'

      sleep 30s
      echo "wget tea..."
-      wget http://aux-balancer.undercloud.cf.:3000/undercloud/kube-binaries/raw/branch/main/tea
+      wget https://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/tea
      echo "wget ctea..."
-      wget http://aux-balancer.undercloud.cf.:3000/undercloud/kube-binaries/raw/branch/main/ctea
+      wget https://git.undercloud.local:3000/Undercloud/undercloud-infrastructure/raw/branch/main/k8s-binaries/ctea
      chmod +x tea
      chmod +x ctea
      #echo "using tea to create login..."
@@ -152,7 +152,7 @@ data:
      ./ctea --username shodan --password $SHODAN_PW --url http://localhost:3000 AddUserToTeam undercloud undercloud argocd
      sleep 5s
      echo "cloning k8aux-apps"
-      execline-cd /data git clone http://aux-balancer.undercloud.cf.:3000/undercloud/k8aux-apps.git
+      execline-cd /data git clone http://git.undercloud.local:3000/undercloud/k8aux-apps.git
      execline-cd /data/k8aux-apps rm -Rf .git
      execline-cd /data/k8aux-apps git init
      execline-cd /data/k8aux-apps git config --global user.email "thrawn235@gmail.com"
@@ -174,35 +174,6 @@ data:
    echo "startup done."
    #exit 123
 ---
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: gitea
-# Change "rook-ceph" provisioner prefix to match the operator namespace if needed
-provisioner: rook-ceph.cephfs.csi.ceph.com
-parameters:
-  # clusterID is the namespace where the rook cluster is running
-  # If you change this namespace, also change the namespace below where the secret namespaces are defined
-  clusterID: rook-ceph
-
-  # CephFS filesystem name into which the volume shall be created
-  fsName: gitea
-
-  # Ceph pool into which the volume shall be created
-  # Required for provisionVolume: "true"
-  pool: gitea-replicated
-
-  # The secrets contain Ceph admin credentials. These are generated automatically by the operator
-  # in the same namespace as the cluster.
-  csi.storage.k8s.io/provisioner-secret-name: rook-csi-cephfs-provisioner
-  csi.storage.k8s.io/provisioner-secret-namespace: rook-ceph
-  csi.storage.k8s.io/controller-expand-secret-name: rook-csi-cephfs-provisioner
-  csi.storage.k8s.io/controller-expand-secret-namespace: rook-ceph
-  csi.storage.k8s.io/node-stage-secret-name: rook-csi-cephfs-node
-  csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph
-
-reclaimPolicy: Delete
---
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -214,7 +185,7 @@ spec:
  resources:
    requests:
      storage: 32Gi
-  storageClassName: gitea
+  storageClassName: cephfs-hyper
 ---
 apiVersion: apps/v1
 kind: Deployment
--- a/gitea/ingress.yaml
+++ b/gitea/ingress.yaml
@@ -10,10 +10,10 @@ metadata:
 spec:
  tls:
  - hosts:
-    - gitea.undercloud.cf
+    - gitea.apps.undercloud.dev
    secretName: gitea-tls
  rules:
-  - host: gitea.undercloud.cf
+  - host: gitea.apps.undercloud.dev
    http:
      paths:
      - path: /