move all RPC files to manifests/ and images/

Author: pinheadmz

.github/workflows/deploy.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Build and push production RPC image
         uses: docker/build-push-action@v5
         with:
-          file: src/templates/rpc/Dockerfile_rpc
+          file: images/rpc/Dockerfile_prod
           platforms: linux/amd64,linux/arm64
           context: .
           push: true
@@ -50,7 +50,7 @@ jobs:
         if: github.ref == 'refs/heads/main'
         uses: docker/build-push-action@v5
         with:
-          file: src/templates/rpc/Dockerfile_rpc_dev
+          file: images/rpc/Dockerfile_dev
           platforms: linux/amd64,linux/arm64
           context: .
           push: true

.github/workflows/test.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Build and export
         uses: docker/build-push-action@v5
         with:
-          file: src/warnet/templates/rpc/Dockerfile_rpc
+          file: images/rpc/Dockerfile_prod
           context: .
           tags: warnet/dev
           cache-from: type=gha
@@ -74,13 +74,13 @@ jobs:
           uv pip install -e .
 
           echo "Contents of warnet-rpc-statefulset-dev.yaml being used:"
-          cat src/warnet/templates/rpc/warnet-rpc-statefulset-dev.yaml
+          cat manifests/warnet-rpc-statefulset-dev.yaml
 
           echo Setting up k8s
-          kubectl apply -f src/warnet/templates/rpc/namespace.yaml
-          kubectl apply -f src/warnet/templates/rpc/rbac-config.yaml
-          kubectl apply -f src/warnet/templates/rpc/warnet-rpc-service.yaml
-          kubectl apply -f src/warnet/templates/rpc/warnet-rpc-statefulset-dev.yaml
+          kubectl apply -f manifests/namespace.yaml
+          kubectl apply -f manifests/rbac-config.yaml
+          kubectl apply -f manifests/warnet-rpc-service.yaml
+          kubectl apply -f manifests/warnet-rpc-statefulset-dev.yaml
           kubectl config set-context --current --namespace=warnet
 
           echo sleeping for 30s to give k8s time to boot

MANIFEST.in

@@ -4,7 +4,6 @@ include src/warnet/templates/fork_observer_config.toml
 include src/warnet/templates/addrman_observer_config.toml
 include src/warnet/templates/addrman.patch
 include src/warnet/templates/isroutable.patch
-graft src/warnet/templates/k8s
-graft src/warnet/templates/rpc
-graft src/warnet/templates/grafana-provisioning
-graft src/warnet/logging_config
+graft images
+graft manifests
+graft scripts

docs/developer-notes.md

@@ -13,9 +13,9 @@ To help with this a helper script is provided: [build-k8s-rpc.sh](../scripts/bui
 This script can be run in the following way:
 
 ```bash
-DOCKER_REGISTRY=bitcoindevproject/warnet-rpc TAG=0.1 ./scripts/build-k8s-rpc.sh Dockerfile_rpc
+DOCKER_REGISTRY=bitcoindevproject/warnet-rpc TAG=0.1 ./scripts/build-k8s-rpc.sh Dockerfile_prod
 ```
 
 You can optionally specify `LATEST=1` to also include the `latest` tag on docker hub.
 
-Once a new image has been pushed, it should be referenced in [warnet-rpc-statefulset.yaml](../src/warnet/templates/warnet-rpc-statefulset.yaml) in the `image` field.
+Once a new image has been pushed, it should be referenced in manifests/warnet-rpc-statefulset.yaml in the `image` field.

docs/running.md

@@ -9,7 +9,7 @@ a file `$XDG_STATE_HOME/warnet/warnet.log`, otherwise it will use `$HOME/.warnet
 
 ## Kubernetes
 
-Deploy the resources in `src/warnet/templates/`, this sets up the correct permissions on the cluster (`rbac-config.yaml`) and deploys the warnet RPC server as a service + statefulset.
+Deploy the resources in `manifests/`, this sets up the correct permissions on the cluster (`rbac-config.yaml`) and deploys the warnet RPC server as a service + statefulset.
 
 This can be done with from inside the `src/warnet/templates/` directory by running:
 

images/bitcoin/Dockerfile

@@ -22,8 +22,8 @@ RUN --mount=type=cache,target=/var/cache/apk \
     sqlite-dev \
     zeromq-dev
 
-COPY images/bitcoin/isroutable.patch /tmp/
-COPY images/bitcoin/addrman.patch /tmp/
+COPY isroutable.patch /tmp/
+COPY addrman.patch /tmp/
 
 
 # Clone and patch and build stage
@@ -77,7 +77,7 @@ RUN --mount=type=cache,target=/var/cache/apk sed -i 's/http\:\/\/dl-cdn.alpineli
     su-exec
 
 COPY --from=build /opt/bitcoin /usr/local
-COPY images/bitcoin/entrypoint.sh /
+COPY entrypoint.sh /
 
 VOLUME ["/home/bitcoin/.bitcoin"]
 EXPOSE 8332 8333 18332 18333 18443 18444 38333 38332

src/warnet/templates/rpc/Dockerfile_rpc_dev renamed to images/rpc/Dockerfile_dev

@@ -20,13 +20,10 @@ EXPOSE 9276
 # we defer this to the entrypoint script for dev mode to enable hot-reloading.
 
 # Copy the entrypoint script into the container
-COPY entrypoint.sh /usr/local/bin/
-
-# Make the entrypoint script executable
-RUN chmod +x /usr/local/bin/entrypoint.sh
+COPY entrypoint.sh /
 
 # Set the entrypoint script to run when the container launches
-ENTRYPOINT ["entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]
 
 # Default command
 CMD ["warnet", "--dev"]