diff --git a/apis/localresource/v1alpha1/types.go b/apis/localresource/v1alpha1/types.go index 3f2fc5d..cd3165b 100644 --- a/apis/localresource/v1alpha1/types.go +++ b/apis/localresource/v1alpha1/types.go @@ -2,8 +2,8 @@ package v1alpha1 import ( commonapis "github.com/krateoplatformops/git-provider/apis/common/v1alpha1" - prv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" - "github.com/krateoplatformops/provider-runtime/pkg/resource" + prv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" + "github.com/krateo-platformops/provider-runtime/pkg/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/localresource/v1alpha1/zz_generated.deepcopy.go b/apis/localresource/v1alpha1/zz_generated.deepcopy.go index e70b2c0..3e4c709 100644 --- a/apis/localresource/v1alpha1/zz_generated.deepcopy.go +++ b/apis/localresource/v1alpha1/zz_generated.deepcopy.go @@ -6,7 +6,7 @@ package v1alpha1 import ( commonv1alpha1 "github.com/krateoplatformops/git-provider/apis/common/v1alpha1" - "github.com/krateoplatformops/provider-runtime/apis/common/v1" + "github.com/krateo-platformops/provider-runtime/apis/common/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/repo/v1alpha1/types.go b/apis/repo/v1alpha1/types.go index dabfc5a..cb16b56 100644 --- a/apis/repo/v1alpha1/types.go +++ b/apis/repo/v1alpha1/types.go @@ -2,9 +2,9 @@ package v1alpha1 import ( commonapis "github.com/krateoplatformops/git-provider/apis/common/v1alpha1" - commonv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" - prv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" - "github.com/krateoplatformops/provider-runtime/pkg/resource" + commonv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" + prv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" + "github.com/krateo-platformops/provider-runtime/pkg/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/apis/repo/v1alpha1/zz_generated.deepcopy.go b/apis/repo/v1alpha1/zz_generated.deepcopy.go index e1be511..4558cd1 100644 --- a/apis/repo/v1alpha1/zz_generated.deepcopy.go +++ b/apis/repo/v1alpha1/zz_generated.deepcopy.go @@ -6,7 +6,7 @@ package v1alpha1 import ( commonv1alpha1 "github.com/krateoplatformops/git-provider/apis/common/v1alpha1" - "github.com/krateoplatformops/provider-runtime/apis/common/v1" + "github.com/krateo-platformops/provider-runtime/apis/common/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/go.mod b/go.mod index 084a0ce..2b9fb84 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 github.com/go-git/go-git/v5 v5.19.2 github.com/go-logr/logr v1.4.3 - github.com/krateoplatformops/plumbing v1.7.1 - github.com/krateoplatformops/provider-runtime v1.2.1 + github.com/krateo-platformops/plumbing v1.14.3 + github.com/krateo-platformops/provider-runtime v1.3.1 github.com/moby/moby/api v1.52.0 github.com/moby/moby/client v0.1.0 github.com/pkg/errors v0.9.1 @@ -19,7 +19,7 @@ require ( github.com/stoewer/go-strcase v1.3.0 github.com/stretchr/testify v1.11.1 k8s.io/api v0.35.3 - k8s.io/apiextensions-apiserver v0.35.0 + k8s.io/apiextensions-apiserver v0.35.1 k8s.io/apimachinery v0.35.3 k8s.io/client-go v0.35.3 sigs.k8s.io/controller-runtime v0.23.3 @@ -104,22 +104,24 @@ require ( github.com/x448/float16 v0.8.4 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect + go.opentelemetry.io/contrib/bridges/otelslog v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect go.opentelemetry.io/otel v1.43.0 // indirect + go.opentelemetry.io/otel/log v0.9.0 // indirect go.opentelemetry.io/otel/metric v1.43.0 // indirect go.opentelemetry.io/otel/trace v1.43.0 // indirect go.yaml.in/yaml/v2 v2.4.3 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/crypto v0.53.0 // indirect - golang.org/x/mod v0.37.0 // indirect - golang.org/x/net v0.56.0 // indirect + golang.org/x/crypto v0.55.0 // indirect + golang.org/x/mod v0.38.0 // indirect + golang.org/x/net v0.57.0 // indirect golang.org/x/oauth2 v0.35.0 // indirect - golang.org/x/sync v0.21.0 // indirect - golang.org/x/sys v0.46.0 // indirect - golang.org/x/term v0.44.0 // indirect - golang.org/x/text v0.39.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/term v0.45.0 // indirect + golang.org/x/text v0.41.0 // indirect golang.org/x/time v0.12.0 // indirect - golang.org/x/tools v0.47.0 // indirect + golang.org/x/tools v0.48.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect @@ -128,8 +130,8 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/code-generator v0.35.0 // indirect - k8s.io/component-base v0.35.0 // indirect + k8s.io/code-generator v0.35.1 // indirect + k8s.io/component-base v0.35.1 // indirect k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect diff --git a/go.sum b/go.sum index f653f7c..fd66876 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY= -cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= +cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4= +cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8= dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= @@ -111,8 +111,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5 h1:xhMrHhTJ6zxu3gA4enFM9MLn9AY7613teCdFnlUVbSQ= -github.com/google/pprof v0.0.0-20250630185457-6e76a2b096b5/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA= +github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8= +github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= @@ -147,10 +147,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/krateoplatformops/plumbing v1.7.1 h1:ZAjeAbfSNE9isrfb90k51IGtSp1hQjw55ndVnxcHtaE= -github.com/krateoplatformops/plumbing v1.7.1/go.mod h1:L8dMKmq9hO1tz9NzJPlryBj618J5w0PYt8z6fzAbBvs= -github.com/krateoplatformops/provider-runtime v1.2.1 h1:eS+oTc0Oscdp9GURe77uS22Q6FdqfUFc86iIpdUu5NQ= -github.com/krateoplatformops/provider-runtime v1.2.1/go.mod h1:QoRytq8drA9+qPiXT3iVwLPOhgxR4beOKcmsiImc0lY= +github.com/krateo-platformops/plumbing v1.14.3 h1:g60QTgbhIsZVTFq9JZveNx2QZauVyFeWHUAVxahxKRU= +github.com/krateo-platformops/plumbing v1.14.3/go.mod h1:JMHwVbS2vdA/OSm3Gi3QCDTntFjPmrGtqZ6LQuhciZQ= +github.com/krateo-platformops/provider-runtime v1.3.1 h1:X9kbeePcZEpMXQks69VOn+i3ZMWPT380sRF9Nf1MAAU= +github.com/krateo-platformops/provider-runtime v1.3.1/go.mod h1:m/nv2S97NIkQNZ/SOWRn8/wStU4vlU4L8OwZC7xBtoQ= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= @@ -253,6 +253,8 @@ github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= +go.opentelemetry.io/contrib/bridges/otelslog v0.8.0 h1:G3sKsNueSdxuACINFxKrQeimAIst0A5ytA2YJH+3e1c= +go.opentelemetry.io/contrib/bridges/otelslog v0.8.0/go.mod h1:ptJm3wizguEPurZgarDAwOeX7O0iMR7l+QvIVenhYdE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= @@ -261,6 +263,8 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glB go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE= +go.opentelemetry.io/otel/log v0.9.0 h1:0OiWRefqJ2QszpCiqwGO0u9ajMPe17q6IscQvvp3czY= +go.opentelemetry.io/otel/log v0.9.0/go.mod h1:WPP4OJ+RBkQ416jrFCQFuFKtXKD6mOoYCQm6ykK8VaU= go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= @@ -282,19 +286,19 @@ go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto= -golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio= +golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M= +golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis= golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f h1:W3F4c+6OLc6H2lb//N1q4WpJkhzJCK5J6kUi1NTVXfM= golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f/go.mod h1:J1xhfL/vlindoeF/aINzNzt2Bket5bjo9sdOYzOsU80= -golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= -golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk= +golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= -golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= golang.org/x/oauth2 v0.35.0 h1:Mv2mzuHuZuY2+bkyWXIHMfhNdJAdwW3FuWeCPYN5GVQ= golang.org/x/oauth2 v0.35.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= -golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM= -golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -302,19 +306,19 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw= -golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc= -golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y= +golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0= +golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.39.0 h1:UbZz4pLOvn600D6Oh6GGEI6VAmndrEBLv8/6BEXzyus= -golang.org/x/text v0.39.0/go.mod h1:3UwRclnC2g0TU9x8PZiyfOajCd1zaUNHF9cvqcQZ+ZM= +golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= +golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= -golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= +golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE= +golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk= golang.org/x/tools/go/expect v0.1.1-deprecated h1:jpBZDwmgPhXsKZC6WhL20P4b/wmnpsEAGHaNy0n/rJM= golang.org/x/tools/go/expect v0.1.1-deprecated/go.mod h1:eihoPOH+FgIqa3FpoTwguz/bVUSGBlGQU67vpBeOrBY= golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated h1:1h2MnaIAIXISqTFKdENegdpAgUXz6NrPEsbIeWaBRvM= @@ -351,18 +355,18 @@ gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA= k8s.io/api v0.35.3 h1:pA2fiBc6+N9PDf7SAiluKGEBuScsTzd2uYBkA5RzNWQ= k8s.io/api v0.35.3/go.mod h1:9Y9tkBcFwKNq2sxwZTQh1Njh9qHl81D0As56tu42GA4= -k8s.io/apiextensions-apiserver v0.35.0 h1:3xHk2rTOdWXXJM+RDQZJvdx0yEOgC0FgQ1PlJatA5T4= -k8s.io/apiextensions-apiserver v0.35.0/go.mod h1:E1Ahk9SADaLQ4qtzYFkwUqusXTcaV2uw3l14aqpL2LU= +k8s.io/apiextensions-apiserver v0.35.1 h1:p5vvALkknlOcAqARwjS20kJffgzHqwyQRM8vHLwgU7w= +k8s.io/apiextensions-apiserver v0.35.1/go.mod h1:2CN4fe1GZ3HMe4wBr25qXyJnJyZaquy4nNlNmb3R7AQ= k8s.io/apimachinery v0.35.3 h1:MeaUwQCV3tjKP4bcwWGgZ/cp/vpsRnQzqO6J6tJyoF8= k8s.io/apimachinery v0.35.3/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns= -k8s.io/apiserver v0.35.0 h1:CUGo5o+7hW9GcAEF3x3usT3fX4f9r8xmgQeCBDaOgX4= -k8s.io/apiserver v0.35.0/go.mod h1:QUy1U4+PrzbJaM3XGu2tQ7U9A4udRRo5cyxkFX0GEds= +k8s.io/apiserver v0.35.1 h1:potxdhhTL4i6AYAa2QCwtlhtB1eCdWQFvJV6fXgJzxs= +k8s.io/apiserver v0.35.1/go.mod h1:BiL6Dd3A2I/0lBnteXfWmCFobHM39vt5+hJQd7Lbpi4= k8s.io/client-go v0.35.3 h1:s1lZbpN4uI6IxeTM2cpdtrwHcSOBML1ODNTCCfsP1pg= k8s.io/client-go v0.35.3/go.mod h1:RzoXkc0mzpWIDvBrRnD+VlfXP+lRzqQjCmKtiwZ8Q9c= -k8s.io/code-generator v0.35.0 h1:TvrtfKYZTm9oDF2z+veFKSCcgZE3Igv0svY+ehCmjHQ= -k8s.io/code-generator v0.35.0/go.mod h1:iS1gvVf3c/T71N5DOGYO+Gt3PdJ6B9LYSvIyQ4FHzgc= -k8s.io/component-base v0.35.0 h1:+yBrOhzri2S1BVqyVSvcM3PtPyx5GUxCK2tinZz1G94= -k8s.io/component-base v0.35.0/go.mod h1:85SCX4UCa6SCFt6p3IKAPej7jSnF3L8EbfSyMZayJR0= +k8s.io/code-generator v0.35.1 h1:yLKR2la7Z9cWT5qmk67ayx8xXLM4RRKQMnC8YPvTWRI= +k8s.io/code-generator v0.35.1/go.mod h1:F2Fhm7aA69tC/VkMXLDokdovltXEF026Tb9yfQXQWKg= +k8s.io/component-base v0.35.1 h1:XgvpRf4srp037QWfGBLFsYMUQJkE5yMa94UsJU7pmcE= +k8s.io/component-base v0.35.1/go.mod h1:HI/6jXlwkiOL5zL9bqA3en1Ygv60F03oEpnuU1G56Bs= k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ= k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= diff --git a/internal/clients/git/git.go b/internal/clients/git/git.go index 38d2b40..7660dbe 100644 --- a/internal/clients/git/git.go +++ b/internal/clients/git/git.go @@ -15,8 +15,8 @@ import ( "sync" "time" - contexttools "github.com/krateoplatformops/provider-runtime/pkg/context" - "github.com/krateoplatformops/provider-runtime/pkg/logging" + contexttools "github.com/krateo-platformops/provider-runtime/pkg/context" + "github.com/krateo-platformops/provider-runtime/pkg/logging" "github.com/go-git/go-git/v5/plumbing/cache" gitclient "github.com/go-git/go-git/v5/plumbing/transport/client" @@ -33,7 +33,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/storage/filesystem" "github.com/krateoplatformops/git-provider/internal/utils" - "github.com/krateoplatformops/plumbing/ptr" + "github.com/krateo-platformops/plumbing/ptr" ) var ( diff --git a/internal/controllers/common/option/option.go b/internal/controllers/common/option/option.go index 605d4f0..1108cf9 100644 --- a/internal/controllers/common/option/option.go +++ b/internal/controllers/common/option/option.go @@ -3,7 +3,7 @@ package option import ( "time" - "github.com/krateoplatformops/provider-runtime/pkg/controller" + "github.com/krateo-platformops/provider-runtime/pkg/controller" ) type GitOptions struct { diff --git a/internal/controllers/localresource/connect_test.go b/internal/controllers/localresource/connect_test.go index 733d328..6de0522 100644 --- a/internal/controllers/localresource/connect_test.go +++ b/internal/controllers/localresource/connect_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - commonv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" - "github.com/krateoplatformops/provider-runtime/pkg/logging" + commonv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" + "github.com/krateo-platformops/provider-runtime/pkg/logging" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/controllers/localresource/localresource.go b/internal/controllers/localresource/localresource.go index eb3d52d..d7e7431 100644 --- a/internal/controllers/localresource/localresource.go +++ b/internal/controllers/localresource/localresource.go @@ -7,8 +7,8 @@ import ( "github.com/go-git/go-git/v5/plumbing/object" "github.com/pkg/errors" - commonv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" - "github.com/krateoplatformops/provider-runtime/pkg/resource" + commonv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" + "github.com/krateo-platformops/provider-runtime/pkg/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -18,11 +18,11 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - plumbingevent "github.com/krateoplatformops/plumbing/kubeutil/event" - "github.com/krateoplatformops/plumbing/kubeutil/eventrecorder" - "github.com/krateoplatformops/provider-runtime/pkg/logging" - "github.com/krateoplatformops/provider-runtime/pkg/meta" - "github.com/krateoplatformops/provider-runtime/pkg/ratelimiter" + plumbingevent "github.com/krateo-platformops/plumbing/kubeutil/event" + "github.com/krateo-platformops/plumbing/kubeutil/eventrecorder" + "github.com/krateo-platformops/provider-runtime/pkg/logging" + "github.com/krateo-platformops/provider-runtime/pkg/meta" + "github.com/krateo-platformops/provider-runtime/pkg/ratelimiter" localResourcev1alpha1 "github.com/krateoplatformops/git-provider/apis/localresource/v1alpha1" "github.com/krateoplatformops/git-provider/internal/clients/git" @@ -33,9 +33,9 @@ import ( "github.com/krateoplatformops/git-provider/internal/tools/copier" "github.com/krateoplatformops/git-provider/internal/tools/localfs" "github.com/krateoplatformops/git-provider/internal/tools/template" - "github.com/krateoplatformops/plumbing/ptr" - contexttools "github.com/krateoplatformops/provider-runtime/pkg/context" - "github.com/krateoplatformops/provider-runtime/pkg/reconciler" + "github.com/krateo-platformops/plumbing/ptr" + contexttools "github.com/krateo-platformops/provider-runtime/pkg/context" + "github.com/krateo-platformops/provider-runtime/pkg/reconciler" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controllers/localresource/localresource_test.go b/internal/controllers/localresource/localresource_test.go index b26def9..ce7648f 100644 --- a/internal/controllers/localresource/localresource_test.go +++ b/internal/controllers/localresource/localresource_test.go @@ -28,10 +28,10 @@ import ( "github.com/moby/moby/client" "github.com/go-logr/logr" - prettylog "github.com/krateoplatformops/plumbing/slogs/pretty" - "github.com/krateoplatformops/provider-runtime/pkg/controller" - "github.com/krateoplatformops/provider-runtime/pkg/logging" - "github.com/krateoplatformops/provider-runtime/pkg/ratelimiter" + "github.com/krateo-platformops/plumbing/logger" + "github.com/krateo-platformops/provider-runtime/pkg/controller" + "github.com/krateo-platformops/provider-runtime/pkg/logging" + "github.com/krateo-platformops/provider-runtime/pkg/ratelimiter" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" @@ -39,8 +39,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - "github.com/krateoplatformops/plumbing/e2e" - xenv "github.com/krateoplatformops/plumbing/env" + "github.com/krateo-platformops/plumbing/e2e" + xenv "github.com/krateo-platformops/plumbing/env" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" clientsetscheme "k8s.io/client-go/kubernetes/scheme" @@ -368,14 +368,7 @@ func TestController(t *testing.T) { os.Setenv("DEBUG", "TRUE") setupController := func(ctx context.Context, cfg *envconf.Config) (context.Context, error) { - lh := prettylog.New(&slog.HandlerOptions{ - Level: slog.LevelDebug, - AddSource: false, - }, - prettylog.WithDestinationWriter(os.Stderr), - prettylog.WithColor(), - prettylog.WithOutputEmptyAttrs(), - ) + lh := logger.NewHandler(true, os.Stderr) logrlog := logr.FromSlogHandler(slog.New(lh).Handler()) log := logging.NewLogrLogger(logrlog) diff --git a/internal/controllers/repo/configmap_values_test.go b/internal/controllers/repo/configmap_values_test.go index b1c2a2a..7ac0536 100644 --- a/internal/controllers/repo/configmap_values_test.go +++ b/internal/controllers/repo/configmap_values_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - commonv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" - "github.com/krateoplatformops/provider-runtime/pkg/logging" + commonv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" + "github.com/krateo-platformops/provider-runtime/pkg/logging" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controllers/repo/repo.go b/internal/controllers/repo/repo.go index 5ba0703..faeb28f 100644 --- a/internal/controllers/repo/repo.go +++ b/internal/controllers/repo/repo.go @@ -8,17 +8,17 @@ import ( "os" "strings" - commonv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" + commonv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/krateoplatformops/provider-runtime/pkg/logging" - "github.com/krateoplatformops/provider-runtime/pkg/meta" - "github.com/krateoplatformops/provider-runtime/pkg/ratelimiter" + "github.com/krateo-platformops/provider-runtime/pkg/logging" + "github.com/krateo-platformops/provider-runtime/pkg/meta" + "github.com/krateo-platformops/provider-runtime/pkg/ratelimiter" - "github.com/krateoplatformops/provider-runtime/pkg/reconciler" - "github.com/krateoplatformops/provider-runtime/pkg/resource" + "github.com/krateo-platformops/provider-runtime/pkg/reconciler" + "github.com/krateo-platformops/provider-runtime/pkg/resource" repov1alpha1 "github.com/krateoplatformops/git-provider/apis/repo/v1alpha1" "github.com/krateoplatformops/git-provider/internal/clients/git" @@ -26,9 +26,9 @@ import ( "github.com/krateoplatformops/git-provider/internal/controllers/common/templating" "github.com/krateoplatformops/git-provider/internal/tools/copier" "github.com/krateoplatformops/git-provider/internal/tools/template" - plumbingevent "github.com/krateoplatformops/plumbing/kubeutil/event" - "github.com/krateoplatformops/plumbing/kubeutil/eventrecorder" - "github.com/krateoplatformops/plumbing/ptr" + plumbingevent "github.com/krateo-platformops/plumbing/kubeutil/event" + "github.com/krateo-platformops/plumbing/kubeutil/eventrecorder" + "github.com/krateo-platformops/plumbing/ptr" record "k8s.io/client-go/tools/events" ) diff --git a/internal/controllers/repo/repo_status_test.go b/internal/controllers/repo/repo_status_test.go index af5fe29..d58a03e 100644 --- a/internal/controllers/repo/repo_status_test.go +++ b/internal/controllers/repo/repo_status_test.go @@ -6,7 +6,7 @@ import ( "testing" repov1alpha1 "github.com/krateoplatformops/git-provider/apis/repo/v1alpha1" - commonv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" + commonv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/controllers/repo/repo_test.go b/internal/controllers/repo/repo_test.go index eb017ca..632639d 100644 --- a/internal/controllers/repo/repo_test.go +++ b/internal/controllers/repo/repo_test.go @@ -26,16 +26,16 @@ import ( "github.com/moby/moby/client" "github.com/stretchr/testify/require" + "github.com/krateo-platformops/plumbing/logger" + commonv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" + "github.com/krateo-platformops/provider-runtime/pkg/controller" + "github.com/krateo-platformops/provider-runtime/pkg/logging" + "github.com/krateo-platformops/provider-runtime/pkg/ratelimiter" "github.com/krateoplatformops/git-provider/apis" repov1alpha1 "github.com/krateoplatformops/git-provider/apis/repo/v1alpha1" gitclient "github.com/krateoplatformops/git-provider/internal/clients/git" "github.com/krateoplatformops/git-provider/internal/controllers/common/option" "github.com/krateoplatformops/git-provider/internal/controllers/common/templating" - prettylog "github.com/krateoplatformops/plumbing/slogs/pretty" - commonv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" - "github.com/krateoplatformops/provider-runtime/pkg/controller" - "github.com/krateoplatformops/provider-runtime/pkg/logging" - "github.com/krateoplatformops/provider-runtime/pkg/ratelimiter" v1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" @@ -44,7 +44,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - xenv "github.com/krateoplatformops/plumbing/env" + xenv "github.com/krateo-platformops/plumbing/env" "sigs.k8s.io/e2e-framework/klient/decoder" "sigs.k8s.io/e2e-framework/klient/k8s/resources" "sigs.k8s.io/e2e-framework/pkg/env" @@ -243,14 +243,7 @@ func waitForGitea(ctx context.Context) error { } func setupController(ctx context.Context, cfg *envconf.Config) (context.Context, error) { - lh := prettylog.New(&slog.HandlerOptions{ - Level: slog.LevelDebug, - AddSource: false, - }, - prettylog.WithDestinationWriter(os.Stderr), - prettylog.WithColor(), - prettylog.WithOutputEmptyAttrs(), - ) + lh := logger.NewHandler(true, os.Stderr) logrlog := logr.FromSlogHandler(slog.New(lh).Handler()) log := logging.NewLogrLogger(logrlog) diff --git a/internal/controllers/repo/utils.go b/internal/controllers/repo/utils.go index 2c2f0e2..2050511 100644 --- a/internal/controllers/repo/utils.go +++ b/internal/controllers/repo/utils.go @@ -9,7 +9,7 @@ import ( repov1alpha1 "github.com/krateoplatformops/git-provider/apis/repo/v1alpha1" "github.com/go-git/go-git/v5/plumbing/transport" - "github.com/krateoplatformops/provider-runtime/pkg/resource" + "github.com/krateo-platformops/provider-runtime/pkg/resource" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/controllers/repo/utils_test.go b/internal/controllers/repo/utils_test.go index 8212e69..8451ebb 100644 --- a/internal/controllers/repo/utils_test.go +++ b/internal/controllers/repo/utils_test.go @@ -6,7 +6,7 @@ import ( githttp "github.com/go-git/go-git/v5/plumbing/transport/http" repov1alpha1 "github.com/krateoplatformops/git-provider/apis/repo/v1alpha1" - commonv1 "github.com/krateoplatformops/provider-runtime/apis/common/v1" + commonv1 "github.com/krateo-platformops/provider-runtime/apis/common/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" diff --git a/internal/tools/localfs/localfs.go b/internal/tools/localfs/localfs.go index 33bdd1a..0cb68a2 100644 --- a/internal/tools/localfs/localfs.go +++ b/internal/tools/localfs/localfs.go @@ -8,7 +8,7 @@ import ( "github.com/go-git/go-billy/v5" "github.com/go-git/go-billy/v5/osfs" - "github.com/krateoplatformops/plumbing/jqutil" + "github.com/krateo-platformops/plumbing/jqutil" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" diff --git a/main.go b/main.go index 30ab6e8..9eef14b 100644 --- a/main.go +++ b/main.go @@ -11,16 +11,16 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache" "github.com/go-logr/logr" + "github.com/krateo-platformops/plumbing/env" + "github.com/krateo-platformops/plumbing/logger" + "github.com/krateo-platformops/provider-runtime/pkg/logging" + "github.com/krateo-platformops/provider-runtime/pkg/ratelimiter" "github.com/krateoplatformops/git-provider/apis" - "github.com/krateoplatformops/plumbing/env" - prettylog "github.com/krateoplatformops/plumbing/slogs/pretty" - "github.com/krateoplatformops/provider-runtime/pkg/logging" - "github.com/krateoplatformops/provider-runtime/pkg/ratelimiter" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" + "github.com/krateo-platformops/provider-runtime/pkg/controller" "github.com/krateoplatformops/git-provider/internal/controllers" "github.com/krateoplatformops/git-provider/internal/controllers/common/option" - "github.com/krateoplatformops/provider-runtime/pkg/controller" "github.com/stoewer/go-strcase" ) @@ -55,14 +55,11 @@ func main() { logLevel = slog.LevelDebug } - lh := prettylog.New(&slog.HandlerOptions{ - Level: logLevel, - AddSource: false, - }, - prettylog.WithDestinationWriter(os.Stderr), - prettylog.WithColor(), - prettylog.WithOutputEmptyAttrs(), - ) + // The fork's plumbing has no slogs/pretty. Use the shared structured handler instead, which is + // what every other Krateo component emits: one JSON object per line in the OTel log model, so + // git-provider's logs become logs-ingester compatible like the rest of the platform. This is a + // deliberate behaviour change from the previous coloured console output. + lh := logger.NewHandler(logLevel == slog.LevelDebug, os.Stderr) logrlog := logr.FromSlogHandler(slog.New(lh).Handler()) log := logging.NewLogrLogger(logrlog)