Skip to content

Commit 8cd4a8c

Browse files
m1kolam1kola
authored
Bump catalogd to v0.36.0 (#1434)
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
1 parent 481bd5d commit 8cd4a8c

File tree

7 files changed

+61
-41
lines changed

7 files changed

+61
-41
lines changed

‎docs/api-reference/catalogd-api-reference.md

Lines changed: 38 additions & 18 deletions
Large diffs are not rendered by default.

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/onsi/gomega v1.35.1
1818
github.com/opencontainers/go-digest v1.0.0
1919
github.com/operator-framework/api v0.27.0
20-
github.com/operator-framework/catalogd v0.35.0
20+
github.com/operator-framework/catalogd v0.36.0
2121
github.com/operator-framework/helm-operator-plugins v0.7.0
2222
github.com/operator-framework/operator-registry v1.48.0
2323
github.com/spf13/pflag v1.0.5
@@ -26,11 +26,11 @@ require (
2626
gopkg.in/yaml.v2 v2.4.0
2727
helm.sh/helm/v3 v3.16.2
2828
k8s.io/api v0.31.2
29-
k8s.io/apiextensions-apiserver v0.31.1
29+
k8s.io/apiextensions-apiserver v0.31.2
3030
k8s.io/apimachinery v0.31.2
3131
k8s.io/cli-runtime v0.31.2
3232
k8s.io/client-go v0.31.2
33-
k8s.io/component-base v0.31.1
33+
k8s.io/component-base v0.31.2
3434
k8s.io/klog/v2 v2.130.1
3535
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
3636
sigs.k8s.io/controller-runtime v0.19.0
@@ -241,7 +241,7 @@ require (
241241
gopkg.in/inf.v0 v0.9.1 // indirect
242242
gopkg.in/warnings.v0 v0.1.2 // indirect
243243
gopkg.in/yaml.v3 v3.0.1 // indirect
244-
k8s.io/apiserver v0.31.1 // indirect
244+
k8s.io/apiserver v0.31.2 // indirect
245245
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
246246
k8s.io/kubectl v0.31.1 // indirect
247247
oras.land/oras-go v1.2.5 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 h1:eT
535535
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11/go.mod h1:EmVJt97N+pfWFsli/ipXTBZqSG5F5KGQhm3c3IsGq1o=
536536
github.com/operator-framework/api v0.27.0 h1:OrVaGKZJvbZo58HTv2guz7aURkhVKYhFqZ/6VpifiXI=
537537
github.com/operator-framework/api v0.27.0/go.mod h1:lg2Xx+S8NQWGYlEOvFwQvH46E5EK5IrAIL7HWfAhciM=
538-
github.com/operator-framework/catalogd v0.35.0 h1:2lQPyHIzEfcciUjQ/fo4i/GE/sX2LBzd8S+nYxlvEHU=
539-
github.com/operator-framework/catalogd v0.35.0/go.mod h1:anZurjcFMBvbkuyqlJ98v9z+yjniPKqmhlyitk9DuBQ=
538+
github.com/operator-framework/catalogd v0.36.0 h1:4ySpKitCooKPpTqQon/2dIGR7oEOIee8WYrRYwwQZ00=
539+
github.com/operator-framework/catalogd v0.36.0/go.mod h1:ERq4C2ksfkf3wu3XmtGP2fIkBSqS6LfaHhtcSEcU7Ww=
540540
github.com/operator-framework/helm-operator-plugins v0.7.0 h1:YmtIWFc9BaNaDc5mk/dkG0P2BqPZOqpDvjWih5Fczuk=
541541
github.com/operator-framework/helm-operator-plugins v0.7.0/go.mod h1:fUUCJR3bWtMBZ1qdDhbwjacsBHi9uT576tF4u/DwOgQ=
542542
github.com/operator-framework/operator-lib v0.15.0 h1:0QeRM4PMtThqINpcFGCEBnIV3Z8u7/8fYLEx6mUtdcM=
@@ -991,18 +991,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
991991
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
992992
k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
993993
k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
994-
k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
995-
k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ=
994+
k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0=
995+
k8s.io/apiextensions-apiserver v0.31.2/go.mod h1:i+Geh+nGCJEGiCGR3MlBDkS7koHIIKWVfWeRFiOsUcM=
996996
k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
997997
k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
998-
k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c=
999-
k8s.io/apiserver v0.31.1/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM=
998+
k8s.io/apiserver v0.31.2 h1:VUzOEUGRCDi6kX1OyQ801m4A7AUPglpsmGvdsekmcI4=
999+
k8s.io/apiserver v0.31.2/go.mod h1:o3nKZR7lPlJqkU5I3Ove+Zx3JuoFjQobGX1Gctw6XuE=
10001000
k8s.io/cli-runtime v0.31.2 h1:7FQt4C4Xnqx8V1GJqymInK0FFsoC+fAZtbLqgXYVOLQ=
10011001
k8s.io/cli-runtime v0.31.2/go.mod h1:XROyicf+G7rQ6FQJMbeDV9jqxzkWXTYD6Uxd15noe0Q=
10021002
k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
10031003
k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
1004-
k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8=
1005-
k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w=
1004+
k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA=
1005+
k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ=
10061006
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
10071007
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
10081008
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

‎internal/authentication/tokengetter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (t *TokenGetter) getToken(ctx context.Context, key types.NamespacedName) (*
8383
req, err := t.client.ServiceAccounts(key.Namespace).CreateToken(ctx,
8484
key.Name,
8585
&authenticationv1.TokenRequest{
86-
Spec: authenticationv1.TokenRequestSpec{ExpirationSeconds: ptr.To[int64](int64(t.expirationDuration / time.Second))},
86+
Spec: authenticationv1.TokenRequestSpec{ExpirationSeconds: ptr.To(int64(t.expirationDuration / time.Second))},
8787
}, metav1.CreateOptions{})
8888
if err != nil {
8989
return nil, err

‎internal/resolve/catalog.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func CatalogWalker(
245245

246246
// Remove disabled catalogs from consideration
247247
catalogs = slices.DeleteFunc(catalogs, func(c catalogd.ClusterCatalog) bool {
248-
if c.Spec.Availability == "Disabled" {
248+
if c.Spec.AvailabilityMode == catalogd.AvailabilityModeUnavailable {
249249
l.Info("excluding ClusterCatalog from resolution process since it is disabled", "catalog", c.Name)
250250
return true
251251
}

‎internal/resolve/catalog_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -970,12 +970,12 @@ func TestAllCatalogsDisabled(t *testing.T) {
970970
return []catalogd.ClusterCatalog{
971971
{
972972
Spec: catalogd.ClusterCatalogSpec{
973-
Availability: "Disabled",
973+
AvailabilityMode: catalogd.AvailabilityModeUnavailable,
974974
},
975975
},
976976
{
977977
Spec: catalogd.ClusterCatalogSpec{
978-
Availability: "Disabled",
978+
AvailabilityMode: catalogd.AvailabilityModeUnavailable,
979979
},
980980
},
981981
}, nil
@@ -1004,17 +1004,17 @@ func TestSomeCatalogsDisabled(t *testing.T) {
10041004
Name: "enabledCatalog",
10051005
},
10061006
Spec: catalogd.ClusterCatalogSpec{
1007-
Priority: 1, // Higher priority
1008-
Availability: "Enabled",
1007+
Priority: 1, // Higher priority
1008+
AvailabilityMode: catalogd.AvailabilityModeAvailable,
10091009
},
10101010
},
10111011
{
10121012
ObjectMeta: metav1.ObjectMeta{
10131013
Name: "disabledCatalog",
10141014
},
10151015
Spec: catalogd.ClusterCatalogSpec{
1016-
Priority: 0, // Lower priority (but disabled)
1017-
Availability: "Disabled",
1016+
Priority: 0, // Lower priority (but disabled)
1017+
AvailabilityMode: catalogd.AvailabilityModeUnavailable,
10181018
},
10191019
},
10201020
}, nil

‎test/e2e/e2e_suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"context"
55
"os"
66
"testing"
7-
"time"
87

98
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
109
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1110
"k8s.io/client-go/rest"
11+
"k8s.io/utils/ptr"
1212
ctrl "sigs.k8s.io/controller-runtime"
1313
"sigs.k8s.io/controller-runtime/pkg/client"
1414

@@ -53,8 +53,8 @@ func createTestCatalog(ctx context.Context, name string, imageRef string) (*cata
5353
Source: catalogd.CatalogSource{
5454
Type: catalogd.SourceTypeImage,
5555
Image: &catalogd.ImageSource{
56-
Ref: imageRef,
57-
PollInterval: &metav1.Duration{Duration: time.Second},
56+
Ref: imageRef,
57+
PollIntervalMinutes: ptr.To(1),
5858
},
5959
},
6060
},

0 commit comments

Comments
 (0)