Skip to content

[DNM] Nishanth/infra tests #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[DNM] Nishanth/infra tests #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7cae7b
tests/e2e: Added E2E infra tests.
NishanthNalluri Jul 24, 2025
100c87b
WIP
NishanthNalluri Jun 13, 2025
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
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ test/nightly-e2e/multi-region: bin/cockroach bin/kubectl bin/helm build/self-sig
@PATH="$(PWD)/bin:${PATH}" go test -timeout 60m -v -test.run TestOperatorInMultiRegion ./tests/e2e/operator/multiRegion/... || (echo "Multi region tests failed with exit code $$?" && exit 1)


test/nightly-e2e/single-region: bin/cockroach bin/kubectl bin/helm build/self-signer
@PATH="$(PWD)/bin:${PATH}" go test -timeout 60m -v -test.run TestOperatorInSingleRegion ./tests/e2e/operator/singleRegion/... || EXIT_CODE=$$?; \

test/lint: bin/helm ## lint the helm chart
@build/lint.sh && \
bin/helm lint cockroachdb && \
Expand Down
4 changes: 2 additions & 2 deletions build/templates/cockroachdb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,15 +874,15 @@ operator:

# Regions controls the number of CockroachDB nodes that are deployed per region.
regions:
# Code corresponds to the cloud provider's identifier of this region (e.g.
# Code corresponds to the cloud infra's identifier of this region (e.g.
# "us-east-1" for AWS, "us-east1" for GCP). This value is used to detect
# which CrdbClusterRegion will be reconciled and must match the
# "topology.kubernetes.io/region" label on Kubernetes Nodes in this
# cluster.
- code: us-east-1
# Nodes is the number of CRDB nodes that are in the region.
nodes: 3
# CloudProvider sets the cloud provider for this region.
# CloudProvider sets the cloud infra for this region.
cloudProvider: k3d
# Namespace is the name of the Kubernetes namespace that this
# CrdbClusterRegion is deployed within. It is used to compute the --join
Expand Down
6 changes: 3 additions & 3 deletions cmd/migrate/cockroachdb-enterprise-operator/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ func Execute() {
}

func init() {
buildManifestCmd.PersistentFlags().StringVar(&cloudProvider, "cloud-provider", "", "name of cloud provider")
buildManifestCmd.PersistentFlags().StringVar(&cloudRegion, "cloud-region", "", "name of cloud provider region")
buildManifestCmd.PersistentFlags().StringVar(&cloudProvider, "cloud-infra", "", "name of cloud infra")
buildManifestCmd.PersistentFlags().StringVar(&cloudRegion, "cloud-region", "", "name of cloud infra region")
buildManifestCmd.PersistentFlags().StringVar(&kubeconfig, "kubeconfig", filepath.Join(homedir.HomeDir(), ".kube", "config"), "path to kubeconfig file")
buildManifestCmd.PersistentFlags().StringVar(&outputDir, "output-dir", "./manifests", "manifest output directory")
_ = buildManifestCmd.MarkPersistentFlagRequired("cloud-provider")
_ = buildManifestCmd.MarkPersistentFlagRequired("cloud-infra")
_ = buildManifestCmd.MarkPersistentFlagRequired("cloud-region")
rootCmd.AddCommand(buildManifestCmd)
rootCmd.AddCommand(migrateCertsCmd)
Expand Down
4 changes: 2 additions & 2 deletions cockroachdb/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,15 +875,15 @@ operator:

# Regions controls the number of CockroachDB nodes that are deployed per region.
regions:
# Code corresponds to the cloud provider's identifier of this region (e.g.
# Code corresponds to the cloud infra's identifier of this region (e.g.
# "us-east-1" for AWS, "us-east1" for GCP). This value is used to detect
# which CrdbClusterRegion will be reconciled and must match the
# "topology.kubernetes.io/region" label on Kubernetes Nodes in this
# cluster.
- code: us-east-1
# Nodes is the number of CRDB nodes that are in the region.
nodes: 3
# CloudProvider sets the cloud provider for this region.
# CloudProvider sets the cloud infra for this region.
cloudProvider: k3d
# Namespace is the name of the Kubernetes namespace that this
# CrdbClusterRegion is deployed within. It is used to compute the --join
Expand Down
54 changes: 45 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@ module github.com/cockroachdb/helm-charts
go 1.23.8

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.8.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
github.com/Masterminds/semver/v3 v3.2.1
github.com/aws/aws-sdk-go-v2 v1.36.3
github.com/aws/aws-sdk-go-v2/config v1.29.14
github.com/aws/aws-sdk-go-v2/service/ec2 v1.224.0
github.com/aws/aws-sdk-go-v2/service/eks v1.64.0
github.com/aws/aws-sdk-go-v2/service/iam v1.36.0
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/cockroachdb/cockroach-operator v0.0.0-20250618040001-5a36c88b7231
github.com/cockroachdb/errors v1.8.0
Expand All @@ -16,7 +26,7 @@ require (
github.com/robfig/cron v1.2.0
github.com/sirupsen/logrus v1.9.0
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.10.0
google.golang.org/api v0.126.0
google.golang.org/protobuf v1.36.3
gopkg.in/yaml.v3 v3.0.1
Expand All @@ -32,11 +42,30 @@ require (
cloud.google.com/go/compute v1.23.0 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
emperror.dev/errors v0.8.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.20 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.14 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
github.com/aws/aws-sdk-go v1.44.122 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
github.com/aws/smithy-go v1.22.2 // indirect
github.com/banzaicloud/k8s-objectmatcher v1.8.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/boombuler/barcode v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
github.com/cockroachdb/redact v1.0.6 // indirect
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
Expand All @@ -45,6 +74,7 @@ require (
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
Expand All @@ -54,15 +84,17 @@ require (
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-sql-driver/mysql v1.5.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/gosimple/slug v1.9.0 // indirect
github.com/gruntwork-io/go-commons v0.8.0 // indirect
Expand All @@ -83,6 +115,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
Expand All @@ -92,30 +125,33 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pquerna/otp v1.2.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rainycape/unidecode v0.0.0-20150907023854-cb7f23ec59be // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/urfave/cli v1.22.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/net v0.38.0 // indirect
golang.org/x/net v0.40.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.31.0 // indirect
golang.org/x/term v0.30.0 // indirect
golang.org/x/text v0.23.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/term v0.32.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.58.3 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
Loading
Loading