Skip to content

Commit 9278df1

Browse files
authored
Merge pull request #968 from rancher/release-v2.12
Release v2.12
2 parents 8e1a2dc + 6f512a1 commit 9278df1

4 files changed

Lines changed: 14 additions & 11 deletions

File tree

.github/workflows/release.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,12 @@ jobs:
168168
GH_TOKEN: ${{ steps.app-token.outputs.token }}
169169
run: |
170170
case ${{ github.ref_name }} in
171-
"v1.12"*)
171+
"v1.13"*)
172172
ACTION_TARGET_BRANCH="main"
173173
;;
174+
"v1.12"*)
175+
ACTION_TARGET_BRANCH="release/v2.12"
176+
;;
174177
"v1.11"*)
175178
ACTION_TARGET_BRANCH="release/v2.11"
176179
;;

charts/gke-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ annotations:
1010
catalog.cattle.io/auto-install: rancher-gke-operator-crd=match
1111
catalog.cattle.io/certified: rancher
1212
catalog.cattle.io/hidden: "true"
13-
catalog.cattle.io/kube-version: ">= 1.18.0-0"
13+
catalog.cattle.io/kube-version: '>= 1.31.0-0 < 1.34.0-0'
1414
catalog.cattle.io/namespace: cattle-system
1515
catalog.cattle.io/os: linux
1616
catalog.cattle.io/permits-os: linux,windows
1717
catalog.cattle.io/provides-gvr: gkeclusterconfigs.gke.cattle.io/v1
18-
catalog.cattle.io/rancher-version: ">= 2.6.0-alpha"
18+
catalog.cattle.io/rancher-version: '>= 2.12.0-0 < 2.13.0-0'
1919
catalog.cattle.io/release-name: rancher-gke-operator
2020
catalog.cattle.io/scope: management

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ require (
1717
github.com/onsi/gomega v1.37.0
1818
github.com/pkg/errors v0.9.1
1919
github.com/rancher-sandbox/ele-testhelpers v0.0.0-20231206161614-20a517410736
20-
github.com/rancher/lasso v0.2.3-rc1
20+
github.com/rancher/lasso v0.2.3-rc3
2121
github.com/rancher/rancher/pkg/apis v0.0.0-20240821150307-952f563826f5
2222
github.com/rancher/wrangler-api v0.6.1-0.20200427172631-a7c2f09b783e
23-
github.com/rancher/wrangler/v3 v3.2.2-rc.1
23+
github.com/rancher/wrangler/v3 v3.2.2-rc.3
2424
github.com/sirupsen/logrus v1.9.3
2525
golang.org/x/net v0.41.0
2626
golang.org/x/oauth2 v0.30.0

go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,8 @@ github.com/rancher/eks-operator v1.9.1/go.mod h1:vMQSu6MQqLkuilXcv+KKlL15sFBg24T
411411
github.com/rancher/fleet/pkg/apis v0.10.0 h1:0f8OEghEDJNzvUAR2fpg2dw8EnAgfWvkhnwsYFS9G+w=
412412
github.com/rancher/fleet/pkg/apis v0.10.0/go.mod h1:mjirthAmgpz0xo+qywUiaJDFpjnmX3xrc2E0/qmk3yc=
413413
github.com/rancher/lasso v0.0.0-20200427171700-e0509f89f319/go.mod h1:6Dw19z1lDIpL887eelVjyqH/mna1hfR61ddCFOG78lw=
414-
github.com/rancher/lasso v0.2.3-rc1 h1:dRerAaAiziQKSVasSQe3Av2aNGokjidzZD/bLLLIQT4=
415-
github.com/rancher/lasso v0.2.3-rc1/go.mod h1:L8ct0T/HAYTWLKWPBQCZvluqmr72Yl5YOewjgRRvnMk=
414+
github.com/rancher/lasso v0.2.3-rc3 h1:kkYnARdFeY6A9E2XnjfQbG8CssHQwobPMIFqPRGpVxc=
415+
github.com/rancher/lasso v0.2.3-rc3/go.mod h1:G+KeeOaKRjp+qGp0bV6VbLhYrq1vHbJPbDh40ejg5yE=
416416
github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9 h1:AlRMRs5mHJcdiK83KKJyFVeybPMZ7dOUzC0l3k9aUa8=
417417
github.com/rancher/norman v0.0.0-20240708202514-a0127673d1b9/go.mod h1:dyjfXBsNiroPWOdUZe7diUOUSLf6HQ/r2kEpwH/8zas=
418418
github.com/rancher/rancher/pkg/apis v0.0.0-20240821150307-952f563826f5 h1:embCGXbPsLXx7Bzke3AaFxaoD97SetenSx3YzXRoHBk=
@@ -424,8 +424,8 @@ github.com/rancher/wrangler v1.1.1 h1:wmqUwqc2M7ADfXnBCJTFkTB5ZREWpD78rnZMzmxwMv
424424
github.com/rancher/wrangler v1.1.1/go.mod h1:ioVbKupzcBOdzsl55MvEDN0R1wdGggj8iNCYGFI5JvM=
425425
github.com/rancher/wrangler-api v0.6.1-0.20200427172631-a7c2f09b783e h1:UJpGtw6IKs0dHPTF+6Wd12lskeCZZAejl8/ie/fc1+0=
426426
github.com/rancher/wrangler-api v0.6.1-0.20200427172631-a7c2f09b783e/go.mod h1:2lcWR98q8HU3U4mVETnXc8quNG0uXxrt8vKd6cAa/30=
427-
github.com/rancher/wrangler/v3 v3.2.2-rc.1 h1:UoReGk+6sZD9uVoCpwdFWrznhVs4jKDsZ+fNNMJ0EQE=
428-
github.com/rancher/wrangler/v3 v3.2.2-rc.1/go.mod h1:G+gawqOKIo7i1jtgPKvzU3RzA+3OCaAsYVxq03Iya20=
427+
github.com/rancher/wrangler/v3 v3.2.2-rc.3 h1:ObcqAxQkQFP6r1YI3zJhi9v9PE+UUNNZpelz6NSpQnc=
428+
github.com/rancher/wrangler/v3 v3.2.2-rc.3/go.mod h1:ukbwLYT+MTCx+43aXNQNYxZizQpeo0gILK05k4RoW7o=
429429
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
430430
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
431431
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
@@ -517,8 +517,8 @@ go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
517517
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
518518
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
519519
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
520-
go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU=
521-
go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM=
520+
go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
521+
go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
522522
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
523523
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
524524
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=

0 commit comments

Comments
 (0)