diff --git a/home-server/docker-compose.yml b/home-server/docker-compose.yml index 9b2f2c1..289d6fa 100644 --- a/home-server/docker-compose.yml +++ b/home-server/docker-compose.yml @@ -199,24 +199,22 @@ services: networks: - proxy - docker-registry: - image: registry:2 - container_name: docker-registry - restart: unless-stopped - ports: - - "5000:5000" - environment: - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY: /data - REGISTRY_HTTP_TLS_CERTIFICATE: /etc/docker/certs.d/server.alexmickelson.guru/cert.pem - REGISTRY_HTTP_TLS_KEY: /etc/docker/certs.d/server.alexmickelson.guru/key.pem - volumes: - - /data/docker-registry:/data - - /data/swag/keys/letsencrypt/fullchain.pem:/etc/docker/certs.d/server.alexmickelson.guru/cert.pem - - /data/swag/keys/letsencrypt/privkey.pem:/etc/docker/certs.d/server.alexmickelson.guru/key.pem - depends_on: - - reverse-proxy - networks: - - proxy + # docker-registry: + # image: registry:2 + # container_name: docker-registry + # restart: unless-stopped + # ports: + # - "5000:5000" + # environment: + # REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY: /data + # REGISTRY_HTTP_TLS_CERTIFICATE: /etc/docker/certs.d/server.alexmickelson.guru/cert.pem + # REGISTRY_HTTP_TLS_KEY: /etc/docker/certs.d/server.alexmickelson.guru/key.pem + # volumes: + # - /data/docker-registry:/data + # depends_on: + # - reverse-proxy + # networks: + # - proxy # github-actions-exporter: # # ports: # # - 9999:9999 diff --git a/kubernetes/gitea/db.yml b/kubernetes/gitea/db.yml new file mode 100644 index 0000000..bab9849 --- /dev/null +++ b/kubernetes/gitea/db.yml @@ -0,0 +1,52 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + namespace: projects + name: gitea_db +spec: + replicas: 1 + selector: + matchLabels: + app: gitea_db + template: + metadata: + labels: + app: gitea_db + spec: + containers: + - name: postgres + image: postgres:15 + ports: + - containerPort: 5432 + env: + - name: POSTGRES_USER + value: "gitea" + - name: POSTGRES_PASSWORD + value: "${POSTGRES_PASSWORD}" + - name: POSTGRES_DB + value: "gitea" + volumeMounts: + - mountPath: /var/lib/postgresql/data + name: postgres-data + volumes: + - name: postgres-data + hostPath: + path: /data/gitea/postgres + type: DirectoryOrCreate + +--- +apiVersion: v1 +kind: Service +metadata: + name: postgres + namespace: projects + labels: + app: postgres +spec: + ports: + - protocol: TCP + port: 5432 + targetPort: 5432 + selector: + app: postgres + type: ClusterIP diff --git a/kubernetes/gitea/web.yml b/kubernetes/gitea/web.yml new file mode 100644 index 0000000..a5ca92e --- /dev/null +++ b/kubernetes/gitea/web.yml @@ -0,0 +1,83 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: gitea + namespace: projects + labels: + app: gitea +spec: + replicas: 1 + selector: + matchLabels: + app: gitea + template: + metadata: + labels: + app: gitea + spec: + containers: + - name: gitea + image: docker.io/gitea/gitea:1.23.1 + ports: + - containerPort: 3000 + - containerPort: 22 + env: + - name: USER_UID + value: "1000" + - name: USER_GID + value: "1000" + - name: GITEA__database__DB_TYPE + value: "postgres" + - name: GITEA__database__HOST + value: "postgres:5432" + - name: GITEA__database__NAME + value: "gitea" + - name: GITEA__database__USER + value: "gitea" + - name: GITEA__database__PASSWD + valueFrom: + secretKeyRef: + name: gitea-db-secret + key: postgres-password + volumeMounts: + - name: gitea-data + mountPath: /data + - name: timezone + mountPath: /etc/timezone + readOnly: true + - name: localtime + mountPath: /etc/localtime + readOnly: true + volumes: + - name: gitea-data + hostPath: + path: /mnt/data/gitea + type: DirectoryOrCreate + - name: timezone + hostPath: + path: /etc/timezone + - name: localtime + hostPath: + path: /etc/localtime + +--- +apiVersion: v1 +kind: Service +metadata: + name: gitea + namespace: projects + labels: + app: gitea +spec: + type: NodePort + ports: + - name: http + port: 3000 + targetPort: 3000 + nodePort: 32000 + - name: ssh + port: 22 + targetPort: 22 + nodePort: 32222 + selector: + app: gitea diff --git a/nix/alex-desktop.nix b/nix/alex-desktop.nix index 28f076c..257d70c 100644 --- a/nix/alex-desktop.nix +++ b/nix/alex-desktop.nix @@ -89,7 +89,6 @@ tmux libguestfs-with-appliance iperf - nfs-utils ]; services.tailscale.enable = true; services.openssh.enable = true; @@ -165,7 +164,7 @@ device = "/dev/disk/by-uuid/437358fd-b9e4-46e2-bd45-f6b368acaac1"; fsType = "ext4"; }; - boot.supportedFilesystems = [ "zfs" "nfs" ]; + boot.supportedFilesystems = [ "zfs" ]; boot.zfs.forceImportRoot = false; networking.hostId = "eafe9999"; boot.zfs.extraPools = [ "data" "data2" ];