Skip to content

Commit

Permalink
Update stable from main (#35)
Browse files Browse the repository at this point in the history
* clean up readme, add reports (#15)

* add scripts to test repo (#16)

* adding apache 2.0 license to test repo for compliance (#17)

* fix spelling errors (#18)

* adding missed RA deprecation test (#19)

* Delete accidental add

* adding pit to review modification to actions package (#21)

* ignore any potential ssh keys (#22)

* ignore any potential ssh keys

* updating custodian path in Jenkinsfile

* pulling over from rancher/rancher/.gitignore

* Updates to rancher ha jenkins pipeline (#27)

* Getting the k8s versions based on rancher version

debug

Updated the rancher versions script to work for community versions

Debug

Adding windows image

Updating rancherversion script for rke2 and k3s

Debug

Update global vars

Updated rancher version log

* updates to go.mod and go.sum

* resolving golang linter errors

* fix-resync-interval

* rebasing changes from rancher (#32)

* rebasing changes from rancher

* updating format based on golangci-lint

* bumping go.mod -> rancher + shepherd

* <main> Public repo fleet deployment on HA downstream clusters after upgrade

---------

Co-authored-by: Caleb Warren <[email protected]>
Co-authored-by: Anupama Upadhyayula <[email protected]>
Co-authored-by: priyashetty <[email protected]>
Co-authored-by: lscalabrini01 <[email protected]>
  • Loading branch information
5 people authored Feb 28, 2025
1 parent 9b83fc0 commit 1761d7e
Show file tree
Hide file tree
Showing 28 changed files with 2,292 additions and 3,450 deletions.
36 changes: 36 additions & 0 deletions actions/clusters/verify.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package clusters

import (
"errors"
"net/url"

steveV1 "github.com/rancher/shepherd/clients/rancher/v1"
"github.com/sirupsen/logrus"
)

const (
LabelWorker = "labelSelector=node-role.kubernetes.io/worker=true"
SmallerPoolMessageError = "Machine pool cluster size is smaller than expected pool size"
)

// VerifyNodePoolSize is a helper function that checks if the machine pool cluster size is greater than or equal to poolSize
func VerifyNodePoolSize(steveClient *steveV1.Client, labelSelector string, poolSize int) error {
logrus.Info("Checking node pool")

logrus.Infof("Getting the node using the label [%v]", labelSelector)
query, err := url.ParseQuery(labelSelector)
if err != nil {
return err
}

nodeList, err := steveClient.SteveType("node").List(query)
if err != nil {
return err
}

if len(nodeList.Data) < poolSize {
return errors.New(SmallerPoolMessageError)
}

return nil
}
125 changes: 62 additions & 63 deletions actions/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/rancher/tests/actions

go 1.23.0
go 1.23.4

toolchain go1.23.6

Expand Down Expand Up @@ -60,32 +60,33 @@ replace (
require github.com/rancher/rancher/pkg/apis v0.0.0

require (
github.com/aws/aws-sdk-go v1.50.38
github.com/aws/aws-sdk-go v1.55.5
github.com/pkg/errors v0.9.1
github.com/rancher/machine v0.15.0-rancher113
github.com/rancher/norman v0.5.1
github.com/rancher/rancher v0.0.0-20240618122559-b9ec494d4f6f
github.com/rancher/shepherd v0.0.0-20250205140852-ba6d2793aaff
github.com/rancher/machine v0.15.0-rancher126
github.com/rancher/norman v0.5.2
github.com/rancher/rancher v0.0.0-20250228094653-6e82729d08cf
github.com/rancher/shepherd v0.0.0-20250225165610-3b5c95e0e613
github.com/rancher/wrangler v1.1.2
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.10.0
golang.org/x/crypto v0.32.0
golang.org/x/crypto v0.33.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.32.1
k8s.io/apimachinery v0.32.1
k8s.io/api v0.32.2
k8s.io/apimachinery v0.32.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
sigs.k8s.io/cluster-api v1.8.3
sigs.k8s.io/cluster-api v1.9.5

)

require (
dario.cat/mergo v1.0.1 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/Masterminds/semver/v3 v3.3.0 // indirect
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.12.0-rc.3 // indirect
github.com/apparentlymart/go-cidr v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand All @@ -94,18 +95,18 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/containerd/cgroups/v3 v3.0.2 // indirect
github.com/containerd/containerd v1.7.12 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/containerd v1.7.24 // indirect
github.com/containerd/errdefs v0.3.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/creasty/defaults v1.5.2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v25.0.3+incompatible // indirect
github.com/docker/docker v25.0.6+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
Expand All @@ -114,25 +115,25 @@ require (
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gnostic-models v0.6.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/huandu/xstrings v1.4.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -142,7 +143,8 @@ require (
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/sys/mount v0.3.3 // indirect
github.com/moby/sys/mountinfo v0.7.1 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/user v0.3.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -151,71 +153,68 @@ require (
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runc v1.1.14 // indirect
github.com/opencontainers/runc v1.2.1 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/pkg/sftp v1.13.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.52.0 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rancher/aks-operator v1.10.0 // indirect
github.com/rancher/apiserver v0.0.0-20240604183424-8c448886365e // indirect
github.com/rancher/eks-operator v1.11.0-rc.2 // indirect
github.com/rancher/aks-operator v1.11.0-rc.4 // indirect
github.com/rancher/apiserver v0.5.2 // indirect
github.com/rancher/eks-operator v1.11.0-rc.3 // indirect
github.com/rancher/fleet/pkg/apis v0.12.0-alpha.2 // indirect
github.com/rancher/gke-operator v1.10.0 // indirect
github.com/rancher/lasso v0.0.0-20240924233157-8f384efc8813 // indirect
github.com/rancher/rke v1.7.0-rc.5 // indirect
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007 // indirect
github.com/rancher/wrangler/v3 v3.1.0 // indirect
github.com/rancher/gke-operator v1.11.0-rc.2 // indirect
github.com/rancher/lasso v0.2.1 // indirect
github.com/rancher/rke v1.8.0-rc.2 // indirect
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20240301001845-4eacc2dabbde // indirect
github.com/rancher/wrangler/v3 v3.2.0-rc.3 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
go.etcd.io/etcd/api/v3 v3.5.17 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
go.etcd.io/etcd/client/v2 v2.305.16 // indirect
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
go.etcd.io/etcd/client/v3 v3.5.17 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/trace v1.34.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.7.0 // indirect
golang.org/x/tools v0.28.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.36.1 // indirect
golang.org/x/net v0.35.0 // indirect
golang.org/x/oauth2 v0.26.0 // indirect
golang.org/x/sync v0.11.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/time v0.10.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect
google.golang.org/grpc v1.70.0 // indirect
google.golang.org/protobuf v1.36.5 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.31.1 // indirect
k8s.io/apiserver v0.32.1 // indirect
k8s.io/cli-runtime v0.32.1 // indirect
k8s.io/component-base v0.32.1 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/apiextensions-apiserver v0.32.2 // indirect
k8s.io/apiserver v0.32.2 // indirect
k8s.io/cli-runtime v0.32.2 // indirect
k8s.io/component-base v0.32.2 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-aggregator v0.31.1 // indirect
k8s.io/kube-aggregator v0.32.2 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/kubectl v0.31.1 // indirect
k8s.io/kubernetes v1.31.1 // indirect
k8s.io/pod-security-admission v0.31.1 // indirect
k8s.io/kubectl v0.32.2 // indirect
k8s.io/kubernetes v1.32.2 // indirect
k8s.io/pod-security-admission v0.32.2 // indirect
sigs.k8s.io/cli-utils v0.37.2 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/kustomize/api v0.18.0 // indirect
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading

0 comments on commit 1761d7e

Please sign in to comment.