Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/scripts/check-gomod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ go mod tidy
go mod verify

if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
echo "actions Go mod isn't up to date. Please run `cd actions && go mod tidy`"
echo "actions Go mod isn't up to date. Please run 'cd actions && go mod tidy'"
echo "The following go files did differ after tidying them:"
git status --porcelain
exit 1
Expand All @@ -30,8 +30,8 @@ go mod tidy
go mod verify

if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
echo "interoperability Go mod isn't up to date. Please run `cd interoperability && go mod tidy`"
echo "interoperability Go mod isn't up to date. Please run 'cd interoperability && go mod tidy'"
echo "The following go files did differ after tidying them:"
git status --porcelain
exit 1
fi
fi
8 changes: 5 additions & 3 deletions actions/charts/longhorn.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ import (
)

var (
LonghornNamespace = "longhorn-system"
LonghornChartName = "longhorn"
enableDeletionSetting = map[string]any{
LonghornStorageClass = "longhorn"
LonghornStaticStorageClass = "longhorn-static"
LonghornNamespace = "longhorn-system"
LonghornChartName = "longhorn"
enableDeletionSetting = map[string]any{
"defaultSettings": map[string]any{
"deletingConfirmationFlag": true,
},
Expand Down
14 changes: 8 additions & 6 deletions actions/charts/ranchermonitoring.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,14 @@ func InstallRancherMonitoringChart(client *rancher.Client, installOptions *Insta
}

err = wait.WatchWait(watchAppInterface, func(event watch.Event) (ready bool, err error) {
if event.Type == watch.Error {
switch event.Type {
case watch.Error:
return false, fmt.Errorf("there was an error uninstalling rancher monitoring chart")
} else if event.Type == watch.Deleted {
case watch.Deleted:
return true, nil
default:
return false, nil
}
return false, nil
})
if err != nil {
return err
Expand Down Expand Up @@ -139,7 +141,7 @@ func InstallRancherMonitoringChart(client *rancher.Client, installOptions *Insta
return true, nil
}
if state == string(catalogv1.StatusFailed) {
return false, fmt.Errorf("monitoring chart installation failed: %s", app.Status.Summary.Error)
return false, fmt.Errorf("monitoring chart installation failed: %t", app.Status.Summary.Error)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the app.Status.Summary.Error a boolean? if not I would recommend use %s

}
Comment thread
hamistao marked this conversation as resolved.
return false, nil
})
Expand Down Expand Up @@ -243,7 +245,7 @@ func UpgradeRancherMonitoringChart(client *rancher.Client, installOptions *Insta
return true, nil
}
if state == string(catalogv1.StatusFailed) {
return false, fmt.Errorf("monitoring chart upgrade failed: %s", app.Status.Summary.Error)
return false, fmt.Errorf("monitoring chart upgrade failed: %t", app.Status.Summary.Error)
}
Comment thread
hamistao marked this conversation as resolved.
return false, nil
})
Expand All @@ -268,7 +270,7 @@ func UpgradeRancherMonitoringChart(client *rancher.Client, installOptions *Insta
return true, nil
}
if state == string(catalogv1.StatusFailed) {
return false, fmt.Errorf("monitoring chart upgrade failed: %s", app.Status.Summary.Error)
return false, fmt.Errorf("monitoring chart upgrade failed: %t", app.Status.Summary.Error)
}
Comment thread
hamistao marked this conversation as resolved.
return false, nil
})
Expand Down
4 changes: 2 additions & 2 deletions actions/cloudprovider/cloudprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ func CreateCloudProviderAddOns(client *rancher.Client, clustersConfig *clusters.

case provisioninginput.HarvesterProviderName.String():

data := map[string][]byte{
"credential": []byte(credentials.HarvesterCredentialConfig.KubeconfigContent),
data := map[string]string{
"credential": credentials.HarvesterCredentialConfig.KubeconfigContent,
}

annotations := map[string]string{
Expand Down
16 changes: 4 additions & 12 deletions actions/cloudprovider/verify.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/rancher/shepherd/extensions/defaults/providers"
"github.com/rancher/shepherd/extensions/defaults/stevetypes"
wloads "github.com/rancher/shepherd/extensions/workloads"
"github.com/rancher/shepherd/extensions/workloads/pods"
"github.com/rancher/shepherd/pkg/namegenerator"
"github.com/rancher/tests/actions/charts"
"github.com/rancher/tests/actions/clusters"
Expand All @@ -29,11 +28,10 @@ import (
)

const (
externalProviderString = "external"
clusterIPPrefix = "cip"
loadBalancerPrefix = "lb"
portName = "port"
nginxName = "nginx"
clusterIPPrefix = "cip"
loadBalancerPrefix = "lb"
portName = "port"
nginxName = "nginx"

awsUpstreamCloudProviderRepo = "https://github.com/kubernetes/cloud-provider-aws.git"
masterBranch = "master"
Expand Down Expand Up @@ -74,9 +72,6 @@ func VerifyHarvesterCloudProvider(t *testing.T, client *rancher.Client, clusterO

services.VerifyHarvesterLoadBalancer(t, client, lbServiceResp, status.ClusterName)
storage.CreatePVCWorkload(t, client, status.ClusterName, "")

podErrors := pods.StatusPods(client, status.ClusterName)
require.Empty(t, podErrors)
}

func VerifyVSphereCloudProvider(t *testing.T, client *rancher.Client, clusterObject *steveV1.SteveAPIObject) {
Expand All @@ -85,9 +80,6 @@ func VerifyVSphereCloudProvider(t *testing.T, client *rancher.Client, clusterObj
require.NoError(t, err)

storage.CreatePVCWorkload(t, client, status.ClusterName, "")

podErrors := pods.StatusPods(client, status.ClusterName)
require.Empty(t, podErrors)
}

// CreateAWSCloudProviderWorkloadAndServicesLB creates a test workload, clusterIP service and LoadBalancer service.
Expand Down
148 changes: 94 additions & 54 deletions actions/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ replace (
github.com/crewjam/saml => github.com/rancher/saml v0.4.14-rancher3
github.com/docker/distribution => github.com/docker/distribution v2.8.2+incompatible // rancher-machine requires a replace is set
github.com/docker/docker => github.com/docker/docker v20.10.27+incompatible // rancher-machine requires a replace is set
github.com/henrygd/beszel => github.com/longhorn/beszel v0.16.2-0.20260114090315-332709c32c7d

github.com/rancher/rancher/pkg/apis => github.com/rancher/rancher/pkg/apis v0.0.0-20260527150105-ae26ccbc3fed
github.com/rancher/rancher/pkg/client => github.com/rancher/rancher/pkg/client v0.0.0-20260527150105-ae26ccbc3fed
Expand Down Expand Up @@ -65,20 +66,22 @@ require (

require (
github.com/aws/aws-sdk-go v1.55.8
github.com/aws/aws-sdk-go-v2 v1.41.7
github.com/aws/aws-sdk-go-v2/config v1.32.17
github.com/aws/aws-sdk-go-v2/credentials v1.19.16
github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3
github.com/aws/aws-sdk-go-v2 v1.42.1
github.com/aws/aws-sdk-go-v2/config v1.32.27
github.com/aws/aws-sdk-go-v2/credentials v1.19.26
github.com/aws/aws-sdk-go-v2/feature/s3/transfermanager v0.2.13
github.com/aws/aws-sdk-go-v2/service/s3 v1.104.2
github.com/longhorn/longhorn-manager v1.12.0
github.com/pkg/errors v0.9.1
github.com/rancher/norman v0.9.6
github.com/rancher/rancher v0.0.0-20260527150105-ae26ccbc3fed
github.com/rancher/wrangler v1.1.2
github.com/sirupsen/logrus v1.9.4
github.com/stretchr/testify v1.11.1
golang.org/x/crypto v0.51.0
golang.org/x/crypto v0.53.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.36.1
k8s.io/apimachinery v0.36.1
k8s.io/api v0.36.2
k8s.io/apimachinery v0.36.2
k8s.io/client-go v12.0.0+incompatible
sigs.k8s.io/cluster-api v1.12.2
)
Expand All @@ -87,67 +90,93 @@ require (
github.com/imdario/mergo v0.3.16 // indirect
github.com/rancher/ali-operator v1.14.0-rc.1 // indirect
gopkg.in/validator.v2 v2.0.1 // indirect
k8s.io/component-helpers v0.36.1 // indirect
k8s.io/component-helpers v0.36.2 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 // indirect
)

require (
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.9 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.23 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.0.11 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.30.17 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.42.1 // indirect
github.com/aws/smithy-go v1.25.1 // indirect
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.14 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.31 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.13 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.23 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.30 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.31 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.2.2 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.31.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.36.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.43.5 // indirect
github.com/aws/smithy-go v1.27.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/cockroachdb/errors v1.14.0 // indirect
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
github.com/cockroachdb/redact v1.1.8 // indirect
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
github.com/creasty/defaults v1.5.2 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distatus/battery v0.11.0 // indirect
github.com/dolthub/maphash v0.1.0 // indirect
github.com/ebitengine/purego v0.9.1 // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // 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.9.0 // indirect
github.com/felixge/httpsnoop v1.1.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.2 // indirect
github.com/getsentry/sentry-go v0.47.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/gliderlabs/ssh v0.3.8 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.22.4 // indirect
github.com/go-openapi/jsonreference v0.21.4 // indirect
github.com/go-openapi/swag v0.25.4 // indirect
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
github.com/go-openapi/swag/conv v0.25.4 // indirect
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
github.com/go-openapi/swag/loading v0.25.4 // indirect
github.com/go-openapi/swag/mangling v0.25.4 // indirect
github.com/go-openapi/swag/netutils v0.25.4 // indirect
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.23.1 // indirect
github.com/go-openapi/jsonreference v0.21.6 // indirect
github.com/go-openapi/swag v0.26.1 // indirect
github.com/go-openapi/swag/cmdutils v0.26.1 // indirect
github.com/go-openapi/swag/conv v0.26.1 // indirect
github.com/go-openapi/swag/fileutils v0.26.1 // indirect
github.com/go-openapi/swag/jsonname v0.26.1 // indirect
github.com/go-openapi/swag/jsonutils v0.26.1 // indirect
github.com/go-openapi/swag/loading v0.26.1 // indirect
github.com/go-openapi/swag/mangling v0.26.1 // indirect
github.com/go-openapi/swag/netutils v0.26.1 // indirect
github.com/go-openapi/swag/stringutils v0.26.1 // indirect
github.com/go-openapi/swag/typeutils v0.26.1 // indirect
github.com/go-openapi/swag/yamlutils v0.26.1 // indirect
github.com/godbus/dbus/v5 v5.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.7.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/handlers v1.5.2 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/henrygd/beszel v0.18.2 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.2 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kubereboot/kured v1.13.1 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/longhorn/go-common-libs v0.0.0-20260623123610-a0890c88e9f5 // indirect
github.com/longhorn/go-spdk-helper v0.6.2 // indirect
github.com/lufia/plan9stats v0.0.0-20251013123823-9fd1530e3ec3 // indirect
github.com/lxzan/gws v1.8.9 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/moby/spdystream v0.5.1 // indirect
github.com/moby/term v0.5.2 // indirect
Expand All @@ -158,11 +187,12 @@ require (
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/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.72.0 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/procfs v0.19.2 // indirect
github.com/prometheus/common v0.69.0 // indirect
github.com/prometheus/procfs v0.20.1 // indirect
github.com/rancher/aks-operator v1.15.0-rc.1 // indirect
github.com/rancher/apiserver v0.9.6 // indirect
github.com/rancher/eks-operator v1.15.0-rc.1 // indirect
Expand All @@ -171,36 +201,46 @@ require (
github.com/rancher/lasso v0.2.9 // indirect
github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20260519183600-f1362a3fe1a8 // indirect
github.com/rancher/wrangler/v3 v3.7.0 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/rogpeppe/go-internal v1.15.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shirou/gopsutil/v4 v4.25.12 // indirect
github.com/spf13/cobra v1.10.2 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/tklauser/go-sysconf v0.3.16 // indirect
github.com/tklauser/numcpus v0.11.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/trace v1.44.0 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/net v0.54.0 // indirect
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect
golang.org/x/net v0.56.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.44.0 // indirect
golang.org/x/term v0.43.0 // indirect
golang.org/x/text v0.37.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.38.0 // indirect
golang.org/x/time v0.15.0 // indirect
golang.org/x/tools v0.46.0 // indirect
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.36.0 // indirect
k8s.io/apiserver v0.36.1 // indirect
k8s.io/cli-runtime v0.36.1 // indirect
k8s.io/component-base v0.36.1 // indirect
howett.net/plist v1.0.1 // indirect
k8s.io/apiextensions-apiserver v0.36.2 // indirect
k8s.io/apiserver v0.36.2 // indirect
k8s.io/cli-runtime v0.36.2 // indirect
k8s.io/component-base v0.36.2 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kube-aggregator v0.36.1 // indirect
k8s.io/kube-aggregator v0.36.2 // indirect
k8s.io/kube-openapi v0.31.5 // indirect
k8s.io/kubectl v0.36.1 // indirect
k8s.io/streaming v0.36.1 // indirect
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
k8s.io/utils v0.0.0-20260617174310-a95e086a2553 // indirect
sigs.k8s.io/cli-utils v0.37.2 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/kustomize/api v0.21.1 // indirect
Expand Down
Loading
Loading