Skip to content

Commit fd0240f

Browse files
wcrumwcrum
committed
update logging, push to workflows
Signed-off-by: will <[email protected]>
1 parent 0f9e5b1 commit fd0240f

File tree

7 files changed

+366
-282
lines changed

7 files changed

+366
-282
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Publish Docker Image
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- v2
8+
tags:
9+
- 'v*'
10+
pull_request:
11+
branches:
12+
- main
13+
- v2
14+
15+
env:
16+
REGISTRY: ghcr.io
17+
IMAGE_NAME: wcrum/imageshift
18+
19+
jobs:
20+
build-and-push:
21+
runs-on: ubuntu-latest
22+
permissions:
23+
contents: read
24+
packages: write
25+
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v4
29+
30+
- name: Set up QEMU
31+
uses: docker/setup-qemu-action@v3
32+
33+
- name: Set up Docker Buildx
34+
uses: docker/setup-buildx-action@v3
35+
36+
- name: Log in to Container Registry
37+
if: github.event_name != 'pull_request'
38+
uses: docker/login-action@v3
39+
with:
40+
registry: ${{ env.REGISTRY }}
41+
username: ${{ github.actor }}
42+
password: ${{ secrets.GITHUB_TOKEN }}
43+
44+
- name: Extract metadata (tags, labels)
45+
id: meta
46+
uses: docker/metadata-action@v5
47+
with:
48+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
49+
tags: |
50+
type=ref,event=branch
51+
type=ref,event=pr
52+
type=semver,pattern={{version}}
53+
type=semver,pattern={{major}}.{{minor}}
54+
type=sha
55+
56+
- name: Build and push Docker image
57+
uses: docker/build-push-action@v6
58+
with:
59+
context: .
60+
platforms: linux/amd64,linux/arm64
61+
push: ${{ github.event_name != 'pull_request' }}
62+
tags: ${{ steps.meta.outputs.tags }}
63+
labels: ${{ steps.meta.outputs.labels }}
64+
cache-from: type=gha
65+
cache-to: type=gha,mode=max

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM docker.io/golang:1.23 AS builder
2+
FROM docker.io/golang:1.23.4 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎go.mod‎

Lines changed: 82 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,104 +1,112 @@
11
module github.com/spectrocloud-labs/imageshift
22

3-
go 1.23.0
3+
go 1.25.0
44

55
godebug default=go1.23
66

77
require (
8-
github.com/google/go-containerregistry v0.20.3
9-
github.com/onsi/ginkgo/v2 v2.22.0
10-
github.com/onsi/gomega v1.36.0
11-
k8s.io/api v0.32.0
12-
k8s.io/apimachinery v0.32.0
13-
k8s.io/client-go v0.32.0
14-
sigs.k8s.io/controller-runtime v0.20.0
8+
github.com/google/go-containerregistry v0.20.7
9+
github.com/onsi/ginkgo/v2 v2.28.1
10+
github.com/onsi/gomega v1.39.0
11+
k8s.io/api v0.35.0
12+
k8s.io/apimachinery v0.35.0
13+
k8s.io/client-go v0.35.0
14+
sigs.k8s.io/controller-runtime v0.23.1
1515
)
1616

