created root gomod and migrate monopod accordingly (#1205)

Signed-off-by: Josh Wolf <[email protected]>

.github/actions/generate-matrix/action.yml

@@ -16,29 +16,14 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-      with:
-        repository: ${{ inputs.repository }}
-        ref: ${{ inputs.ref }}
-        token: ${{ inputs.token }}
-        path: monopod-setup-gha
     - uses: actions/setup-go@v3
       with:
         go-version: '1.20'
-    - id: monopod
-      shell: bash
+
+    # Build and install monopod.
+    - shell: bash
       run: |
-        set -x
-        (cd monopod-setup-gha/monopod/ && go build -o /tmp/bin/monopod monopod.go)
-        rm -rf monopod-setup-gha/
-    - if: inputs.overrideCheckoutRef == '' && inputs.overrideCheckoutRepository == ''
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-    - if: inputs.overrideCheckoutRef != '' || inputs.overrideCheckoutRepository != ''
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-      with:
-        clean: false
-        ref: ${{ inputs.overrideCheckoutRef }}
-        repository: ${{ inputs.overrideCheckoutRepository }}
+        go install ./monopod
 
     - id: generate-matrix
       shell: bash

.github/actions/verify-readme/action.yml

@@ -9,24 +9,14 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
-      with:
-        repository: ${{ inputs.repository }}
-        ref: ${{ inputs.ref }}
-        token: ${{ inputs.token }}
-        path: monopod-setup-gha
-    - uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 # v3.4.0
+    - uses: actions/setup-go@v3
       with:
         go-version: '1.20'
-        check-latest: true
 
     # Build and install monopod.
     - shell: bash
       run: |
-        set -x
-        (cd monopod-setup-gha/monopod/ && go build -o /tmp/bin/monopod monopod.go)
-        echo /tmp/bin >> $GITHUB_PATH
-        rm -rf monopod-setup-gha/
+        go install ./monopod
 
     # Lint apko configs.
     - shell: bash

.github/dependabot.yml

@@ -5,7 +5,7 @@ updates:
     schedule:
       interval: "daily"
   - package-ecosystem: gomod
-    directory: "./monopod"
+    directory: "./"
     schedule:
       interval: "daily"
   - package-ecosystem: terraform

monopod/go.mod → go.mod

@@ -1,52 +1,49 @@
-module github.com/chainguard-images/images/monopod
+module github.com/chainguard-images/images
 
-go 1.19
+go 1.20
 
 require (
-	chainguard.dev/apko v0.8.0
+	chainguard.dev/apko v0.10.0
 	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/spf13/cobra v1.7.0
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
-	golang.org/x/text v0.10.0
+	golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb
+	golang.org/x/text v0.12.0
 	gopkg.in/yaml.v3 v3.0.1
-	sigs.k8s.io/release-utils v0.7.4
+	sigs.k8s.io/release-utils v0.7.5-0.20230601212346-3866fe05b204
 )
 
 require (
 	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
 	github.com/acomagu/bufpipe v1.0.4 // indirect
 	github.com/cloudflare/circl v1.3.3 // indirect
 	github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect
 	github.com/go-git/go-billy/v5 v5.4.1 // indirect
 	github.com/go-git/go-git/v5 v5.6.1 // indirect
-	github.com/google/go-containerregistry v0.14.1-0.20230425172351-b7c6e9dc3944 // indirect
+	github.com/google/go-containerregistry v0.15.2 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/imdario/mergo v0.3.15 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/jinzhu/copier v0.3.5 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
-	github.com/onsi/gomega v1.23.0 // indirect
 	github.com/pjbgf/sha1cd v0.3.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/sergi/go-diff v1.2.0 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/skeema/knownhosts v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
-	golang.org/x/crypto v0.8.0 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/term v0.7.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
+	golang.org/x/crypto v0.10.0 // indirect
+	golang.org/x/mod v0.11.0 // indirect
+	golang.org/x/net v0.11.0 // indirect
+	golang.org/x/sys v0.9.0 // indirect
+	golang.org/x/term v0.9.0 // indirect
+	golang.org/x/tools v0.9.3 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )