From ef7f4ed92f184a63abe010fa16f3fd064f2e4709 Mon Sep 17 00:00:00 2001 From: Adam ABICHOU <55128590+adamab48@users.noreply.github.com> Date: Wed, 30 Apr 2025 06:47:08 +0000 Subject: [PATCH 1/4] add multiarch --- .github/workflows/docker-image.yml | 18 +++++++++++++----- bin/kube-diagrams.yaml | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index d3a053f..0f7a4e1 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -17,18 +17,26 @@ jobs: docker: runs-on: ubuntu-latest steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Login to Docker Hub uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - name: Build and push uses: docker/build-push-action@v6 with: - push: true - tags: philippemerle/kubediagrams:latest + context: . + platforms: linux/amd64,linux/arm64 + push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} + tags: adamab/kubediagrams:latest \ No newline at end of file diff --git a/bin/kube-diagrams.yaml b/bin/kube-diagrams.yaml index d1b2da2..ea17adc 100644 --- a/bin/kube-diagrams.yaml +++ b/bin/kube-diagrams.yaml @@ -1,4 +1,4 @@ -# Configuration of kube-diagrams +# Configuration of kube-diagrams # TODO REVERT CHANGE default_namespace: default edges: REFERENCE: From 8cb6537239ad2967ebdb559704144077b12a2bb4 Mon Sep 17 00:00:00 2001 From: Adam ABICHOU <55128590+adamab48@users.noreply.github.com> Date: Wed, 30 Apr 2025 06:49:31 +0000 Subject: [PATCH 2/4] test --- bin/kube-diagrams.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/kube-diagrams.yaml b/bin/kube-diagrams.yaml index ea17adc..0157939 100644 --- a/bin/kube-diagrams.yaml +++ b/bin/kube-diagrams.yaml @@ -1,4 +1,4 @@ -# Configuration of kube-diagrams # TODO REVERT CHANGE +# Configuration of kube-diagrams # TODO REVERT CHANGE & default_namespace: default edges: REFERENCE: From 391273e4b0dcf32f5f5af8697d4b15308fff4d3f Mon Sep 17 00:00:00 2001 From: Adam ABICHOU <55128590+adamab48@users.noreply.github.com> Date: Wed, 30 Apr 2025 06:56:43 +0000 Subject: [PATCH 3/4] cleanup --- .github/workflows/docker-image.yml | 2 +- bin/kube-diagrams.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 0f7a4e1..1ff8191 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -39,4 +39,4 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} - tags: adamab/kubediagrams:latest \ No newline at end of file + tags: philippemerle/kubediagrams:latest \ No newline at end of file diff --git a/bin/kube-diagrams.yaml b/bin/kube-diagrams.yaml index 0157939..d1b2da2 100644 --- a/bin/kube-diagrams.yaml +++ b/bin/kube-diagrams.yaml @@ -1,4 +1,4 @@ -# Configuration of kube-diagrams # TODO REVERT CHANGE & +# Configuration of kube-diagrams default_namespace: default edges: REFERENCE: From 63794be9cb093b969854a5c13ca54bff942ed425 Mon Sep 17 00:00:00 2001 From: Matt Field Date: Thu, 1 May 2025 11:32:59 +0100 Subject: [PATCH 4/4] Flake updates for 0.3.0 and {aarch64-}darwin support --- flake.nix | 51 +++++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/flake.nix b/flake.nix index a4aafe9..321998e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,15 +6,19 @@ flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: - let + outputs = { + self, + nixpkgs, + flake-utils, + }: + flake-utils.lib.eachDefaultSystem ( + system: let pkgs = nixpkgs.legacyPackages.${system}; - pythonEnv = pkgs.python312.withPackages (ps: [ ps.pyyaml ps.diagrams ]); + pythonEnv = pkgs.python312.withPackages (ps: [ps.pyyaml ps.diagrams]); - kube-diagrams = pkgs.stdenv.mkDerivation rec { + kube-diagrams = pkgs.stdenv.mkDerivation { pname = "kube-diagrams"; - version = "0.2.0"; + version = "0.3.0"; src = self; postPatch = '' substituteInPlace bin/kube-diagrams \ @@ -27,31 +31,34 @@ ''; }; - runtimeEnv = with pkgs; [ - busybox - cacert - graphviz - kubernetes-helm - kube-diagrams - pythonEnv - ]; + runtimeEnv = with pkgs; + [ + cacert + graphviz + kubernetes-helm + kube-diagrams + pythonEnv + ] + ++ lib.optionals pkgs.stdenv.isLinux [busybox]; in { devShells.default = pkgs.mkShell { - packages = with pkgs; [ - git - lazygit - nodePackages.prettier - ] ++ runtimeEnv; + packages = with pkgs; + [ + git + lazygit + nodePackages.prettier + ] + ++ runtimeEnv; }; packages = { default = kube-diagrams; kube-diagrams = kube-diagrams; - docker = pkgs.dockerTools.buildLayeredImage { + docker = pkgs.dockerTools.buildImage { name = "ghcr.io/philippemerle/kubediagrams"; tag = "latest"; - contents = runtimeEnv; - created = "now"; + copyToRoot = runtimeEnv; + created = builtins.substring 0 8 self.lastModifiedDate; }; }; }