Skip to content
Merged
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
8 changes: 4 additions & 4 deletions framework/components/blockchain/sui_faucet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ func TestIsRetryableFaucetErr(t *testing.T) {
// faucetStub is a configurable /gas handler that can fail the first N requests with
// either an HTTP 5xx or a connection reset (hijack+close), then succeed.
type faucetStub struct {
failN int32 // number of requests to fail
resetMode bool // true: hijack+close (transport reset); false: 503
hits atomic.Int32
successOK atomic.Bool
failN int32 // number of requests to fail
resetMode bool // true: hijack+close (transport reset); false: 503
hits atomic.Int32
successOK atomic.Bool
}

func (f *faucetStub) ServeHTTP(w http.ResponseWriter, r *http.Request) {
Expand Down
4 changes: 4 additions & 0 deletions lib/k8s/config/overrides.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ const (
EnvVarLocalChartsUserDescription = "Use local charts from the CTF repository directly"
EnvVarLocalChartsExample = "true"

EnvVarInfluxdbImageRegistry = "INFLUXDB_IMAGE_REGISTRY"
EnvVarInfluxdbImageRegistryDescription = "Registry host for the influxdb image (default: ECR docker-io PTC)"
EnvVarInfluxdbImageRegistryExample = "804282218731.dkr.ecr.us-west-2.amazonaws.com"

EnvBase64ConfigOverride = "BASE64_CONFIG_OVERRIDE"
EnvBase64ConfigOverriderDescription = "Base64-encoded TOML config (should contain at least chainlink image and version)"
EnvBase64ConfigOverrideExample = "W0NoYWlubGlua0ltYWdlXQppbWFnZT0icHVibGljLmVjci5hd3MvY2hhaW5saW5rL2NoYWlubGluayIKdmVyc2lvbj0iMi43LjEtYXV0b21hdGlvbi0yMDIzMTEyNyIKCltBdXRvbWF0aW9uXQpbQXV0b21hdGlvbi5HZW5lcmFsXQpkdXJhdGlvbj0yMDAK"
Expand Down
63 changes: 26 additions & 37 deletions lib/k8s/pkg/helm/influxdb/influxdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ import (
"github.com/smartcontractkit/chainlink-testing-framework/lib/k8s/environment"
)

// influxdataChartURL pins the chart version; helm ignores --version for URL refs.
const (
influxdataChartURL = "https://github.com/influxdata/helm-charts/releases/download/influxdb-4.12.5/influxdb-4.12.5.tgz"
defaultImageRegistry = "804282218731.dkr.ecr.us-west-2.amazonaws.com"
)

type Props struct {
}

Expand Down Expand Up @@ -55,59 +61,42 @@ func (m Chart) ExportData(e *environment.Environment) error {

func defaultProps(reg string) map[string]interface{} {
return map[string]interface{}{
"global": map[string]interface{}{
"security": map[string]interface{}{
"allowInsecureImages": true,
},
},
"image": map[string]interface{}{
"registry": reg,
"repository": "containers/debian-12",
"tag": "3.4.2",
},
"auth": map[string]interface{}{
"enabled": "false",
"repository": fmt.Sprintf("%s/docker-io/library/influxdb", reg),
"tag": "1.8.10-alpine",
},
"influxdb": map[string]interface{}{
"readinessProbe": map[string]interface{}{
"enabled": false,
},
"livenessProbe": map[string]interface{}{
"enabled": false,
"resources": map[string]interface{}{
"limits": map[string]interface{}{
"memory": "19000Mi",
"cpu": "6",
},
"startupProbe": map[string]interface{}{
"enabled": false,
},
"resources": map[string]interface{}{
"limits": map[string]interface{}{
"memory": "19000Mi",
"cpu": "6",
},
"requests": map[string]interface{}{
"memory": "16000Mi",
"cpu": "5",
},
"requests": map[string]interface{}{
"memory": "16000Mi",
"cpu": "5",
},
},
}
}

func registry() string {
if reg := os.Getenv(config.EnvVarInfluxdbImageRegistry); reg != "" {
return reg
}
return defaultImageRegistry
}

func New(props map[string]interface{}) environment.ConnectedChart {
return NewVersioned("", props)
}

// NewVersioned enables choosing a specific helm chart version
// NewVersioned keeps its signature for API compatibility; the chart version is pinned in influxdataChartURL and the version argument is ignored.
func NewVersioned(helmVersion string, props map[string]interface{}) environment.ConnectedChart {
Comment on lines +92 to 93

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Kept deliberately. The only caller org-wide is atlas's NewVersioned("5.9.8", nil). Chart versions don't map between the old Bitnami chart and the InfluxData chart, so any previously passed version is meaningless after the swap; rejecting non-empty would panic that caller at runtime, and removing the constructor breaks its build. The doc comment on NewVersioned notes the argument is ignored. Happy to drop the constructor in a follow-up once atlas migrates off it.

reg := os.Getenv("BITNAMI_PRIVATE_REGISTRY")
if reg == "" {
panic("BITNAMI_PRIVATE_REGISTRY not set, it is required for Helm charts")
}
dp := defaultProps(reg)
dp := defaultProps(registry())
config.MustMerge(&dp, props)
return Chart{
Name: "influxdb",
Path: fmt.Sprintf("%s/charts/debian-12/influxdb:7.1.47", reg),
Path: influxdataChartURL,
Values: &dp,
Version: helmVersion,
Version: "",
}
}
147 changes: 0 additions & 147 deletions lib/k8s/pkg/helm/kafka/kafka.go

This file was deleted.

2 changes: 1 addition & 1 deletion wasp/benchspy/report.go
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ func NewStandardReport(commitOrTag string, opts ...StandardReportOption) (*Stand
}

if config.reportDirectory != "" {
sr.LocalStorage.Directory = config.reportDirectory
sr.Directory = config.reportDirectory
}

L.Info().
Expand Down
Loading