diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 2f2bb258f..55265b0a8 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -151,18 +151,6 @@ jobs: fail_on_error: true reporter: github-pr-review - lint-dockerfile: - runs-on: ubuntu-22.04 - steps: - - name: Check out code - uses: actions/checkout@v4 - - - name: actionlint - uses: reviewdog/action-hadolint@v1 - with: - fail_on_error: true - reporter: github-pr-review - pre-commit: runs-on: ubuntu-22.04 defaults: @@ -254,7 +242,7 @@ jobs: devbox run -- \ kind load docker-image \ --name chart-testing \ - "$(devbox run -- gojq -r '.[] | select(.type == "Docker Image" and .goos == "linux" and .goarch == "amd64").name' dist/artifacts.json)" + "ko.local/capi-runtime-extensions:$(devbox run -- gojq -r .version dist/metadata.json)" - if: steps.list-changed.outputs.changed == 'true' name: Setup Cluster API and cert-manager @@ -270,7 +258,7 @@ jobs: devbox run -- \ ct install \ --config charts/ct-config.yaml \ - --helm-extra-set-args "--set=image.tag=$(devbox run -- jq -r .version dist/metadata.json)" + --helm-extra-set-args "--set-string image.repository=ko.local/capi-runtime-extensions --set-string image.tag=$(devbox run -- gojq -r .version dist/metadata.json)" env: KUBECONFIG: ct-kind-kubeconfig diff --git a/.goreleaser.yml b/.goreleaser.yml index 3538a15ed..f9c559b06 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -49,58 +49,47 @@ builds: - arm64 mod_timestamp: '{{ .CommitTimestamp }}' hooks: - post: - - cmd: make SKIP_UPX={{ if index .Env "SKIP_UPX" }}{{ .Env.SKIP_UPX }}{{ else }}{{ .IsSnapshot }}{{ end }} GOOS={{ .Os }} GOARCH={{ .Arch }} UPX_TARGET={{ .Path }} upx + post: | + sh -ec 'if [ {{ .IsSnapshot }} == true ] && [ {{ .Runtime.Goarch }} == {{ .Arch }} ]; then + env GOOS=linux GOARCH={{ .Arch }} \ + SOURCE_DATE_EPOCH=$(date +%s) \ + KO_DOCKER_REPO=ko.local/capi-runtime-extensions \ + ko build \ + --bare \ + -t {{ .Version }} \ + ./cmd + fi' archives: - name_template: '{{ .ProjectName }}_v{{trimprefix .Version "v"}}_{{ .Os }}_{{ .Arch }}' rlcp: true builds: - capi-runtime-extensions -dockers: - - image_templates: - # Specify the image tag including `-amd64` suffix if the build is not a snapshot build or is not being built on - # arm64 machine. This allows for using the snapshot image build without the architecture specific suffix - # consistently on local machines, i.e. can always use `ghcr.io/d2iq-labs/capi-runtime-extensions:v` on the machine the snapshot - # is built on. - # - # For a release build the `-amd64` suffix will always be included and the `docker_manifests` specification below - # will create the final multiplatform manifest to be pushed to the registry. - - ghcr.io/d2iq-labs/{{.ProjectName}}:v{{trimprefix .Version "v"}}{{ if or (not .IsSnapshot) (not (eq .Runtime.Goarch "amd64")) }}-amd64{{ end }} - use: buildx - dockerfile: Dockerfile - build_flag_templates: - - "--platform=linux/amd64" - - "--pull" - - "--label=org.opencontainers.image.created={{.Date}}" - - "--label=org.opencontainers.image.title={{.ProjectName}}" - - "--label=org.opencontainers.image.revision={{.FullCommit}}" - - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=org.opencontainers.image.source={{.GitURL}}" - - image_templates: - # Specify the image tag including `-amd64v8` suffix if the build is not a snapshot build or is not being built on - # arm64 machine. This allows for using the snapshot image build without the architecture specific suffix - # consistently on local machines, i.e. can always use `ghcr.io/d2iq-labs/capi-runtime-extensions:v` on the machine the snapshot - # is built on. - # - # For a release build the `-amd64v8` suffix will always be included and the `docker_manifests` specification below - # will create the final multiplatform manifest to be pushed to the registry. - - ghcr.io/d2iq-labs/{{.ProjectName}}:v{{trimprefix .Version "v"}}{{ if or (not .IsSnapshot) (not (eq .Runtime.Goarch "arm64")) }}-arm64v8{{ end }} - use: buildx - goarch: arm64 - dockerfile: Dockerfile - build_flag_templates: - - "--platform=linux/arm64" - - "--pull" - - "--label=org.opencontainers.image.created={{.Date}}" - - "--label=org.opencontainers.image.title={{.ProjectName}}" - - "--label=org.opencontainers.image.revision={{.FullCommit}}" - - "--label=org.opencontainers.image.version={{.Version}}" - - "--label=org.opencontainers.image.source={{.GitURL}}" -docker_manifests: - - name_template: ghcr.io/d2iq-labs/{{.ProjectName}}:v{{trimprefix .Version "v"}} - image_templates: - - ghcr.io/d2iq-labs/{{.ProjectName}}:v{{trimprefix .Version "v"}}-amd64 - - ghcr.io/d2iq-labs/{{.ProjectName}}:v{{trimprefix .Version "v"}}-arm64v8 +kos: + - id: capi-runtime-extensions + build: capi-runtime-extensions + ldflags: + - -s + - -w + - -X 'k8s.io/component-base/version.buildDate={{ .CommitDate }}' + - -X 'k8s.io/component-base/version.gitCommit={{ .FullCommit }}' + - -X 'k8s.io/component-base/version.gitTreeState={{ .Env.GIT_TREE_STATE }}' + - -X 'k8s.io/component-base/version.gitVersion=v{{ trimprefix .Version "v" }}' + - -X 'k8s.io/component-base/version.major={{ .Major }}' + - -X 'k8s.io/component-base/version.minor={{ .Minor }}' + - -X 'k8s.io/component-base/version/verflag.programName={{ .ProjectName }}' + labels: + org.opencontainers.image.created: "{{ .CommitDate }}" + org.opencontainers.image.title: capi-runtime-extensions + org.opencontainers.image.revision: "{{ .FullCommit }}" + org.opencontainers.image.version: v{{trimprefix .Version "v"}} + org.opencontainers.image.source: "{{ .GitURL }}" + platforms: + - linux/amd64 + - linux/arm64 + repository: '{{ envOrDefault "KO_DOCKER_REPO" "ghcr.io/d2iq-labs/capi-runtime-extensions" }}' + bare: true + tags: + - v{{trimprefix .Version "v"}} checksum: name_template: 'checksums.txt' snapshot: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f0f8816c9..f4aea5ed7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -73,10 +73,6 @@ repos: hooks: - id: actionlint-system stages: [commit] -- repo: https://github.com/hadolint/hadolint - rev: v2.12.1-beta - hooks: - - id: hadolint - repo: https://github.com/jorisroovers/gitlint rev: v0.19.1 hooks: diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 7a7ca1d5e..000000000 --- a/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -# syntax=docker/dockerfile:1.4 - -# Copyright 2023 D2iQ, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -# hadolint ignore=DL3029 -FROM --platform=linux/amd64 gcr.io/distroless/static@sha256:1b4dbd7d38a0fd4bbaf5216a21a615d07b56747a96d3c650689cbb7fdc412b49 as linux-amd64 -# hadolint ignore=DL3029 -FROM --platform=linux/arm64 gcr.io/distroless/static@sha256:dcf9c9cafaa9c328eff2ceff5f6057588336b48c9b91ddc0913102b33bbce723 as linux-arm64 - -# hadolint ignore=DL3006,DL3029 -FROM --platform=linux/${TARGETARCH} linux-${TARGETARCH} - -COPY capi-runtime-extensions /usr/local/bin/capi-runtime-extensions - -# Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies -USER 65532 -ENTRYPOINT ["/usr/local/bin/capi-runtime-extensions"] diff --git a/devbox.json b/devbox.json index 81da84b71..b15f3a0a6 100644 --- a/devbox.json +++ b/devbox.json @@ -1,7 +1,7 @@ { "packages": [ "actionlint@latest", - "chart-testing@3.8.0", + "chart-testing@latest", "clusterctl@latest", "coreutils@latest", "crane@latest", @@ -17,10 +17,10 @@ "golines@latest", "goreleaser@latest", "gotestsum@latest", - "hadolint@latest", "helm-docs@latest", - "hugo@0.117.0", + "hugo@latest", "kind@latest", + "ko@latest", "kubebuilder@latest", "kubectl@latest", "kubernetes-controller-tools@latest", @@ -29,7 +29,6 @@ "pre-commit@latest", "rsync@latest", "shfmt@latest", - "upx@latest", "yamale@latest", "yamllint@latest", "path:./hack/flakes#go-mod-upgrade", diff --git a/devbox.lock b/devbox.lock index 9bc019e8d..3dfd658c4 100644 --- a/devbox.lock +++ b/devbox.lock @@ -2,182 +2,182 @@ "lockfile_version": "1", "packages": { "actionlint@latest": { - "last_modified": "2023-12-06T11:19:33Z", - "resolved": "github:NixOS/nixpkgs/325eb628b89b9a8183256f62d017bfb499b19bd9#actionlint", + "last_modified": "2024-01-02T02:19:20Z", + "resolved": "github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932#actionlint", "source": "devbox-search", "version": "1.6.26", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/mwhy011yspf44hvq2k3z567dx1iakxrn-actionlint-1.6.26" + "store_path": "/nix/store/28326qalmc32r0cra7bxbh5ihjq9nsxp-actionlint-1.6.26" }, "aarch64-linux": { - "store_path": "/nix/store/ip2d0vzjry7hllkkm6zvi8hrsawyfckn-actionlint-1.6.26" + "store_path": "/nix/store/zkzdlbm0ksvsdwp8r3dk5xcmn91l6ws6-actionlint-1.6.26" }, "x86_64-darwin": { - "store_path": "/nix/store/2x4d3r53hlzb1kald1f3g3j35rnd0x1l-actionlint-1.6.26" + "store_path": "/nix/store/rkhwcvn1m800n1vh6xds1pr9nim5kzzp-actionlint-1.6.26" }, "x86_64-linux": { - "store_path": "/nix/store/gfqxjavzzgdd6jzsapf4cz3j39gpii9w-actionlint-1.6.26" + "store_path": "/nix/store/g1h07n8ppxh96j18gahmd47n79qnw3i8-actionlint-1.6.26" } } }, - "chart-testing@3.8.0": { - "last_modified": "2023-06-27T08:49:46Z", - "resolved": "github:NixOS/nixpkgs/b38e95ea6c15b9ce098556f410d715b262fa386a#chart-testing", + "chart-testing@latest": { + "last_modified": "2023-12-18T02:58:18Z", + "resolved": "github:NixOS/nixpkgs/ca16221251951e9c6261a1a2bb4f9389038d3632#chart-testing", "source": "devbox-search", - "version": "3.8.0", + "version": "3.10.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/04bya6nk7gd4m8lias3nz6rgkpcwjq97-chart-testing-3.8.0" + "store_path": "/nix/store/xc7l8fa3lbd2qz3gv9xvayrqw4rv4653-chart-testing-3.10.1" }, "aarch64-linux": { - "store_path": "/nix/store/1a4p8qz2jv8r2ayy9s6y8d0fdihbz6q6-chart-testing-3.8.0" + "store_path": "/nix/store/3fx818ja1w3gl75r9yzxbvs8bw2wyykr-chart-testing-3.10.1" }, "x86_64-darwin": { - "store_path": "/nix/store/iib3mj3ci3382pm1hy63lr4ibkap95ca-chart-testing-3.8.0" + "store_path": "/nix/store/m5didwx57ikg35jkl1w1kvjadp7fdj90-chart-testing-3.10.1" }, "x86_64-linux": { - "store_path": "/nix/store/aw4b101irzzrz0nyz7mhvh31ajvnbqlp-chart-testing-3.8.0" + "store_path": "/nix/store/7jxq4a7g514px4qz22pn4k87d1f6f7vc-chart-testing-3.10.1" } } }, "clusterctl@latest": { - "last_modified": "2023-12-09T06:39:50Z", - "resolved": "github:NixOS/nixpkgs/29558c0722ffd40ff625256e16259168b7c03ed1#clusterctl", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#clusterctl", "source": "devbox-search", "version": "1.6.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/xa4hhmr9nm2ak6js18cqf5ax2fvbm1j4-clusterctl-1.6.0" + "store_path": "/nix/store/c3i7qh827z6i4cgbfn8nb551g5d0hdlm-clusterctl-1.6.0" }, "aarch64-linux": { - "store_path": "/nix/store/d1vl4i172kfbakgrqvdi727s69jky80g-clusterctl-1.6.0" + "store_path": "/nix/store/c0ra5d87xzrdgjwjdmc9n8r0z0998yz6-clusterctl-1.6.0" }, "x86_64-darwin": { - "store_path": "/nix/store/an9cj6ypc8xbc45w6n5cf41jc3karslq-clusterctl-1.6.0" + "store_path": "/nix/store/6bcdrk0dkw1k5cmhgvaijhm7ifqwjnys-clusterctl-1.6.0" }, "x86_64-linux": { - "store_path": "/nix/store/8qd5wksyccgmz93cbhqq0pfk0dc3jrlv-clusterctl-1.6.0" + "store_path": "/nix/store/z66px6ph446xnz53ypspvzjl2km15cqy-clusterctl-1.6.0" } } }, "coreutils@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#coreutils", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#coreutils", "source": "devbox-search", - "version": "9.3", + "version": "9.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/h0fgpyxfav7ybnw5sdg8jpyv9f95x4w0-coreutils-9.3" + "store_path": "/nix/store/pzajj7gw0nazs3vzp6jld53q8ird5izr-coreutils-9.4" }, "aarch64-linux": { - "store_path": "/nix/store/zzmqcgd2vrql9656a2fkwk948r38mgai-coreutils-9.3" + "store_path": "/nix/store/9a1hkj2fnqf1683r66j850hlmfn550ka-coreutils-9.4" }, "x86_64-darwin": { - "store_path": "/nix/store/vd0b59wk8x56i8kmwda8jl5h37wnixn2-coreutils-9.3" + "store_path": "/nix/store/dsvdw81x1nzb0c2lr5shywmwffl8dw1s-coreutils-9.4" }, "x86_64-linux": { - "store_path": "/nix/store/bblyj5b3ii8n6v4ra0nb37cmi3lf8rz9-coreutils-9.3" + "store_path": "/nix/store/zx8aqgdy735qzk81glfwil6mbi6ddqb1-coreutils-9.4" } } }, "crane@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#crane", + "last_modified": "2023-12-18T02:58:18Z", + "resolved": "github:NixOS/nixpkgs/ca16221251951e9c6261a1a2bb4f9389038d3632#crane", "source": "devbox-search", - "version": "0.16.1", + "version": "0.17.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/fcvaslbqqhm4yl34wizp8vk7xwrjkgrd-go-containerregistry-0.16.1-crane" + "store_path": "/nix/store/xgdfdydcplilly8qhi0wf9xbfxz3bwnw-go-containerregistry-0.17.0-crane" }, "aarch64-linux": { - "store_path": "/nix/store/mw6mwzqkwwgwx5sq6cldkvgym57g56ys-go-containerregistry-0.16.1-crane" + "store_path": "/nix/store/53rvclag4d43mz2vbis469sxw6jzaj65-go-containerregistry-0.17.0-crane" }, "x86_64-darwin": { - "store_path": "/nix/store/m9hb73brx76yrf76g8yp1piza3llzbmw-go-containerregistry-0.16.1-crane" + "store_path": "/nix/store/gnz9m1g3dswcm30z6ygfmakpg1rcgnyf-go-containerregistry-0.17.0-crane" }, "x86_64-linux": { - "store_path": "/nix/store/16c2780f6sqy951msmnxp9qv5nfshxb8-go-containerregistry-0.16.1-crane" + "store_path": "/nix/store/2jxl4x9m7mfxan734mdvq5aws8k0ylx7-go-containerregistry-0.17.0-crane" } } }, "envsubst@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#envsubst", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#envsubst", "source": "devbox-search", "version": "1.4.2", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/25iwr3pxb67bbdnn26fq3ksnzcadzms1-envsubst-1.4.2" + "store_path": "/nix/store/ds70qizfhjmpm7np7snrz4c9kqjzfb2s-envsubst-1.4.2" }, "aarch64-linux": { - "store_path": "/nix/store/gfqkx2rh423hmm5h3a9i8qpyad8b2ydk-envsubst-1.4.2" + "store_path": "/nix/store/afj0lnjynk1c11r27xqg2f5izkdnb59m-envsubst-1.4.2" }, "x86_64-darwin": { - "store_path": "/nix/store/rw21qrjr656qjd0wdmx5r4169n3mhnri-envsubst-1.4.2" + "store_path": "/nix/store/kw7dds9h7hp7a4z980n0j5ps54vsnqhq-envsubst-1.4.2" }, "x86_64-linux": { - "store_path": "/nix/store/ciab420xmh3djch58svin36fdynmdxsp-envsubst-1.4.2" + "store_path": "/nix/store/0q5c7ly3vkjw2fk0p4ddnfpkb2x7gg4s-envsubst-1.4.2" } } }, "findutils@latest": { - "last_modified": "2023-12-11T05:36:02Z", - "resolved": "github:NixOS/nixpkgs/e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d#findutils", + "last_modified": "2023-12-18T02:58:18Z", + "resolved": "github:NixOS/nixpkgs/ca16221251951e9c6261a1a2bb4f9389038d3632#findutils", "source": "devbox-search", "version": "4.9.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/zr6klxfjzpdr2674ly1f4fix7ig57mjr-findutils-4.9.0" + "store_path": "/nix/store/6x5inimwy8rlvf678yy080zccbw71alb-findutils-4.9.0" }, "aarch64-linux": { - "store_path": "/nix/store/5bickbj8vq0qc1ask0cbn3qqf94a9p0c-findutils-4.9.0" + "store_path": "/nix/store/54la6gipxzwykx882fnfz3v3jgzri61h-findutils-4.9.0" }, "x86_64-darwin": { - "store_path": "/nix/store/cmh1dkqbzds5ilgmz9vc7jpavd8lflp3-findutils-4.9.0" + "store_path": "/nix/store/dh1fgwya6795yv108p8dzjyzwl9m4lvj-findutils-4.9.0" }, "x86_64-linux": { - "store_path": "/nix/store/l974pi8a5yqjrjlzmg6apk0jwjv81yqw-findutils-4.9.0" + "store_path": "/nix/store/sq0w0jchkjqbxl47h52kfwa33qp1adfh-findutils-4.9.0" } } }, "ginkgo@latest": { - "last_modified": "2023-12-10T01:36:17Z", - "resolved": "github:NixOS/nixpkgs/2873a73123077953f3e6f34964466018876d87c4#ginkgo", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#ginkgo", "source": "devbox-search", "version": "2.13.2", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/awkbi0shmjqdynz1pk47jjpwszvgplmd-ginkgo-2.13.2" + "store_path": "/nix/store/ixjxhvf5y619d4xxksamr26ygr0jq9mf-ginkgo-2.13.2" }, "aarch64-linux": { - "store_path": "/nix/store/cmpknds8513jr8s6bwx3bf2gq2xi3nbh-ginkgo-2.13.2" + "store_path": "/nix/store/24zilfcw58s5jrqqqmxngcnhml7r8cxs-ginkgo-2.13.2" }, "x86_64-darwin": { - "store_path": "/nix/store/8zhgqqgqg8s1hidg4bywwb0nlqf62xpy-ginkgo-2.13.2" + "store_path": "/nix/store/2am54c4bvsj0lr4fk2mgn27f9h3gqriy-ginkgo-2.13.2" }, "x86_64-linux": { - "store_path": "/nix/store/hg0dw8sbvgd8fapkzsijwi39ima07ay2-ginkgo-2.13.2" + "store_path": "/nix/store/4fxhb9322ryflmxbfqbkrs9yp91mhn4z-ginkgo-2.13.2" } } }, "git@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#git", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#git", "source": "devbox-search", "version": "2.42.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/rxpifxzrsjb0xfjrkrg16vm1876scqvj-git-2.42.0" + "store_path": "/nix/store/q7avibx4c00h7zl3jfh3r5mc4xs6wsnj-git-2.42.0" }, "aarch64-linux": { - "store_path": "/nix/store/iw3w7vwh9m2ypy8xpj45hq2p1i5phqbp-git-2.42.0" + "store_path": "/nix/store/v7f1fag7w6ifk9cg1p5xhnnzy7mf0kmv-git-2.42.0" }, "x86_64-darwin": { - "store_path": "/nix/store/g1c8k2i2pcad5z10f1x9f1s2nv0nlxx9-git-2.42.0" + "store_path": "/nix/store/hhf2cldbfcndgilsak5x8dxphgj1y3id-git-2.42.0" }, "x86_64-linux": { - "store_path": "/nix/store/zcpq1fivdd131gshg58m4cyq7fwqr3j8-git-2.42.0" + "store_path": "/nix/store/31ypk253113v59lslsx8nbqpx794rlan-git-2.42.0" } } }, @@ -199,442 +199,422 @@ } }, "gnumake@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#gnumake", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#gnumake", "source": "devbox-search", "version": "4.4.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/6kxdgmbgwdq4y42r9qhgdky312v5d7x0-gnumake-4.4.1" + "store_path": "/nix/store/zc9qsb0rzlw0ckhy7097frcwb4pkfx3d-gnumake-4.4.1" }, "aarch64-linux": { - "store_path": "/nix/store/rdwvi09v1vwzyfd1zv2sgnar8s7x8d8n-gnumake-4.4.1" + "store_path": "/nix/store/hzcbyip77ix30na3yspgv6kcis4fm1pl-gnumake-4.4.1" }, "x86_64-darwin": { - "store_path": "/nix/store/x5dy4sqg1nxsl7nwibanfrbx95wdb228-gnumake-4.4.1" + "store_path": "/nix/store/jax0vsf5xg27vy4ga3940fkj3qkkhp96-gnumake-4.4.1" }, "x86_64-linux": { - "store_path": "/nix/store/cnsbbj66kz0fdp41xhy9nd45pashpai7-gnumake-4.4.1" + "store_path": "/nix/store/5v3k090nl55rxz2gkn9y4wchna3vjjxw-gnumake-4.4.1" } } }, "gnused@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#gnused", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#gnused", "source": "devbox-search", "version": "4.9", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/nddzbf5pifm77kksh25xwiy2g9kqqm9f-gnused-4.9" + "store_path": "/nix/store/9z9k8dwhhiryr7z2pz70zca0vwa15yqc-gnused-4.9" }, "aarch64-linux": { - "store_path": "/nix/store/ha241bhagian5dbg9ddi2b6y2m449fh1-gnused-4.9" + "store_path": "/nix/store/qjwzm1rv898mzi5d616w721bswpxmwmb-gnused-4.9" }, "x86_64-darwin": { - "store_path": "/nix/store/lpzfs8kvdf7fs2j2fbc8a0r2zjjlygna-gnused-4.9" + "store_path": "/nix/store/hjkvi2f3vnvm2b7yvnk5vya0fwn0cfb1-gnused-4.9" }, "x86_64-linux": { - "store_path": "/nix/store/9c5qm297qnvwcf7j0gm01qrslbiqz8rs-gnused-4.9" + "store_path": "/nix/store/7fqp73ncnbwr5bxxszqicf6r33d9yhkw-gnused-4.9" } } }, "go@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#go", + "last_modified": "2024-01-02T02:19:20Z", + "resolved": "github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932#go", "source": "devbox-search", - "version": "1.21.4", + "version": "1.21.5", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/02cpvad60np366kmsqc3gnixbsw9jvg1-go-1.21.4" + "store_path": "/nix/store/b0rpa34hn6cgbkbn8sfr5dzv723ia3z2-go-1.21.5" }, "aarch64-linux": { - "store_path": "/nix/store/7y75b2ac80chlh6knld3943y46n3v9kf-go-1.21.4" + "store_path": "/nix/store/5jamaixw6ni5c05qqml6ld3j386v871k-go-1.21.5" }, "x86_64-darwin": { - "store_path": "/nix/store/0djljz0g4s6f55xcnw7fpzcy7af7rxid-go-1.21.4" + "store_path": "/nix/store/hyzs4fhjw7zmwra5scss7hapgw22rcm5-go-1.21.5" }, "x86_64-linux": { - "store_path": "/nix/store/y7abhs9glxfcg7lgcdc8i4ml5wg5ly92-go-1.21.4" + "store_path": "/nix/store/6qd8p8gilzgplpk2ni3109m0k71r21s7-go-1.21.5" } } }, "gojq@latest": { - "last_modified": "2023-12-03T07:45:23Z", - "resolved": "github:NixOS/nixpkgs/ec04772e7516b6d58d98b491e68b329b7558b14d#gojq", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#gojq", "source": "devbox-search", "version": "0.12.14", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/1jfjdjbbgm1f6pg74kq5421qz301pkcx-gojq-0.12.14" + "store_path": "/nix/store/7bxqkndy4ym9d1ww5r111immwpg1mqgl-gojq-0.12.14" }, "aarch64-linux": { - "store_path": "/nix/store/7c0xnfkjmpzc3r38zbh22zcm0rw404n5-gojq-0.12.14" + "store_path": "/nix/store/bkahk5pwvx1dv11i20j9izscvl9bwhr3-gojq-0.12.14" }, "x86_64-darwin": { - "store_path": "/nix/store/ymbbxg162p42sj59rvz7spkqk7pg05dj-gojq-0.12.14" + "store_path": "/nix/store/jh2j2ci199gfail9gb70iq8rfwkrkj0h-gojq-0.12.14" }, "x86_64-linux": { - "store_path": "/nix/store/gi0crp32w0gqyc8zd0xqdif6f04yy9jr-gojq-0.12.14" + "store_path": "/nix/store/lrz1gv6wi0skr1xhqif7w897r1p7wzxg-gojq-0.12.14" } } }, "golines@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#golines", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#golines", "source": "devbox-search", "version": "0.11.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/pyvpysdzghw00ihvfa8q0brxi5c587da-golines-0.11.0" + "store_path": "/nix/store/41xcjkrw4i9qkmqm8xz8wsn4ik78m531-golines-0.11.0" }, "aarch64-linux": { - "store_path": "/nix/store/hzh723s3p206w0n8sa46yha3fpm9xg95-golines-0.11.0" + "store_path": "/nix/store/21k39siayn1bkvbq510sijzkycqw9zbr-golines-0.11.0" }, "x86_64-darwin": { - "store_path": "/nix/store/y3bhwvj4bjrj77sq787pawa4xhd9n5gy-golines-0.11.0" + "store_path": "/nix/store/9wsan1jf1wbzgwl0mqysz15ab0axx36r-golines-0.11.0" }, "x86_64-linux": { - "store_path": "/nix/store/yxlx23r8lgkwgn7a8g541qnwg8k0rky4-golines-0.11.0" + "store_path": "/nix/store/5ca0qgzz2h9x57d96rvwq4jpqbr1c8lh-golines-0.11.0" } } }, "goreleaser@latest": { - "last_modified": "2023-11-27T17:54:48Z", - "resolved": "github:NixOS/nixpkgs/491af1f1cc28df11dfbff049da4134c37d58aee9#goreleaser", + "last_modified": "2023-12-31T07:44:09Z", + "resolved": "github:NixOS/nixpkgs/d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7#goreleaser", "source": "devbox-search", - "version": "1.22.1", + "version": "1.23.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/z6kyp206dx7m592fnzlqy5ibcn9qkb9j-goreleaser-1.22.1" + "store_path": "/nix/store/c01jhnwv2qrpc3rg25d945a7wbwq3p5c-goreleaser-1.23.0" }, "aarch64-linux": { - "store_path": "/nix/store/vl7f3w9cm6ib9b3iz7bjd6s825rrxkmf-goreleaser-1.22.1" + "store_path": "/nix/store/d5dc8d16hj50kfa5ayljldcl19z2ms1h-goreleaser-1.23.0" }, "x86_64-darwin": { - "store_path": "/nix/store/bggx5xqyla8zpss4sv71p350ajd70f89-goreleaser-1.22.1" + "store_path": "/nix/store/9rn8kwjar253yjcq172ixrwnfrajiirz-goreleaser-1.23.0" }, "x86_64-linux": { - "store_path": "/nix/store/cgzhkcv3wvcd2zlblv4y0vhjvw479467-goreleaser-1.22.1" + "store_path": "/nix/store/dma584nd1gkx3ziss6nir1w9zmwf9ayp-goreleaser-1.23.0" } } }, "gotestsum@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#gotestsum", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#gotestsum", "source": "devbox-search", "version": "1.10.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/5skpsrl0cdr2s6yaqfymx575qw3n19nr-gotestsum-1.10.1" + "store_path": "/nix/store/av8bq276q2qqps3kkk3x1g24x8gw2wmi-gotestsum-1.10.1" }, "aarch64-linux": { - "store_path": "/nix/store/9xgdrdv18x2hnismc65kz5vcgbv3850a-gotestsum-1.10.1" + "store_path": "/nix/store/73fb0ld3qk4y7prfab2p81w3zcq4rbpn-gotestsum-1.10.1" }, "x86_64-darwin": { - "store_path": "/nix/store/g7pf4yxmf0wvxw7bwaxsfyd2pjwry6ib-gotestsum-1.10.1" + "store_path": "/nix/store/mzz63zdk1azl6jfgnk5xq07hwbmp6iij-gotestsum-1.10.1" }, "x86_64-linux": { - "store_path": "/nix/store/bjrv592a532c4nh40angvr3x4h574ff4-gotestsum-1.10.1" + "store_path": "/nix/store/8ffcj537lzh186j4spzi7gr6qgv32hmn-gotestsum-1.10.1" } } }, - "hadolint@latest": { - "last_modified": "2023-12-06T11:19:33Z", - "resolved": "github:NixOS/nixpkgs/325eb628b89b9a8183256f62d017bfb499b19bd9#hadolint", + "helm-docs@latest": { + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#helm-docs", "source": "devbox-search", - "version": "2.12.0", + "version": "1.11.2", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/q1js5iz9blr2zkhd631mw83h2zkmrka5-hadolint-2.12.0" + "store_path": "/nix/store/5nr53dpg1z8c1sx0y32nhacxm16phrmr-helm-docs-1.11.2" }, "aarch64-linux": { - "store_path": "/nix/store/h0a5j47ha4bmm6xh87d64c3gnsb5ka8f-hadolint-2.12.0" + "store_path": "/nix/store/iy2647s516rc0pi7gn0vjdaacwlxibci-helm-docs-1.11.2" }, "x86_64-darwin": { - "store_path": "/nix/store/accxyvxwnvmc11jyj95l6qj449na2hlz-hadolint-2.12.0" + "store_path": "/nix/store/pxwzy0ii4wgj1lj26lfk2zn148k5vsk9-helm-docs-1.11.2" }, "x86_64-linux": { - "store_path": "/nix/store/mccia456p8mb4j2z9cs6lvvp77k5zg5z-hadolint-2.12.0" + "store_path": "/nix/store/kl5hwrwbw5xz7zfd0llrdmbnbamggwa9-helm-docs-1.11.2" } } }, - "helm-docs@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#helm-docs", + "hugo@latest": { + "last_modified": "2023-12-31T07:44:09Z", + "resolved": "github:NixOS/nixpkgs/d44d59d2b5bd694cd9d996fd8c51d03e3e9ba7f7#hugo", "source": "devbox-search", - "version": "1.11.2", + "version": "0.121.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/iaxd3n54phki02cyr09fss5rv4qph5nj-helm-docs-1.11.2" + "store_path": "/nix/store/xrvfccx93yf7dca8gfk7drqg43i8ga3q-hugo-0.121.1" }, "aarch64-linux": { - "store_path": "/nix/store/dk0bv093ivmwwbank9n6hv9395zjfz6n-helm-docs-1.11.2" + "store_path": "/nix/store/i9szpapc16rcrcgmiq8ji518pwryg2kb-hugo-0.121.1" }, "x86_64-darwin": { - "store_path": "/nix/store/y2scgwkcn1fqmdidzx2411nfxxankrmb-helm-docs-1.11.2" + "store_path": "/nix/store/8njnc3x909dnr2mvyc3j6zspgha3s4vn-hugo-0.121.1" }, "x86_64-linux": { - "store_path": "/nix/store/pl07w30430zwhxlvjqwxp5g0g6s1yrb0-helm-docs-1.11.2" + "store_path": "/nix/store/kl2ljcny9a5myfmgl6f6xnhqfgy2wbvp-hugo-0.121.1" } } }, - "hugo@0.117.0": { - "last_modified": "2023-08-30T00:25:28Z", - "resolved": "github:NixOS/nixpkgs/a63a64b593dcf2fe05f7c5d666eb395950f36bc9#hugo", + "kind@latest": { + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#kind", "source": "devbox-search", - "version": "0.117.0", + "version": "0.20.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/zxilbz2vy1jxyx9dnbsvi1dzwh7h1imx-hugo-0.117.0" + "store_path": "/nix/store/3hgrf1lz8zb5l1nqicabh2q0sing7mgv-kind-0.20.0" }, "aarch64-linux": { - "store_path": "/nix/store/7yx72ys82v6swbrsndmd1zyh9dy8mwlf-hugo-0.117.0" + "store_path": "/nix/store/zmcvid7w8hgf93d3vhx93ai8g7yf26s9-kind-0.20.0" }, "x86_64-darwin": { - "store_path": "/nix/store/4xhi39dz6jxcqfpb3yl37idmsyqpjmzh-hugo-0.117.0" + "store_path": "/nix/store/a9b40wynzbfdc5fbkxbd94cp5ixlhqfv-kind-0.20.0" }, "x86_64-linux": { - "store_path": "/nix/store/g7afxdbprri4s1qp1n709zcnd5rp84m6-hugo-0.117.0" + "store_path": "/nix/store/5g25hx32zh9fkvc7sznhlv5v9yzsgba3-kind-0.20.0" } } }, - "kind@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#kind", + "ko@latest": { + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#ko", "source": "devbox-search", - "version": "0.20.0", + "version": "0.15.1", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/h63plvmjv7cb3i5ggqba1b2ac06sdvi5-kind-0.20.0" + "store_path": "/nix/store/0fvnkr0slhg020p7134n8k8vwsxpl8g8-ko-0.15.1" }, "aarch64-linux": { - "store_path": "/nix/store/dwqcnipd3rj0kspwjvxdcm32sfi5pmdx-kind-0.20.0" + "store_path": "/nix/store/1iik9q0nq8pja6dxx1k19x87z3vwy8vq-ko-0.15.1" }, "x86_64-darwin": { - "store_path": "/nix/store/ip9nkl00d91jmqik7cmcbra8px7lvwyj-kind-0.20.0" + "store_path": "/nix/store/vaxgi2kl1y86kacqz7z135i6bynzdr77-ko-0.15.1" }, "x86_64-linux": { - "store_path": "/nix/store/yaigqil7157p4rz43sd34gihr3r759q6-kind-0.20.0" + "store_path": "/nix/store/96wxbaknnv8sqs7a8gyca4qibc82a4f1-ko-0.15.1" } } }, "kubebuilder@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#kubebuilder", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#kubebuilder", "source": "devbox-search", "version": "3.13.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/4slkiyix328vyhkp1w8swf5gmkhfdd06-kubebuilder-3.13.0" + "store_path": "/nix/store/94dfj1pj43fd4igszrspsr96h87g85kc-kubebuilder-3.13.0" }, "aarch64-linux": { - "store_path": "/nix/store/a4f7zql8szg9fn596wr9j5ghkp645fqi-kubebuilder-3.13.0" + "store_path": "/nix/store/jysi7gyhw2qia39fy1dgyqrpxs372wwc-kubebuilder-3.13.0" }, "x86_64-darwin": { - "store_path": "/nix/store/97a1kchpw96lizkxjabyrd5mmdyz1g89-kubebuilder-3.13.0" + "store_path": "/nix/store/rpfikfwvmjp081a8v6fgi998xbcgz3iw-kubebuilder-3.13.0" }, "x86_64-linux": { - "store_path": "/nix/store/9v59mkdbyvrw4szc4g0g45i3pynlbckd-kubebuilder-3.13.0" + "store_path": "/nix/store/2vis2xc91003qb8clxmmvfrl0lq5lypn-kubebuilder-3.13.0" } } }, "kubectl@latest": { - "last_modified": "2023-11-19T00:55:35Z", - "resolved": "github:NixOS/nixpkgs/9ea24fc7e02b65c150c88e1412400b70087bd382#kubectl", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#kubectl", "source": "devbox-search", "version": "1.28.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/ndlxcylksh85lh8anay6mi7sd985vcdd-kubectl-1.28.4" + "store_path": "/nix/store/n082kkafm88sckhn6dib17mr0izmgvgv-kubectl-1.28.4" }, "aarch64-linux": { - "store_path": "/nix/store/20jd0fxhrkkvqksfwzbgyramhacsabhi-kubectl-1.28.4" + "store_path": "/nix/store/ga2yx93m6hmdds1j42whq323jmdbr4ph-kubectl-1.28.4" }, "x86_64-darwin": { - "store_path": "/nix/store/drv3drihn38imxbzhyqa8p7n5q0qmizx-kubectl-1.28.4" + "store_path": "/nix/store/340l2mgfk0bw31ssdxagny5rbimqxk9z-kubectl-1.28.4" }, "x86_64-linux": { - "store_path": "/nix/store/jpznx1gqm4cc0r85q2hrwiwjy44zyrx8-kubectl-1.28.4" + "store_path": "/nix/store/wmz6qf68wysh6k8iqpqsbjpmwrxvwjcr-kubectl-1.28.4" } } }, "kubernetes-controller-tools@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#kubernetes-controller-tools", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#kubernetes-controller-tools", "source": "devbox-search", "version": "0.13.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/l0r5qv5y6w9sig8ijq1d9bic0n061xva-controller-tools-0.13.0" + "store_path": "/nix/store/32mibfrldlbqkxims4crpvfk1bmarv2d-controller-tools-0.13.0" }, "aarch64-linux": { - "store_path": "/nix/store/n8yzvf7zby0zxh5lnaf253q8cxqpz5v2-controller-tools-0.13.0" + "store_path": "/nix/store/5kvj16qj8gnk4lgyi8sq79x10zx7c1ms-controller-tools-0.13.0" }, "x86_64-darwin": { - "store_path": "/nix/store/nn420ic4qxnxlw7c6a57638db5s402gz-controller-tools-0.13.0" + "store_path": "/nix/store/b048lh1hhp4p5mybhxnfwarzwpgbnnid-controller-tools-0.13.0" }, "x86_64-linux": { - "store_path": "/nix/store/6w684wlzf8fvzsmqcmr005qi9a0i8vf0-controller-tools-0.13.0" + "store_path": "/nix/store/wv1wjirfx5yp0xwr6fnhczsnp1wv9ypj-controller-tools-0.13.0" } } }, "kubernetes-helm@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#kubernetes-helm", + "last_modified": "2023-12-18T02:58:18Z", + "resolved": "github:NixOS/nixpkgs/ca16221251951e9c6261a1a2bb4f9389038d3632#kubernetes-helm", "source": "devbox-search", - "version": "3.13.2", + "version": "3.13.3", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/bm0hydn3x8qicnnpp1j59affzbh802g6-kubernetes-helm-3.13.2" + "store_path": "/nix/store/xi03fpngzw36kbrqarxvsj63jjmf7rqi-kubernetes-helm-3.13.3" }, "aarch64-linux": { - "store_path": "/nix/store/rlxzcdijanfnr1cycmasxlqqbkhmfllc-kubernetes-helm-3.13.2" + "store_path": "/nix/store/z6bvs0p0aw9gzn10zir418hqzw870pv9-kubernetes-helm-3.13.3" }, "x86_64-darwin": { - "store_path": "/nix/store/wihx37d21rxyvp5d10ki9qr57mmqa96n-kubernetes-helm-3.13.2" + "store_path": "/nix/store/h4px88vkjzzxjiyh0xrfi420piq7z3f7-kubernetes-helm-3.13.3" }, "x86_64-linux": { - "store_path": "/nix/store/2nsswfqlz4nc2hrbxchz7n98ccg9jfjx-kubernetes-helm-3.13.2" + "store_path": "/nix/store/74ih2yj0whsy5737mhi39112s3akfdsj-kubernetes-helm-3.13.3" } } }, "kustomize@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#kustomize", + "last_modified": "2023-12-20T09:10:46Z", + "resolved": "github:NixOS/nixpkgs/7c33cd6bf01cf09f77bfdf6741cddfffa2cd5640#kustomize", "source": "devbox-search", - "version": "5.2.1", + "version": "5.3.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/16klhmp6r7ql652r5dn9iipi04mx15fh-kustomize-5.2.1" + "store_path": "/nix/store/5690kcy6clbrgd4pdm54pgabavrijv6x-kustomize-5.3.0" }, "aarch64-linux": { - "store_path": "/nix/store/fws20x8vkrqnb3xvwvg5nfcj0ixyn7ga-kustomize-5.2.1" + "store_path": "/nix/store/11ldpl0i0467yp47gd8fl1ghv29a7x5r-kustomize-5.3.0" }, "x86_64-darwin": { - "store_path": "/nix/store/4zszzy2cphdrqnhv6x2jznpcrdpya76f-kustomize-5.2.1" + "store_path": "/nix/store/awl36g367mlqcswcdb84saf2rdq3andq-kustomize-5.3.0" }, "x86_64-linux": { - "store_path": "/nix/store/0pjqqvkk13q1gwyfjhydfrnh0y5q97ak-kustomize-5.2.1" + "store_path": "/nix/store/ajiv2s98cxhx3l40dnrxlcblwi6b99yd-kustomize-5.3.0" } } }, "pre-commit@latest": { - "last_modified": "2023-12-08T10:05:40Z", - "resolved": "github:NixOS/nixpkgs/e9ef8a102c555da4f8f417fe5cf5bd539d8a38b7#pre-commit", + "last_modified": "2024-01-02T02:19:20Z", + "resolved": "github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932#pre-commit", "source": "devbox-search", - "version": "3.3.3", + "version": "3.6.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/crc4fgf5v5j59vis3hhhmxq3cskcqdi9-pre-commit-3.3.3" + "store_path": "/nix/store/sk456nhh6xj6y88qkdb97qpssr1ck31c-pre-commit-3.6.0" }, "aarch64-linux": { - "store_path": "/nix/store/kg3jnvq16xnlivhc7w7781zwdjryq7dy-pre-commit-3.3.3" + "store_path": "/nix/store/slxrc87y13zmcf6vkacrc0v246d3yk8z-pre-commit-3.6.0" }, "x86_64-darwin": { - "store_path": "/nix/store/wfynw56k49vx5lrgdsss0r668k71czf2-pre-commit-3.3.3" + "store_path": "/nix/store/rk08dqbm19bqj8mgwsny3fgl1kr2g2g1-pre-commit-3.6.0" }, "x86_64-linux": { - "store_path": "/nix/store/g20ls8sdwc3irnqkg8mydrn7hqw1fkg1-pre-commit-3.3.3" + "store_path": "/nix/store/5lnzp86aag0gr0da61sq4x00l1pzm0rl-pre-commit-3.6.0" } } }, "rsync@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#rsync", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#rsync", "source": "devbox-search", "version": "3.2.7", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/ygk0alrqkjdm6psa7rcng22gnjxixrpy-rsync-3.2.7" + "store_path": "/nix/store/azyy2hk8jp2j7c3rhz951rcb3l5j3l0z-rsync-3.2.7" }, "aarch64-linux": { - "store_path": "/nix/store/qsa06705zbffcjddf36z9iq63z3adcbm-rsync-3.2.7" + "store_path": "/nix/store/81562iicgyryccma4d7zqahzkq3fd9cp-rsync-3.2.7" }, "x86_64-darwin": { - "store_path": "/nix/store/7qiq9lzq9pbxrn45fnf096sx1svkmd1h-rsync-3.2.7" + "store_path": "/nix/store/sqv1sgkpv0qkrz0qx7ila901rj0833yn-rsync-3.2.7" }, "x86_64-linux": { - "store_path": "/nix/store/6cmqhxzh2jqyd3jhjfi8x164mjsapvfm-rsync-3.2.7" + "store_path": "/nix/store/81fpr64vybx6wqm5iysfb5z600k19qll-rsync-3.2.7" } } }, "shfmt@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#shfmt", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#shfmt", "source": "devbox-search", "version": "3.7.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/dbca04lhbcs2qk8bgp2j4srng7k32xva-shfmt-3.7.0" - }, - "aarch64-linux": { - "store_path": "/nix/store/sxrld036jzmbwckwzyb26jhx8ksi11yp-shfmt-3.7.0" - }, - "x86_64-darwin": { - "store_path": "/nix/store/3bsvlzy6kng68lxvnj4gsqg52ql6ys11-shfmt-3.7.0" - }, - "x86_64-linux": { - "store_path": "/nix/store/wbvms5iwgxfy85hbm618w7gqqg8rgi1f-shfmt-3.7.0" - } - } - }, - "upx@latest": { - "last_modified": "2023-11-24T00:36:48Z", - "resolved": "github:NixOS/nixpkgs/8b8c9407844599546393146bfac901290e0ab96b#upx", - "source": "devbox-search", - "version": "4.2.0", - "systems": { - "aarch64-darwin": { - "store_path": "/nix/store/g5p6ky0ycd9pw5rkz2ijv5h83f74hmfd-upx-4.2.0" + "store_path": "/nix/store/kgw4ys2z4hrblaxfrcar8ypq0mrv82gw-shfmt-3.7.0" }, "aarch64-linux": { - "store_path": "/nix/store/901swd51afvwm75dzvp18q19hkl9c6m9-upx-4.2.0" + "store_path": "/nix/store/xaa1mcpb6jx2220qkd8c1m86awz13qav-shfmt-3.7.0" }, "x86_64-darwin": { - "store_path": "/nix/store/kshxsdx1l84zklvdy9p4b1fyidad104i-upx-4.2.0" + "store_path": "/nix/store/gbr94vv3n6q2xa8z2fjl6igd4a79k6x2-shfmt-3.7.0" }, "x86_64-linux": { - "store_path": "/nix/store/was3lq103hkknk9y5z3jqaick03fqbns-upx-4.2.0" + "store_path": "/nix/store/5fn1zb72dgyy689jpdwh27s979jv2l1g-shfmt-3.7.0" } } }, "yamale@latest": { - "last_modified": "2023-11-17T14:14:56Z", - "resolved": "github:NixOS/nixpkgs/a71323f68d4377d12c04a5410e214495ec598d4c#yamale", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#yamale", "source": "devbox-search", "version": "4.0.4", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/rxri27zdp2l4ff1qxz6h92fw7x5cpxs0-python3.11-yamale-4.0.4" + "store_path": "/nix/store/mzw94wrz08016zl4jqfr8shrb0rl8pnb-python3.11-yamale-4.0.4" }, "aarch64-linux": { - "store_path": "/nix/store/85dyphih44f81v79088wz7an0rmrqnd9-python3.11-yamale-4.0.4" + "store_path": "/nix/store/k25dkkb81s31vnilwjvkxrg299p6jcyr-python3.11-yamale-4.0.4" }, "x86_64-darwin": { - "store_path": "/nix/store/nvi9026k8ln0fm5f2j5v0sk4nzz1s6c4-python3.11-yamale-4.0.4" + "store_path": "/nix/store/slqxs564zddsasak7015dik8c3q7vfb6-python3.11-yamale-4.0.4" }, "x86_64-linux": { - "store_path": "/nix/store/r3srf69pzhrpnqbdamlsrx59mbz7fhn0-python3.11-yamale-4.0.4" + "store_path": "/nix/store/6ls72vnrqkz5srnb942x2cy1liga7106-python3.11-yamale-4.0.4" } } }, "yamllint@latest": { - "last_modified": "2023-12-01T12:14:05Z", - "resolved": "github:NixOS/nixpkgs/77da99a144cd341408308e0a37622f5edcc6c5ba#yamllint", + "last_modified": "2023-12-13T22:54:10Z", + "resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#yamllint", "source": "devbox-search", "version": "1.33.0", "systems": { "aarch64-darwin": { - "store_path": "/nix/store/frs1qw2m41jfy8shvkzflz8028mhxp9y-python3.11-yamllint-1.33.0" + "store_path": "/nix/store/inyipsq4qdzmai4791zl542dl9995l4w-python3.11-yamllint-1.33.0" }, "aarch64-linux": { - "store_path": "/nix/store/sb1p52jkl16lbpz405vzf8nll82l9bar-python3.11-yamllint-1.33.0" + "store_path": "/nix/store/2y28v3lrnv3m9zgxgksdzjxq3p8n6x4m-python3.11-yamllint-1.33.0" }, "x86_64-darwin": { - "store_path": "/nix/store/gsbj0qxf4cbqz2rfq6c6zy08kvchncg6-python3.11-yamllint-1.33.0" + "store_path": "/nix/store/7f02h17wxc5agk4aqlmzg9had3k6w3kz-python3.11-yamllint-1.33.0" }, "x86_64-linux": { - "store_path": "/nix/store/62g4qvr76m8wf99brc4gmpd7mjwzawwz-python3.11-yamllint-1.33.0" + "store_path": "/nix/store/pab7c31znj2lk0w4iw07ay8r8pzfl6q1-python3.11-yamllint-1.33.0" } } } diff --git a/hack/flakes/flake.lock b/hack/flakes/flake.lock index 3bfd004b1..c79389f60 100644 --- a/hack/flakes/flake.lock +++ b/hack/flakes/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1704626572, + "narHash": "sha256-VwRTEKzK4wSSv64G+g3RLF3t6yBHrhR2VK3kZ5UWisU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "24fe8bb4f552ad3926274d29e083b79d84707da6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/hack/flakes/flake.nix b/hack/flakes/flake.nix index 8a2699b1a..dcd5c6ff0 100644 --- a/hack/flakes/flake.nix +++ b/hack/flakes/flake.nix @@ -2,7 +2,7 @@ description = "Useful flakes for golang and Kubernetes projects"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; }; diff --git a/hack/kind/kind-base-config.yaml b/hack/kind/kind-base-config.yaml index ba9fd4885..c6d909315 100644 --- a/hack/kind/kind-base-config.yaml +++ b/hack/kind/kind-base-config.yaml @@ -6,11 +6,11 @@ apiVersion: kind.x-k8s.io/v1alpha4 containerdConfigPatches: - |- [plugins."io.containerd.grpc.v1.cri".registry.configs."registry-1.docker.io".auth] - username = "${DOCKER_USERNAME}" - password = "${DOCKER_PASSWORD}" + username = "${DOCKER_HUB_USERNAME}" + password = "${DOCKER_HUB_PASSWORD}" - |- [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["${DOCKER_MIRROR:-https://registry-1.docker.io}"] + endpoint = ["${DOCKER_HUB_MIRROR:-https://registry-1.docker.io}"] kubeadmConfigPatches: - | apiVersion: kubelet.config.k8s.io/v1beta1 diff --git a/make/all.mk b/make/all.mk index 8ddf443e1..0ac3ceac7 100644 --- a/make/all.mk +++ b/make/all.mk @@ -11,7 +11,6 @@ include $(INCLUDE_DIR)pre-commit.mk include $(INCLUDE_DIR)go.mk include $(INCLUDE_DIR)goreleaser.mk include $(INCLUDE_DIR)docker.mk -include $(INCLUDE_DIR)ci.mk include $(INCLUDE_DIR)tag.mk include $(INCLUDE_DIR)upx.mk include $(INCLUDE_DIR)addons.mk diff --git a/make/ci.mk b/make/ci.mk deleted file mode 100644 index 2c8eb7635..000000000 --- a/make/ci.mk +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2023 D2iQ, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -CI_DOCKERFILE ?= $(REPO_ROOT)/Dockerfile.ci - -ifneq ($(wildcard $(CI_DOCKERFILE)),) -CI_DOCKER_TAG ?= $(shell (cat $(CI_DOCKERFILE) \ - $(if $(CI_DOCKER_BUILD_ARGS),&& echo $(CI_DOCKER_BUILD_ARGS))) \ - | shasum | awk '{ print $$1 }') -CI_DOCKER_IMG ?= $(GITHUB_ORG)/$(GITHUB_REPOSITORY)-ci:$(CI_DOCKER_TAG) - -.PHONY: ci.docker.ensure -ci.docker.ensure: ## Ensures the docker image is locally available -ci.docker.ensure: dockerauth ; $(info $(M) Ensuring CI Docker image is available locally) - (docker image inspect $(CI_DOCKER_IMG) &>/dev/null && echo '$(CI_DOCKER_IMG) already exists - skipping image build' ) || \ - docker pull $(CI_DOCKER_IMG) || \ - $(MAKE) ci.docker.build - -.PHONY: ci.docker.build -ci.docker.build: ## Builds the CI Docker image -ci.docker.build: dockerauth ; $(info $(M) Building CI Docker image) - DOCKER_BUILDKIT=1 docker build \ - --tag $(CI_DOCKER_IMG) \ - $(if $(CI_DOCKER_BUILD_ARGS),$(addprefix --build-arg ,$(CI_DOCKER_BUILD_ARGS))) \ - -f $(CI_DOCKERFILE) . - -.PHONY: ci.docker.push -ci.docker.push: ## Pushes the CI Docker image -ci.docker.push: ci.docker.ensure ; $(info $(M) Pushes the CI Docker image) - docker push $(CI_DOCKER_IMG) - -.PHONY: ci.docker.run -ci.docker.run: ## Runs the build in the CI Docker image. -ci.docker.run: RUN_WHAT ?= -ci.docker.run: ci.docker.ensure ; $(info $(M) Runs the build in the CI Docker image) - @docker run --rm -i$(if $(RUN_WHAT),,$(if $(INTERACTIVE),t)) \ - -u $(shell id -u):$(shell id -g) \ - -v $(REPO_ROOT):$(REPO_ROOT) \ - -w $(REPO_ROOT) \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -v /etc/docker/certs.d:/etc/docker/certs.d \ - $(if $(DOCKER_USERNAME),-e DOCKER_USERNAME=$(DOCKER_USERNAME)) \ - $(if $(DOCKER_PASSWORD),-e DOCKER_PASSWORD=$(DOCKER_PASSWORD)) \ - $(if $(SSH_AUTH_SOCK),-v $(SSH_AUTH_SOCK):$(SSH_AUTH_SOCK) -e SSH_AUTH_SOCK=$(SSH_AUTH_SOCK)) \ - $(if $(GITHUB_USER_TOKEN),-e GITHUB_USER_TOKEN=$(GITHUB_USER_TOKEN) -e GITHUB_TOKEN=$(GITHUB_USER_TOKEN),$(if $(GITHUB_TOKEN),-e GITHUB_TOKEN=$(GITHUB_TOKEN))) \ - --net=host \ - $(CI_DOCKER_IMG) \ - $(RUN_WHAT) - -endif diff --git a/make/dev.mk b/make/dev.mk index 321ebab69..e293064a3 100644 --- a/make/dev.mk +++ b/make/dev.mk @@ -10,8 +10,9 @@ ifndef SKIP_BUILD $(MAKE) release-snapshot endif kind load docker-image --name $(KIND_CLUSTER_NAME) \ - $$(gojq -r '.[] | select(.type=="Docker Image") | select(.goarch=="$(GOARCH)") | .name' dist/artifacts.json) + ko.local/capi-runtime-extensions:$$(gojq -r .version dist/metadata.json) helm upgrade --install capi-runtime-extensions ./charts/capi-runtime-extensions \ + --set-string image.repository=ko.local/capi-runtime-extensions \ --set-string image.tag=$$(gojq -r .version dist/metadata.json) \ --wait --wait-for-jobs kubectl rollout restart deployment capi-runtime-extensions diff --git a/make/docker.mk b/make/docker.mk index d1be90e38..ff19f937a 100644 --- a/make/docker.mk +++ b/make/docker.mk @@ -3,17 +3,8 @@ .PHONY: dockerauth dockerauth: -ifdef DOCKER_USERNAME -ifdef DOCKER_PASSWORD - echo -n $(DOCKER_PASSWORD) | docker login -u $(DOCKER_USERNAME) --password-stdin +ifdef DOCKER_HUB_USERNAME +ifdef DOCKER_HUB_PASSWORD + echo -n $(DOCKER_HUB_PASSWORD) | docker login -u $(DOCKER_HUB_USERNAME) --password-stdin endif endif - -.PHONY: update-distroless-base-image -update-distroless-base-image: ; $(info $(M) updating distroless base image) - LATEST_DISTROLESS_NONROOT_DIGEST="$$(gcloud container images list-tags gcr.io/distroless/static --format=json | gojq -r '.[] | select(.tags | index("nonroot")) | .digest')"; \ - DISTROLESS_AMD64_DIGEST="$$(crane manifest gcr.io/distroless/static@$${LATEST_DISTROLESS_NONROOT_DIGEST} | gojq -r '.manifests[] | select(.platform.os == "linux" and .platform.architecture == "amd64").digest')"; \ - DISTROLESS_ARM64_DIGEST="$$(crane manifest gcr.io/distroless/static@$${LATEST_DISTROLESS_NONROOT_DIGEST} | gojq -r '.manifests[] | select(.platform.os == "linux" and .platform.architecture == "arm64").digest')"; \ - sed -i -e "s|^\(FROM --platform=linux/amd64 gcr.io/distroless/static@\).\+$$|\1$${DISTROLESS_AMD64_DIGEST} as linux-amd64|" \ - -e "s|^\(FROM --platform=linux/arm64 gcr.io/distroless/static@\).\+$$|\1$${DISTROLESS_ARM64_DIGEST} as linux-arm64|" \ - Dockerfile