diff --git a/go.mod b/go.mod index 3a4c722a9f..9e655b1b29 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/cli/go-gh/v2 v2.13.0 github.com/go-logr/zapr v1.3.0 github.com/google/go-cmp v0.7.0 - github.com/konflux-ci/tekton-kueue v0.0.0-20251231110853-e7a97991aa34 + github.com/konflux-ci/tekton-kueue v0.3.0 github.com/manifestival/client-go-client v0.6.0 github.com/manifestival/manifestival v0.7.2 github.com/markbates/inflect v1.0.4 @@ -189,7 +189,6 @@ require ( github.com/google/go-github/v73 v73.0.0 // indirect github.com/google/go-querystring v1.2.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect github.com/google/s2a-go v0.1.9 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.9 // indirect diff --git a/go.sum b/go.sum index 8179b41738..83dfcca3dc 100644 --- a/go.sum +++ b/go.sum @@ -1399,6 +1399,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= +github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= @@ -2212,8 +2214,8 @@ github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdB github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= -github.com/konflux-ci/tekton-kueue v0.0.0-20251231110853-e7a97991aa34 h1:qxaxysF/qq/vxpIV6E9ScpbatxNC8N1h0x1pD+8Qx60= -github.com/konflux-ci/tekton-kueue v0.0.0-20251231110853-e7a97991aa34/go.mod h1:upU3b1xhuGQ33WBt1IjYcc3oZnuUW1GSN5MmTfi12hc= +github.com/konflux-ci/tekton-kueue v0.3.0 h1:H8BkNX2gGjJyeF1LDQ60aXP6ac5fFe0B+1IoXHF73sM= +github.com/konflux-ci/tekton-kueue v0.3.0/go.mod h1:41eWe0IpVz67+UGncc+55+ku4KJwDWU+uUfbeXNCN5c= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -2374,8 +2376,8 @@ github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/ github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= -github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus= -github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8= +github.com/onsi/ginkgo/v2 v2.25.3 h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw= +github.com/onsi/ginkgo/v2 v2.25.3/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= @@ -2399,8 +2401,8 @@ github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16A github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= -github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y= -github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= +github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= +github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k= github.com/open-policy-agent/opa v1.10.1 h1:haIvxZSPky8HLjRrvQwWAjCPLg8JDFSZMbbG4yyUHgY= github.com/open-policy-agent/opa v1.10.1/go.mod h1:7uPI3iRpOalJ0BhK6s1JALWPU9HvaV1XeBSSMZnr/PM= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= diff --git a/vendor/github.com/konflux-ci/tekton-kueue/pkg/common/common_utils.go b/vendor/github.com/konflux-ci/tekton-kueue/pkg/common/common_utils.go new file mode 100644 index 0000000000..b611d51d19 --- /dev/null +++ b/vendor/github.com/konflux-ci/tekton-kueue/pkg/common/common_utils.go @@ -0,0 +1,17 @@ +package common + +import ( + "errors" + "os" +) + +const namespaceFile = "/var/run/secrets/kubernetes.io/serviceaccount/namespace" + +func GetCurrentNamespace() (string, error) { + bytes, err := os.ReadFile(namespaceFile) + if err != nil { + return "", errors.New("not able to read namespace file: " + namespaceFile) + } + namespace := string(bytes) + return namespace, nil +} diff --git a/vendor/github.com/konflux-ci/tekton-kueue/pkg/config/config_type.go b/vendor/github.com/konflux-ci/tekton-kueue/pkg/config/config_type.go index 2b15a5881d..740eab1ff7 100644 --- a/vendor/github.com/konflux-ci/tekton-kueue/pkg/config/config_type.go +++ b/vendor/github.com/konflux-ci/tekton-kueue/pkg/config/config_type.go @@ -1,5 +1,4 @@ // +k8s:deepcopy-gen=package - package config /* @@ -19,16 +18,9 @@ limitations under the License. */ type Config struct { - MultiKueueConfig `json:",inline"` - TektonKueueConfig `json:",inline"` -} - -type MultiKueueConfig struct { - MultiKueueOverride bool `json:"multiKueueOverride,omitempty"` -} -type TektonKueueConfig struct { - QueueName string `json:"queueName,omitempty"` - CEL CEL `json:"cel,omitempty"` + QueueName string `json:"queueName,omitempty"` + MultiKueueOverride bool `json:"multiKueueOverride,omitempty"` + CEL CEL `json:"cel,omitempty"` } type CEL struct { diff --git a/vendor/github.com/konflux-ci/tekton-kueue/pkg/config/zz_generated.deepcopy.go b/vendor/github.com/konflux-ci/tekton-kueue/pkg/config/zz_generated.deepcopy.go index b763b02203..56d676f624 100644 --- a/vendor/github.com/konflux-ci/tekton-kueue/pkg/config/zz_generated.deepcopy.go +++ b/vendor/github.com/konflux-ci/tekton-kueue/pkg/config/zz_generated.deepcopy.go @@ -1,5 +1,21 @@ //go:build !ignore_autogenerated +/* +Copyright 2025. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + // Code generated by controller-gen. DO NOT EDIT. package config @@ -29,8 +45,7 @@ func (in *CEL) DeepCopy() *CEL { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Config) DeepCopyInto(out *Config) { *out = *in - out.MultiKueueConfig = in.MultiKueueConfig - in.TektonKueueConfig.DeepCopyInto(&out.TektonKueueConfig) + in.CEL.DeepCopyInto(&out.CEL) } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Config. @@ -42,34 +57,3 @@ func (in *Config) DeepCopy() *Config { in.DeepCopyInto(out) return out } - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MultiKueueConfig) DeepCopyInto(out *MultiKueueConfig) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MultiKueueConfig. -func (in *MultiKueueConfig) DeepCopy() *MultiKueueConfig { - if in == nil { - return nil - } - out := new(MultiKueueConfig) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *TektonKueueConfig) DeepCopyInto(out *TektonKueueConfig) { - *out = *in - in.CEL.DeepCopyInto(&out.CEL) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TektonKueueConfig. -func (in *TektonKueueConfig) DeepCopy() *TektonKueueConfig { - if in == nil { - return nil - } - out := new(TektonKueueConfig) - in.DeepCopyInto(out) - return out -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 2c452fc108..c1c0bef91f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -772,8 +772,6 @@ github.com/google/go-querystring/query ## explicit; go 1.12 github.com/google/gofuzz github.com/google/gofuzz/bytesource -# github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 -## explicit; go 1.24.0 # github.com/google/s2a-go v0.1.9 ## explicit; go 1.20 github.com/google/s2a-go @@ -867,8 +865,8 @@ github.com/klauspost/compress/internal/le github.com/klauspost/compress/internal/snapref github.com/klauspost/compress/zstd github.com/klauspost/compress/zstd/internal/xxhash -# github.com/konflux-ci/tekton-kueue v0.0.0-20251231110853-e7a97991aa34 -## explicit; go 1.24.0 +# github.com/konflux-ci/tekton-kueue v0.3.0 +## explicit; go 1.25.3 github.com/konflux-ci/tekton-kueue/pkg/common github.com/konflux-ci/tekton-kueue/pkg/config # github.com/lestrrat-go/blackmagic v1.0.4