1717
require (
18-
cel.dev/expr v0.18.0 // indirect
19-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
20-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
18+
cel.dev/expr v0.25.1 // indirect
19+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
20+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2121
github.com/beorn7/perks v1.0.1 // indirect
2222
github.com/blang/semver/v4 v4.0.0 // indirect
23-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
23+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
2424
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2525
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
26+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
2727
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
28-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
28+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2929
github.com/felixge/httpsnoop v1.0.4 // indirect
30-
github.com/fsnotify/fsnotify v1.7.0 // indirect
31-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
32-
github.com/go-logr/logr v1.4.2 // indirect
30+
github.com/fsnotify/fsnotify v1.9.0 // indirect
31+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
32+
github.com/go-logr/logr v1.4.3 // indirect
3333
github.com/go-logr/stdr v1.2.2 // indirect
3434
github.com/go-logr/zapr v1.3.0 // indirect
35-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
36-
github.com/go-openapi/jsonreference v0.20.2 // indirect
37-
github.com/go-openapi/swag v0.23.0 // indirect
35+
github.com/go-openapi/jsonpointer v0.22.4 // indirect
36+
github.com/go-openapi/jsonreference v0.21.4 // indirect
37+
github.com/go-openapi/swag v0.25.4 // indirect
38+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
39+
github.com/go-openapi/swag/conv v0.25.4 // indirect
40+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
41+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
42+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
43+
github.com/go-openapi/swag/loading v0.25.4 // indirect
44+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
45+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
46+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
47+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
48+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
3849
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
39-
github.com/gogo/protobuf v1.3.2 // indirect
40-
github.com/golang/protobuf v1.5.4 // indirect
4150
github.com/google/btree v1.1.3 // indirect
42-
github.com/google/cel-go v0.22.0 // indirect
43-
github.com/google/gnostic-models v0.6.8 // indirect
44-
github.com/google/go-cmp v0.6.0 // indirect
45-
github.com/google/gofuzz v1.2.0 // indirect
46-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
51+
github.com/google/cel-go v0.27.0 // indirect
52+
github.com/google/gnostic-models v0.7.1 // indirect
53+
github.com/google/go-cmp v0.7.0 // indirect
54+
github.com/google/pprof v0.0.0-20260202012954-cb029daf43ef // indirect
4755
github.com/google/uuid v1.6.0 // indirect
48-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
56+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
4957
github.com/inconshreveable/mousetrap v1.1.0 // indirect
50-
github.com/josharian/intern v1.0.0 // indirect
5158
github.com/json-iterator/go v1.1.12 // indirect
52-
github.com/mailru/easyjson v0.7.7 // indirect
5359
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
54-
github.com/modern-go/reflect2 v1.0.2 // indirect
60+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5561
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5662
github.com/opencontainers/go-digest v1.0.0 // indirect
57-
github.com/pkg/errors v0.9.1 // indirect
58-
github.com/prometheus/client_golang v1.19.1 // indirect
59-
github.com/prometheus/client_model v0.6.1 // indirect
60-
github.com/prometheus/common v0.55.0 // indirect
61-
github.com/prometheus/procfs v0.15.1 // indirect
62-
github.com/spf13/cobra v1.8.1 // indirect
63-
github.com/spf13/pflag v1.0.5 // indirect
64-
github.com/stoewer/go-strcase v1.3.0 // indirect
63+
github.com/pmezard/go-difflib v1.0.0 // indirect
64+
github.com/prometheus/client_golang v1.23.2 // indirect
65+
github.com/prometheus/client_model v0.6.2 // indirect
66+
github.com/prometheus/common v0.67.5 // indirect
67+
github.com/prometheus/procfs v0.19.2 // indirect
68+
github.com/spf13/cobra v1.10.2 // indirect
69+
github.com/spf13/pflag v1.0.10 // indirect
6570
github.com/x448/float16 v0.8.4 // indirect
66-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
67-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
68-
go.opentelemetry.io/otel v1.33.0 // indirect
69-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
70-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
71-
go.opentelemetry.io/otel/metric v1.33.0 // indirect
72-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
73-
go.opentelemetry.io/otel/trace v1.33.0 // indirect
74-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
71+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
72+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
73+
go.opentelemetry.io/otel v1.40.0 // indirect
74+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
75+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
76+
go.opentelemetry.io/otel/metric v1.40.0 // indirect
77+
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
78+
go.opentelemetry.io/otel/trace v1.40.0 // indirect
79+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
7580
go.uber.org/multierr v1.11.0 // indirect
76-
go.uber.org/zap v1.27.0 // indirect
77-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
78-
golang.org/x/net v0.34.0 // indirect
79-
golang.org/x/oauth2 v0.25.0 // indirect
80-
golang.org/x/sync v0.10.0 // indirect
81-
golang.org/x/sys v0.29.0 // indirect
82-
golang.org/x/term v0.28.0 // indirect
83-
golang.org/x/text v0.21.0 // indirect
84-
golang.org/x/time v0.7.0 // indirect
85-
golang.org/x/tools v0.29.0 // indirect
86-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
87-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
88-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
89-
google.golang.org/grpc v1.65.1 // indirect
90-
google.golang.org/protobuf v1.36.3 // indirect
91-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
81+
go.uber.org/zap v1.27.1 // indirect
82+
go.yaml.in/yaml/v2 v2.4.3 // indirect
83+
go.yaml.in/yaml/v3 v3.0.4 // indirect
84+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
85+
golang.org/x/mod v0.32.0 // indirect
86+
golang.org/x/net v0.49.0 // indirect
87+
golang.org/x/oauth2 v0.34.0 // indirect
88+
golang.org/x/sync v0.19.0 // indirect
89+
golang.org/x/sys v0.40.0 // indirect
90+
golang.org/x/term v0.39.0 // indirect
91+
golang.org/x/text v0.33.0 // indirect
92+
golang.org/x/time v0.14.0 // indirect
93+
golang.org/x/tools v0.41.0 // indirect
94+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
95+
google.golang.org/genproto/googleapis/api v0.0.0-20260203192932-546029d2fa20 // indirect
96+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260203192932-546029d2fa20 // indirect
97+
google.golang.org/grpc v1.78.0 // indirect
98+
google.golang.org/protobuf v1.36.11 // indirect
99+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
92100
gopkg.in/inf.v0 v0.9.1 // indirect
93-
gopkg.in/yaml.v3 v3.0.1 // indirect
94-
k8s.io/apiextensions-apiserver v0.32.0 // indirect
95-
k8s.io/apiserver v0.32.0 // indirect
96-
k8s.io/component-base v0.32.0 // indirect
101+
k8s.io/apiextensions-apiserver v0.35.0 // indirect
102+
k8s.io/apiserver v0.35.0 // indirect
103+
k8s.io/component-base v0.35.0 // indirect
97104
k8s.io/klog/v2 v2.130.1 // indirect
98-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
99-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
100-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
101-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
102-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
103-
sigs.k8s.io/yaml v1.4.0 // indirect
105+
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
106+
k8s.io/utils v0.0.0-20260108192941-914a6e750570 // indirect
107+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
108+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
109+
sigs.k8s.io/randfill v1.0.0 // indirect
110+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
111+
sigs.k8s.io/yaml v1.6.0 // indirect
104112
)

0 commit comments

Comments
 (0)