From f0d77f54924424355ffd7c7e04fe48f0e6842c8b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 10:27:37 +0100 Subject: [PATCH 01/30] fix(deps): update module github.com/go-logr/logr to v1.4.1 (#474) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9e60787d..c7462057 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/Azure/go-autorest/autorest/azure/auth v0.5.0 github.com/StatusCakeDev/statuscake-go v1.3.0 github.com/antoineaugusti/updown v0.0.0-20190412074625-d590ab97f115 - github.com/go-logr/logr v1.2.0 + github.com/go-logr/logr v1.4.1 github.com/grafana/synthetic-monitoring-agent v0.18.2 github.com/grafana/synthetic-monitoring-api-go-client v0.7.0 github.com/kelseyhightower/envconfig v1.4.0 diff --git a/go.sum b/go.sum index 1e0a6afa..02975601 100644 --- a/go.sum +++ b/go.sum @@ -211,6 +211,8 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= From ca77a5bc0d6797f065b69ad554dfc73c67b9da8e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 10:50:20 +0100 Subject: [PATCH 02/30] chore(deps): update module golang.org/x/net to v0.17.0 [security] (#531) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index c7462057..a71cd738 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.1 // indirect golang.org/x/crypto v0.17.0 // indirect - golang.org/x/net v0.16.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sync v0.4.0 // indirect golang.org/x/sys v0.15.0 // indirect diff --git a/go.sum b/go.sum index 02975601..6bbf9dc0 100644 --- a/go.sum +++ b/go.sum @@ -762,6 +762,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= From e9afb8cd62304f2bdf46933d518e599d8913c074 Mon Sep 17 00:00:00 2001 From: stakater-user Date: Wed, 7 Feb 2024 10:24:08 +0000 Subject: [PATCH 03/30] [skip-ci] Update artifacts --- .../ingressmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index 9a0c6a04..10fa70ef 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.49 + name: ingressmonitorcontroller.v2.1.50 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.49 + image: stakater/ingressmonitorcontroller:v2.1.50 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.49 + version: 2.1.50 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index 4cbdc23f..808c792a 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.49 +version: 2.1.50 # Application version to be deployed -appVersion: 2.1.49 +appVersion: 2.1.50 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 2c474c47..7fd70b2e 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.49 + tag: v2.1.50 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index a38a51a9..6c2a8aab 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.49 + newTag: v2.1.50 From 300e82d72fa0e08ad554e9ec1417c96a4365cab3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 15:31:52 +0000 Subject: [PATCH 04/30] chore(deps): update module google.golang.org/protobuf to v1.33.0 [security] --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a71cd738..3300625a 100644 --- a/go.mod +++ b/go.mod @@ -98,7 +98,7 @@ require ( google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect google.golang.org/grpc v1.58.3 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.24.0 // indirect diff --git a/go.sum b/go.sum index 6bbf9dc0..90023de3 100644 --- a/go.sum +++ b/go.sum @@ -1097,6 +1097,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From f0d1c9be452b22dd9e0a8c0490ae392f99f87c86 Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Fri, 15 Mar 2024 00:08:50 +0500 Subject: [PATCH 05/30] Add Probes and Freq in GrafanaConfig --- api/v1alpha1/endpointmonitor_types.go | 8 ++++ api/v1alpha1/zz_generated.deepcopy.go | 7 +++- ...monitor.stakater.com_endpointmonitors.yaml | 14 +++++++ pkg/monitors/grafana/grafana-monitor.go | 41 +++++++++++++++---- 4 files changed, 62 insertions(+), 8 deletions(-) diff --git a/api/v1alpha1/endpointmonitor_types.go b/api/v1alpha1/endpointmonitor_types.go index 1a0dc6bb..66e3da34 100644 --- a/api/v1alpha1/endpointmonitor_types.go +++ b/api/v1alpha1/endpointmonitor_types.go @@ -313,6 +313,14 @@ type GCloudConfig struct { // GrafnaConfiguration defines the configuration for Grafana Cloud Monitor Provider type GrafanaConfig struct { TenantId int64 `json:"tenantId,omitempty"` + + // The frequency value specifies how often the check runs in milliseconds + Frequency int64 `json:"frequency,omitempty"` + + // Probes are the monitoring agents responsible for simulating user interactions with your web applications + // or services. These agents periodically send requests to predefined URLs and record the responses, + // checking for expected outcomes and measuring performance. + Probes []string `json:"probes,omitempty"` } // URLSource represents the set of resources to fetch the URL from diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 7306291c..70122776 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -145,7 +145,7 @@ func (in *EndpointMonitorSpec) DeepCopyInto(out *EndpointMonitorSpec) { if in.GrafanaConfig != nil { in, out := &in.GrafanaConfig, &out.GrafanaConfig *out = new(GrafanaConfig) - **out = **in + (*in).DeepCopyInto(*out) } } @@ -192,6 +192,11 @@ func (in *GCloudConfig) DeepCopy() *GCloudConfig { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *GrafanaConfig) DeepCopyInto(out *GrafanaConfig) { *out = *in + if in.Probes != nil { + in, out := &in.Probes, &out.Probes + *out = make([]string, len(*in)) + copy(*out, *in) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GrafanaConfig. diff --git a/charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml b/charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml index 5367c583..42876fbc 100644 --- a/charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml +++ b/charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml @@ -63,6 +63,20 @@ spec: grafanaConfig: description: Configuration for Grafana Cloud Monitor Provider properties: + frequency: + description: The frequency value specifies how often the check + runs in milliseconds + format: int64 + type: integer + probes: + description: probes are the monitoring agents responsible for + simulating user interactions with your web applications or services. + These agents periodically send requests to predefined URLs and + record the responses, checking for expected outcomes and measuring + performance. + items: + type: string + type: array tenantId: format: int64 type: integer diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index 840c6e8a..176ff6a7 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -3,15 +3,16 @@ package grafana import ( "context" "fmt" + "net/http" + "reflect" + "strconv" + "github.com/grafana/synthetic-monitoring-agent/pkg/pb/synthetic_monitoring" smapi "github.com/grafana/synthetic-monitoring-api-go-client" endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" "github.com/stakater/IngressMonitorController/v2/pkg/config" "github.com/stakater/IngressMonitorController/v2/pkg/models" - "net/http" - "reflect" logf "sigs.k8s.io/controller-runtime/pkg/log" - "strconv" ) var log = logf.Log.WithName("grafana-monitor") @@ -86,13 +87,39 @@ func (service *GrafanaMonitorService) GetAll() (monitors []models.Monitor) { } func (service *GrafanaMonitorService) CreateSyntheticCheck(monitor models.Monitor, tenantID int64) (*synthetic_monitoring.Check, error) { - probes, err := service.smClient.ListProbes(service.ctx) + + availableProbes, err := service.smClient.ListProbes(service.ctx) if err != nil { return nil, fmt.Errorf("Error listing probes %v", err) } - probeIDs := make([]int64, len(probes)) - for i, p := range probes { + var probeToSet []synthetic_monitoring.Probe + var configProbeNames []string + var frequency int64 + providerConfig, _ := monitor.Config.(*endpointmonitorv1alpha1.GrafanaConfig) + if providerConfig != nil { + // load configs from EndpointMonitor CR + if providerConfig.Frequency > 0 { + frequency = providerConfig.Frequency + } else { + frequency = service.frequency + } + if len(providerConfig.Probes) > 0 { + configProbeNames = providerConfig.Probes + for _, probe := range availableProbes { + for _, configProbe := range configProbeNames { + if probe.Name == configProbe { + probeToSet = append(probeToSet, probe) + } + } + } + availableProbes = probeToSet + } + } + + // if probes are set in EndpointMonitor, apply those, otherwise apply all of the available probe options + probeIDs := make([]int64, len(availableProbes)) + for i, p := range availableProbes { probeIDs[i] = p.Id } @@ -105,7 +132,7 @@ func (service *GrafanaMonitorService) CreateSyntheticCheck(monitor models.Monito Id: checkId, Target: monitor.URL, Job: monitor.Name, - Frequency: service.frequency, + Frequency: frequency, TenantId: tenantID, Timeout: 2000, Enabled: true, From ce9eb79b9b53b8c95a44a18290f4ecf228362e18 Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Fri, 15 Mar 2024 00:20:03 +0500 Subject: [PATCH 06/30] fix freq --- docs/grafana-configuration.md | 7 +++++-- pkg/monitors/grafana/grafana-monitor.go | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/grafana-configuration.md b/docs/grafana-configuration.md index 040059d3..87e7e4b1 100644 --- a/docs/grafana-configuration.md +++ b/docs/grafana-configuration.md @@ -41,6 +41,9 @@ metadata: spec: forceHttps: true url: https://stakater.com/ - gcloudConfig: - frequency: 5000 + grafanaConfig: + frequency: 10000 + probes: + - Amsterdam + - Singapore ``` diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index 176ff6a7..b02533e4 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -95,14 +95,12 @@ func (service *GrafanaMonitorService) CreateSyntheticCheck(monitor models.Monito var probeToSet []synthetic_monitoring.Probe var configProbeNames []string - var frequency int64 + var frequency int64 = service.frequency providerConfig, _ := monitor.Config.(*endpointmonitorv1alpha1.GrafanaConfig) if providerConfig != nil { // load configs from EndpointMonitor CR if providerConfig.Frequency > 0 { frequency = providerConfig.Frequency - } else { - frequency = service.frequency } if len(providerConfig.Probes) > 0 { configProbeNames = providerConfig.Probes From 6e7f2d881c0234f9735c68bb64ff7c2c48d25b35 Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Fri, 15 Mar 2024 15:05:05 +0500 Subject: [PATCH 07/30] update tests --- ...ntmonitor.stakater.com_endpointmonitors.yaml | 14 ++++++++++++++ pkg/monitors/grafana/grafana-monitor.go | 17 ++++++++++++++++- pkg/monitors/grafana/grafana-monitor_test.go | 15 ++++++++++++--- 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/config/crd/bases/endpointmonitor.stakater.com_endpointmonitors.yaml b/config/crd/bases/endpointmonitor.stakater.com_endpointmonitors.yaml index 5367c583..7214c768 100644 --- a/config/crd/bases/endpointmonitor.stakater.com_endpointmonitors.yaml +++ b/config/crd/bases/endpointmonitor.stakater.com_endpointmonitors.yaml @@ -63,6 +63,20 @@ spec: grafanaConfig: description: Configuration for Grafana Cloud Monitor Provider properties: + frequency: + description: The frequency value specifies how often the check + runs in milliseconds + format: int64 + type: integer + probes: + description: Probes are the monitoring agents responsible for + simulating user interactions with your web applications or services. + These agents periodically send requests to predefined URLs and + record the responses, checking for expected outcomes and measuring + performance. + items: + type: string + type: array tenantId: format: int64 type: integer diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index b02533e4..3bf82f22 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -72,14 +72,29 @@ func (service *GrafanaMonitorService) GetAll() (monitors []models.Monitor) { log.Error(err, "Error getting monitors") return nil } + availableProbes, err := service.smClient.ListProbes(service.ctx) + if err != nil { + log.Error(err, "Error getting monitors") + return nil + } for _, check := range checks { + var probes []string + for _, probeId := range check.Probes { + for _, availableProbe := range availableProbes { + if probeId == availableProbe.Id { + probes = append(probes, availableProbe.Name) + } + } + } monitors = append(monitors, models.Monitor{ Name: check.Job, URL: check.Target, ID: fmt.Sprintf("%v", check.Id), Config: &endpointmonitorv1alpha1.GrafanaConfig{ - TenantId: check.TenantId, + TenantId: check.TenantId, + Frequency: check.Frequency, + Probes: probes, }, }) } diff --git a/pkg/monitors/grafana/grafana-monitor_test.go b/pkg/monitors/grafana/grafana-monitor_test.go index d78cd8f9..ec85ef8c 100644 --- a/pkg/monitors/grafana/grafana-monitor_test.go +++ b/pkg/monitors/grafana/grafana-monitor_test.go @@ -1,13 +1,15 @@ package grafana import ( + "reflect" + "testing" + endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" "github.com/stakater/IngressMonitorController/v2/pkg/config" "github.com/stakater/IngressMonitorController/v2/pkg/models" "github.com/stakater/IngressMonitorController/v2/pkg/util" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "testing" ) func init() { @@ -27,6 +29,11 @@ func TestAddMonitorWithCorrectValues(t *testing.T) { service.Setup(*provider) m := models.Monitor{Name: "google-test", URL: "https://google.com"} + providerConfig, _ := m.Config.(*endpointmonitorv1alpha1.GrafanaConfig) + providerConfig.Frequency = 20000 + providerConfig.Probes = []string{"Singapore"} + m.Config = providerConfig + preExistingMonitor, _ := service.GetByName(m.Name) if preExistingMonitor != nil { @@ -50,8 +57,10 @@ func TestAddMonitorWithCorrectValues(t *testing.T) { if err != nil { t.Error("Monitor should've been found", monitor, err) } - if monitor.Name != m.Name || monitor.URL != m.URL { - t.Error("URL and name should be the same", monitor, m) + monitorConfig, _ := monitor.Config.(*endpointmonitorv1alpha1.GrafanaConfig) + + if monitor.Name != m.Name || monitor.URL != m.URL || monitorConfig.Frequency != providerConfig.Frequency || reflect.DeepEqual(monitorConfig.Probes, providerConfig.Probes) { + t.Error("URL, name, frequency and probes should be the same", monitor, m) } service.Remove(*monitor) From 8238bdb5fe9ba1938ed315f608a247795a88d8ab Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Fri, 15 Mar 2024 15:12:13 +0500 Subject: [PATCH 08/30] update tests --- pkg/monitors/grafana/grafana-monitor_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/monitors/grafana/grafana-monitor_test.go b/pkg/monitors/grafana/grafana-monitor_test.go index ec85ef8c..1587c86e 100644 --- a/pkg/monitors/grafana/grafana-monitor_test.go +++ b/pkg/monitors/grafana/grafana-monitor_test.go @@ -28,11 +28,10 @@ func TestAddMonitorWithCorrectValues(t *testing.T) { } service.Setup(*provider) - m := models.Monitor{Name: "google-test", URL: "https://google.com"} - providerConfig, _ := m.Config.(*endpointmonitorv1alpha1.GrafanaConfig) - providerConfig.Frequency = 20000 - providerConfig.Probes = []string{"Singapore"} - m.Config = providerConfig + m := models.Monitor{Name: "google-test", URL: "https://google.com", Config: &endpointmonitorv1alpha1.GrafanaConfig{ + Frequency: 20000, + Probes: []string{"Singapore"}, + }} preExistingMonitor, _ := service.GetByName(m.Name) @@ -58,6 +57,7 @@ func TestAddMonitorWithCorrectValues(t *testing.T) { t.Error("Monitor should've been found", monitor, err) } monitorConfig, _ := monitor.Config.(*endpointmonitorv1alpha1.GrafanaConfig) + providerConfig, _ := m.Config.(*endpointmonitorv1alpha1.GrafanaConfig) if monitor.Name != m.Name || monitor.URL != m.URL || monitorConfig.Frequency != providerConfig.Frequency || reflect.DeepEqual(monitorConfig.Probes, providerConfig.Probes) { t.Error("URL, name, frequency and probes should be the same", monitor, m) From b7274d5cb3185fa6c236a52bc65f63b514e646e5 Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Fri, 15 Mar 2024 15:18:12 +0500 Subject: [PATCH 09/30] update tests --- pkg/monitors/grafana/grafana-monitor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index 3bf82f22..b159b89a 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -78,8 +78,8 @@ func (service *GrafanaMonitorService) GetAll() (monitors []models.Monitor) { return nil } + var probes []string for _, check := range checks { - var probes []string for _, probeId := range check.Probes { for _, availableProbe := range availableProbes { if probeId == availableProbe.Id { From 8fc791da8bdf3fb6ddb7e1296e1f9ef3d0e519c5 Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Fri, 15 Mar 2024 15:40:46 +0500 Subject: [PATCH 10/30] update comment --- pkg/monitors/grafana/grafana-monitor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/monitors/grafana/grafana-monitor.go b/pkg/monitors/grafana/grafana-monitor.go index b159b89a..a11f8e94 100644 --- a/pkg/monitors/grafana/grafana-monitor.go +++ b/pkg/monitors/grafana/grafana-monitor.go @@ -74,7 +74,7 @@ func (service *GrafanaMonitorService) GetAll() (monitors []models.Monitor) { } availableProbes, err := service.smClient.ListProbes(service.ctx) if err != nil { - log.Error(err, "Error getting monitors") + log.Error(err, "Error getting probes") return nil } From d62d9e1f68a4b2e1949fa69f9f4c5f0cca90de4f Mon Sep 17 00:00:00 2001 From: stakater-user Date: Fri, 15 Mar 2024 11:17:40 +0000 Subject: [PATCH 11/30] [skip-ci] Update artifacts --- ...pointmonitor.stakater.com_endpointmonitors.yaml | 14 ++++++++++++++ ...essmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- ...pointmonitor.stakater.com_endpointmonitors.yaml | 2 +- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/bundle/manifests/endpointmonitor.stakater.com_endpointmonitors.yaml b/bundle/manifests/endpointmonitor.stakater.com_endpointmonitors.yaml index dc3d9398..25416a1a 100644 --- a/bundle/manifests/endpointmonitor.stakater.com_endpointmonitors.yaml +++ b/bundle/manifests/endpointmonitor.stakater.com_endpointmonitors.yaml @@ -62,6 +62,20 @@ spec: grafanaConfig: description: Configuration for Grafana Cloud Monitor Provider properties: + frequency: + description: The frequency value specifies how often the check + runs in milliseconds + format: int64 + type: integer + probes: + description: Probes are the monitoring agents responsible for + simulating user interactions with your web applications or services. + These agents periodically send requests to predefined URLs and + record the responses, checking for expected outcomes and measuring + performance. + items: + type: string + type: array tenantId: format: int64 type: integer diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index 10fa70ef..faeb3c26 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.50 + name: ingressmonitorcontroller.v2.1.51 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.50 + image: stakater/ingressmonitorcontroller:v2.1.51 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.50 + version: 2.1.51 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index 808c792a..d4905437 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.50 +version: 2.1.51 # Application version to be deployed -appVersion: 2.1.50 +appVersion: 2.1.51 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml b/charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml index 42876fbc..7214c768 100644 --- a/charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml +++ b/charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml @@ -69,7 +69,7 @@ spec: format: int64 type: integer probes: - description: probes are the monitoring agents responsible for + description: Probes are the monitoring agents responsible for simulating user interactions with your web applications or services. These agents periodically send requests to predefined URLs and record the responses, checking for expected outcomes and measuring diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 7fd70b2e..8fab2da7 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.50 + tag: v2.1.51 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 6c2a8aab..1eafd43e 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.50 + newTag: v2.1.51 From 498a27276e6ed33ca2fc6b4385d9f5a0fc14a756 Mon Sep 17 00:00:00 2001 From: stakater-user Date: Wed, 27 Mar 2024 09:44:30 +0000 Subject: [PATCH 12/30] [skip-ci] Update artifacts --- .../ingressmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index faeb3c26..2289fb2e 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.51 + name: ingressmonitorcontroller.v2.1.52 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.51 + image: stakater/ingressmonitorcontroller:v2.1.52 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.51 + version: 2.1.52 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index d4905437..eda41291 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.51 +version: 2.1.52 # Application version to be deployed -appVersion: 2.1.51 +appVersion: 2.1.52 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 8fab2da7..0800766d 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.51 + tag: v2.1.52 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 1eafd43e..4edeae3f 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.51 + newTag: v2.1.52 From 81d0dd423b16708a55a9c92b3352234f59701268 Mon Sep 17 00:00:00 2001 From: Dennis Geiselmann Date: Thu, 28 Mar 2024 21:35:46 +0100 Subject: [PATCH 13/30] feat(574): allow configuring annotations for Deployment --- charts/ingressmonitorcontroller/templates/deployment.yaml | 4 ++++ charts/ingressmonitorcontroller/values.yaml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/charts/ingressmonitorcontroller/templates/deployment.yaml b/charts/ingressmonitorcontroller/templates/deployment.yaml index 6b40d9af..9883f687 100644 --- a/charts/ingressmonitorcontroller/templates/deployment.yaml +++ b/charts/ingressmonitorcontroller/templates/deployment.yaml @@ -6,6 +6,10 @@ metadata: labels: {{- include "ingress-monitor-controller.labels" . | nindent 4 }} control-plane: controller-manager + {{- with .Values.deploymentAnnotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 0800766d..78f2ed5f 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -71,6 +71,8 @@ resources: # cpu: 100m # memory: 128Mi +deploymentAnnotations: {} + podAnnotations: {} podSecurityContext: From f62cd9b32c37a54bed40a6c929214655225dfb06 Mon Sep 17 00:00:00 2001 From: stakater-user Date: Thu, 28 Mar 2024 23:48:17 +0000 Subject: [PATCH 14/30] [skip-ci] Update artifacts --- .../ingressmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index 2289fb2e..2ddeb33d 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.52 + name: ingressmonitorcontroller.v2.1.53 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.52 + image: stakater/ingressmonitorcontroller:v2.1.53 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.52 + version: 2.1.53 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index eda41291..69cef531 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.52 +version: 2.1.53 # Application version to be deployed -appVersion: 2.1.52 +appVersion: 2.1.53 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 78f2ed5f..1dcc3db8 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.52 + tag: v2.1.53 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 4edeae3f..2102b975 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.52 + newTag: v2.1.53 From f1422f7f38dad835235dd1cdc7bba86c1acffe50 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 10:52:48 +0000 Subject: [PATCH 15/30] chore(deps): update module golang.org/x/net to v0.23.0 [security] --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 3300625a..bf370f1a 100644 --- a/go.mod +++ b/go.mod @@ -85,12 +85,12 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.1 // indirect - golang.org/x/crypto v0.17.0 // indirect - golang.org/x/net v0.17.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.23.0 // indirect golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/sync v0.4.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/term v0.15.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect diff --git a/go.sum b/go.sum index 90023de3..60ea8908 100644 --- a/go.sum +++ b/go.sum @@ -671,6 +671,8 @@ golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -764,6 +766,8 @@ golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -869,12 +873,16 @@ golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From e0be51e6b1fac955474c7a0084df79c79ad525bc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 08:11:19 +0000 Subject: [PATCH 16/30] fix(deps): update module github.com/grafana/synthetic-monitoring-api-go-client to v0.8.0 --- go.mod | 48 ++++++++++++++++++++++++------------------------ go.sum | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index bf370f1a..419e8f86 100644 --- a/go.mod +++ b/go.mod @@ -5,22 +5,22 @@ go 1.21 toolchain go1.21.2 require ( - cloud.google.com/go/monitoring v1.15.1 + cloud.google.com/go/monitoring v1.16.3 github.com/Azure/azure-sdk-for-go v44.0.0+incompatible github.com/Azure/go-autorest/autorest/azure/auth v0.5.0 github.com/StatusCakeDev/statuscake-go v1.3.0 github.com/antoineaugusti/updown v0.0.0-20190412074625-d590ab97f115 github.com/go-logr/logr v1.4.1 - github.com/grafana/synthetic-monitoring-agent v0.18.2 - github.com/grafana/synthetic-monitoring-api-go-client v0.7.0 + github.com/grafana/synthetic-monitoring-agent v0.19.4 + github.com/grafana/synthetic-monitoring-api-go-client v0.8.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/openshift/api v0.0.0-20200526144822-34f54f12813a github.com/patrickmn/go-cache v2.1.0+incompatible github.com/russellcardullo/go-pingdom v1.3.0 github.com/stakater/operator-utils v0.1.13 github.com/stretchr/testify v1.8.4 - google.golang.org/api v0.126.0 - google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 + google.golang.org/api v0.149.0 + google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f gopkg.in/yaml.v2 v2.4.0 gotest.tools v2.2.0+incompatible k8s.io/api v0.24.0 @@ -30,7 +30,7 @@ require ( ) require ( - cloud.google.com/go/compute v1.21.0 // indirect + cloud.google.com/go/compute v1.23.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest v0.11.18 // indirect @@ -45,7 +45,7 @@ require ( github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dimchansky/utfbom v1.1.0 // indirect github.com/emicklei/go-restful v2.16.0+incompatible // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect @@ -59,12 +59,12 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.1.0 // indirect - github.com/google/s2a-go v0.1.4 // indirect - github.com/google/uuid v1.3.1 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.11.0 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -75,29 +75,29 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.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.10.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.18.0 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.46.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.24.0 // indirect - go.uber.org/atomic v1.10.0 // indirect + go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.19.1 // indirect golang.org/x/crypto v0.21.0 // indirect golang.org/x/net v0.23.0 // indirect - golang.org/x/oauth2 v0.10.0 // indirect - golang.org/x/sync v0.4.0 // indirect + golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/grpc v1.58.3 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect + google.golang.org/grpc v1.61.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 60ea8908..801e1949 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,8 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/compute v1.21.0 h1:JNBsyXVoOoNJtTQcnEY5uYpZIbeCTYIeDe0Xh1bySMk= cloud.google.com/go/compute v1.21.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= +cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= @@ -33,6 +35,8 @@ cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/monitoring v1.15.1 h1:65JhLMd+JiYnXr6j5Z63dUYCuOg770p8a/VC+gil/58= cloud.google.com/go/monitoring v1.15.1/go.mod h1:lADlSAlFdbqQuwwpaImhsJXu1QSdd3ojypXrFSMr2rM= +cloud.google.com/go/monitoring v1.16.3 h1:mf2SN9qSoBtIgiMA4R/y4VADPWZA7VCNJA079qLaZQ8= +cloud.google.com/go/monitoring v1.16.3/go.mod h1:KwSsX5+8PnXv5NJnICZzW2R8pWTis8ypC4zmdRD63Tw= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -155,6 +159,8 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4= @@ -297,6 +303,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -317,17 +325,25 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4= github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= +github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= @@ -338,8 +354,12 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grafana/synthetic-monitoring-agent v0.18.2 h1:YW92rw38q3QB2dY34UK+O0a/735PlHLk4zWcOzrTro0= github.com/grafana/synthetic-monitoring-agent v0.18.2/go.mod h1:TZzTibceWuSz/vb8K8JpdfAucuMctDCAKN7R0EaDIO4= +github.com/grafana/synthetic-monitoring-agent v0.19.4 h1:6L3Nb9Sw1XmIs7jPcbquTilWUc+H63MvFFpNXIYzymA= +github.com/grafana/synthetic-monitoring-agent v0.19.4/go.mod h1:9S3Yx8EMaluA90aD4YCJnJH/Xpk+SMgMGd7NWdn41Lg= github.com/grafana/synthetic-monitoring-api-go-client v0.7.0 h1:3ZfQzmXDBPcQTTgMAIIiTw5Dwxm/B4lzf34Sto0d0YY= github.com/grafana/synthetic-monitoring-api-go-client v0.7.0/go.mod h1:ET64tbp14yq3U8X97/IO/KbG+FqU5Z8DigWrzGUHX40= +github.com/grafana/synthetic-monitoring-api-go-client v0.8.0 h1:Tm4MtwwYmPNInGfnj66l6j6KOshMkNV4emIVKJdlXMg= +github.com/grafana/synthetic-monitoring-api-go-client v0.8.0/go.mod h1:TGaywTdL2Z+PJhpWzJEmJFRF5K55vKz2f39mWY/GvV8= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -493,6 +513,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -503,12 +525,16 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -517,6 +543,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= +github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= +github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -526,6 +554,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -638,6 +668,8 @@ go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= @@ -783,6 +815,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= +golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= +golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -797,6 +831,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1002,6 +1038,8 @@ google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBz google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o= google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= +google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= +google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1010,6 +1048,8 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -1059,10 +1099,16 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWotvtrwxFNrNE9CUAGtplaDK5NNI/g= google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98/go.mod h1:S7mY02OqCJTD0E1OiQy1F72PWFB4bZJ87cAtLPYgDR0= +google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 h1:1hfbdAfFbkmpg41000wDVqr7jUpK/Yo+LPnIxxGzmkg= +google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic= google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 h1:FmF5cCW94Ij59cfpoLiwTgodWmm60eEV0CjlsVg2fuw= google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= +google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f h1:2yNACc1O40tTnrsbk9Cv6oxiW8pxI/pXj0wRtdlYmgY= +google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1090,6 +1136,8 @@ google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From d344180cc57e01610fa41f59f94401e21d24148f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 10:10:22 +0000 Subject: [PATCH 17/30] chore(deps): update actions/setup-go action to v5 --- .github/workflows/pull_request.yml | 2 +- .github/workflows/push.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 455ed3ae..4e1e9cf2 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -28,7 +28,7 @@ jobs: ref: ${{github.event.pull_request.head.sha}} - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ env.GOLANG_VERSION }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c1f70651..bfe19ebb 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -36,7 +36,7 @@ jobs: fetch-depth: 0 # otherwise, you will fail to push refs to dest repo - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ env.GOLANG_VERSION }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 349e246d..1ad4a152 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 # See: https://goreleaser.com/ci/actions/ - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ${{ env.GOLANG_VERSION }} From fde709787dd9a80b1ac260955bdca25c22a73c19 Mon Sep 17 00:00:00 2001 From: stakater-user Date: Wed, 24 Apr 2024 10:10:29 +0000 Subject: [PATCH 18/30] [skip-ci] Update artifacts --- .../ingressmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index 2ddeb33d..d2fd5e9b 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.53 + name: ingressmonitorcontroller.v2.1.54 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.53 + image: stakater/ingressmonitorcontroller:v2.1.54 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.53 + version: 2.1.54 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index 69cef531..31f396f1 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.53 +version: 2.1.54 # Application version to be deployed -appVersion: 2.1.53 +appVersion: 2.1.54 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 1dcc3db8..32569f0b 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.53 + tag: v2.1.54 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 2102b975..5d9fa589 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.53 + newTag: v2.1.54 From 33b59b51e5bc34ca280d532f0e3a25cd707485df Mon Sep 17 00:00:00 2001 From: stakater-user Date: Wed, 24 Apr 2024 18:44:56 +0000 Subject: [PATCH 19/30] [skip-ci] Update artifacts --- .../ingressmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index d2fd5e9b..e0be18ca 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.54 + name: ingressmonitorcontroller.v2.1.55 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.54 + image: stakater/ingressmonitorcontroller:v2.1.55 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.54 + version: 2.1.55 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index 31f396f1..ba69ea4d 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.54 +version: 2.1.55 # Application version to be deployed -appVersion: 2.1.54 +appVersion: 2.1.55 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 32569f0b..42413f3b 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.54 + tag: v2.1.55 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 5d9fa589..60e80b03 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.54 + newTag: v2.1.55 From 0312598b3d4d0544743769490a73a5fb0f5b705b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 14:06:37 +0200 Subject: [PATCH 20/30] chore(deps): update docker/login-action action to v3 (#586) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/pull_request.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 455ed3ae..ebe6369d 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -86,7 +86,7 @@ jobs: buildkitd-flags: --debug - name: Login to Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c1f70651..dc944347 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -96,7 +96,7 @@ jobs: buildkitd-flags: --debug - name: Login to Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }} password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }} From 79196610071b2eb9c4eee64c3796f103370f884c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 14:38:33 +0200 Subject: [PATCH 21/30] chore(deps): update docker/setup-qemu-action action to v3 (#588) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/pull_request.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ebe6369d..33223334 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -78,7 +78,7 @@ jobs: echo "GIT_TAG=$(echo ${tag})" >> $GITHUB_OUTPUT - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index dc944347..98d591a7 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -88,7 +88,7 @@ jobs: DRY_RUN: true - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From ced125d96c97affb16b939d2ddf3d8c685b2f37d Mon Sep 17 00:00:00 2001 From: stakater-user Date: Wed, 8 May 2024 12:44:09 +0000 Subject: [PATCH 22/30] [skip-ci] Update artifacts --- .../ingressmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index e0be18ca..00f64d63 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.55 + name: ingressmonitorcontroller.v2.1.56 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.55 + image: stakater/ingressmonitorcontroller:v2.1.56 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.55 + version: 2.1.56 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index ba69ea4d..cf75c33c 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.55 +version: 2.1.56 # Application version to be deployed -appVersion: 2.1.55 +appVersion: 2.1.56 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 42413f3b..83bc719a 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.55 + tag: v2.1.56 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 60e80b03..07da2f8a 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.55 + newTag: v2.1.56 From bad444040b3af84fe3e27f1506cfc8c5387833fa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 15:38:48 +0200 Subject: [PATCH 23/30] chore(deps): update docker/setup-buildx-action action to v3 (#587) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/pull_request.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 33223334..002a2b09 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -81,7 +81,7 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 98d591a7..8c8c2651 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -91,7 +91,7 @@ jobs: uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 with: buildkitd-flags: --debug From 606a4fba62baa1e1b32ae7217edf986087e7b99b Mon Sep 17 00:00:00 2001 From: stakater-user Date: Wed, 8 May 2024 14:10:55 +0000 Subject: [PATCH 24/30] [skip-ci] Update artifacts --- .../ingressmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index 00f64d63..0a5678b6 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.56 + name: ingressmonitorcontroller.v2.1.57 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.56 + image: stakater/ingressmonitorcontroller:v2.1.57 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.56 + version: 2.1.57 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index cf75c33c..83b1ae14 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.56 +version: 2.1.57 # Application version to be deployed -appVersion: 2.1.56 +appVersion: 2.1.57 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 83bc719a..d61c1268 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.56 + tag: v2.1.57 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 07da2f8a..f4f9b3e4 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.56 + newTag: v2.1.57 From 7895137f8790db51ede11c14461dad03ac6e03b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 17:17:23 +0200 Subject: [PATCH 25/30] chore(deps): update actions/checkout action to v4 (#583) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/pull_request.yml | 2 +- .github/workflows/push.yml | 2 +- .github/workflows/release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 002a2b09..44207d9f 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{github.event.pull_request.head.sha}} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 8c8c2651..c0fc6aa3 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token fetch-depth: 0 # otherwise, you will fail to push refs to dest repo diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 349e246d..82fd6ec7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # See: https://goreleaser.com/ci/actions/ From 4946c8132f605683ec5d5f8a8150f46c66dda466 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 17:25:30 +0200 Subject: [PATCH 26/30] chore(deps): update azure/setup-helm action to v4 (#584) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/pull_request.yml | 2 +- .github/workflows/push.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 44207d9f..2d80057a 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -41,7 +41,7 @@ jobs: # Set up helm binary - name: Set up Helm - uses: azure/setup-helm@v3 + uses: azure/setup-helm@v4 with: version: ${{ env.HELM_VERSION }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index c0fc6aa3..b41735a3 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -49,7 +49,7 @@ jobs: # Set up helm binary - name: Set up Helm - uses: azure/setup-helm@v3 + uses: azure/setup-helm@v4 with: version: ${{ env.HELM_VERSION }} From f78974d2cd079da8152d3bd32a61b8bacf0bcde6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 17:33:32 +0200 Subject: [PATCH 27/30] chore(deps): update docker/build-push-action action to v5 (#585) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/pull_request.yml | 2 +- .github/workflows/push.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2d80057a..f496608d 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -96,7 +96,7 @@ jobs: echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ${{ env.DOCKER_FILE_PATH }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index b41735a3..ca457b14 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -106,7 +106,7 @@ jobs: echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ${{ env.DOCKER_FILE_PATH }} @@ -160,7 +160,7 @@ jobs: run: operator-sdk bundle validate ./bundle --select-optional name=operatorhub - name: Build and push Bundle Image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ${{ env.BUNDLE_DOCKER_FILE_PATH }} From 4ac23867d600e40418e0f22944bf4518ffab8625 Mon Sep 17 00:00:00 2001 From: stakater-user Date: Wed, 8 May 2024 16:05:39 +0000 Subject: [PATCH 28/30] [skip-ci] Update artifacts --- .../ingressmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index 0a5678b6..4be73cc0 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.57 + name: ingressmonitorcontroller.v2.1.58 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.57 + image: stakater/ingressmonitorcontroller:v2.1.58 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.57 + version: 2.1.58 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index 83b1ae14..ddc06268 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.57 +version: 2.1.58 # Application version to be deployed -appVersion: 2.1.57 +appVersion: 2.1.58 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index d61c1268..35e3d055 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.57 + tag: v2.1.58 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index f4f9b3e4..9c9bffb9 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.57 + newTag: v2.1.58 From 0223ad942f085531178a0d4bdb1838c76b046d2e Mon Sep 17 00:00:00 2001 From: Muneeb Aijaz <43588696+MuneebAijaz@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:13:48 +0500 Subject: [PATCH 29/30] Add sleep in UptimeRobot tests to get over free tier (#594) * Add sleep in uptimerobot tests to get over free tier * Add sleep in uptimerobot tests to get over free tier --- .../uptimerobot/uptime-monitor_test.go | 68 +++++++++++-------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/pkg/monitors/uptimerobot/uptime-monitor_test.go b/pkg/monitors/uptimerobot/uptime-monitor_test.go index bbeb8809..cdcf13a7 100644 --- a/pkg/monitors/uptimerobot/uptime-monitor_test.go +++ b/pkg/monitors/uptimerobot/uptime-monitor_test.go @@ -3,6 +3,7 @@ package uptimerobot import ( "strconv" "testing" + "time" endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1" "github.com/stakater/IngressMonitorController/v2/pkg/config" @@ -57,6 +58,7 @@ func TestAddMonitorWithCorrectValues(t *testing.T) { m := models.Monitor{Name: "google-test", URL: "https://google.com"} service.Add(m) + time.Sleep(time.Second * 30) mRes, err := service.GetByName("google-test") if err != nil { @@ -84,6 +86,7 @@ func TestUpdateMonitorWithCorrectValues(t *testing.T) { m := models.Monitor{Name: "google-test", URL: "https://google.com"} service.Add(m) + time.Sleep(time.Second * 30) mRes, err := service.GetByName("google-test") if err != nil { @@ -129,6 +132,7 @@ func TestAddMonitorWithInterval(t *testing.T) { m := models.Monitor{Name: "google-test", URL: "https://google.com", Config: configInterval} service.Add(m) + time.Sleep(time.Second * 30) mRes, err := service.GetByName("google-test") if err != nil { @@ -165,6 +169,7 @@ func TestUpdateMonitorInterval(t *testing.T) { m := models.Monitor{Name: "google-test", URL: "https://google.com", Config: configInterval} service.Add(m) + time.Sleep(time.Second * 30) mRes, err := service.GetByName("google-test") if err != nil { @@ -332,6 +337,7 @@ func TestAddMonitorWithMonitorType(t *testing.T) { m := models.Monitor{Name: "google-test", URL: "https://google.com", Config: configKeyword} service.Add(m) + time.Sleep(time.Second * 30) mRes, err := service.GetByName("google-test") if err != nil { @@ -376,6 +382,7 @@ func TestAddMonitorWithIncorrectValues(t *testing.T) { m := models.Monitor{Name: "google-test", URL: "https://google.com"} service.Add(m) + time.Sleep(time.Second * 30) mRes, err := service.GetByName("google-test") if err != nil { @@ -387,39 +394,42 @@ func TestAddMonitorWithIncorrectValues(t *testing.T) { } } -func TestAddMonitorWithAlertContacts(t *testing.T) { - config := config.GetControllerConfigTest() +// disabling this test since Free Tier UptimeRobot doesnt allow to add Alert Contacts - service := UpTimeMonitorService{} - provider := util.GetProviderWithName(config, "UptimeRobot") - if provider == nil { - return - } - service.Setup(*provider) +// func TestAddMonitorWithAlertContacts(t *testing.T) { +// config := config.GetControllerConfigTest() - configAlertContacts := &endpointmonitorv1alpha1.UptimeRobotConfig{ - AlertContacts: "2628365_0_0", - } +// service := UpTimeMonitorService{} +// provider := util.GetProviderWithName(config, "UptimeRobot") +// if provider == nil { +// return +// } +// service.Setup(*provider) - m := models.Monitor{Name: "google-test", URL: "https://google.com", Config: configAlertContacts} - service.Add(m) +// configAlertContacts := &endpointmonitorv1alpha1.UptimeRobotConfig{ +// AlertContacts: "2628365_0_0", +// } - mRes, err := service.GetByName("google-test") +// time.Sleep(time.Second * 30) +// m := models.Monitor{Name: "google-test", URL: "https://google.com", Config: configAlertContacts} +// service.Add(m) - if err != nil { - t.Error("Error: " + err.Error()) - } - if mRes.Name != m.Name { - t.Error("The name is incorrect, expected: " + m.Name + ", but was: " + mRes.Name) - } - if mRes.URL != m.URL { - t.Error("The URL is incorrect, expected: " + m.URL + ", but was: " + mRes.URL) - } +// mRes, err := service.GetByName("google-test") - providerConfig, _ := mRes.Config.(*endpointmonitorv1alpha1.UptimeRobotConfig) +// if err != nil { +// t.Error("Error: " + err.Error()) +// } +// if mRes.Name != m.Name { +// t.Error("The name is incorrect, expected: " + m.Name + ", but was: " + mRes.Name) +// } +// if mRes.URL != m.URL { +// t.Error("The URL is incorrect, expected: " + m.URL + ", but was: " + mRes.URL) +// } - if "2628365_0_0" != providerConfig.AlertContacts { - t.Error("The alert-contacts is incorrect, expected: 2628365_0_0, but was: " + providerConfig.AlertContacts) - } - service.Remove(*mRes) -} +// providerConfig, _ := mRes.Config.(*endpointmonitorv1alpha1.UptimeRobotConfig) + +// if "2628365_0_0" != providerConfig.AlertContacts { +// t.Error("The alert-contacts is incorrect, expected: 2628365_0_0, but was: " + providerConfig.AlertContacts) +// } +// service.Remove(*mRes) +// } From 88a3c4704511084a0d44f43ff9e47e6a603eb331 Mon Sep 17 00:00:00 2001 From: stakater-user Date: Wed, 5 Jun 2024 08:48:10 +0000 Subject: [PATCH 30/30] [skip-ci] Update artifacts --- .../ingressmonitorcontroller.clusterserviceversion.yaml | 6 +++--- charts/ingressmonitorcontroller/Chart.yaml | 4 ++-- charts/ingressmonitorcontroller/values.yaml | 2 +- config/manager/kustomization.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml index 4be73cc0..14b93ede 100644 --- a/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml +++ b/bundle/manifests/ingressmonitorcontroller.clusterserviceversion.yaml @@ -18,7 +18,7 @@ metadata: capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.18.0+git operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - name: ingressmonitorcontroller.v2.1.58 + name: ingressmonitorcontroller.v2.1.59 namespace: placeholder spec: apiservicedefinitions: {} @@ -151,7 +151,7 @@ spec: - --leader-elect command: - /manager - image: stakater/ingressmonitorcontroller:v2.1.58 + image: stakater/ingressmonitorcontroller:v2.1.59 livenessProbe: httpGet: path: /healthz @@ -251,4 +251,4 @@ spec: provider: name: stakater url: https://stakater.com - version: 2.1.58 + version: 2.1.59 diff --git a/charts/ingressmonitorcontroller/Chart.yaml b/charts/ingressmonitorcontroller/Chart.yaml index ddc06268..6785ac99 100644 --- a/charts/ingressmonitorcontroller/Chart.yaml +++ b/charts/ingressmonitorcontroller/Chart.yaml @@ -3,10 +3,10 @@ name: ingressmonitorcontroller description: IngressMonitorController Operator chart that runs on kubernetes # Helm chart Version -version: 2.1.58 +version: 2.1.59 # Application version to be deployed -appVersion: 2.1.58 +appVersion: 2.1.59 keywords: - IngressMonitorController diff --git a/charts/ingressmonitorcontroller/values.yaml b/charts/ingressmonitorcontroller/values.yaml index 35e3d055..af1bef58 100644 --- a/charts/ingressmonitorcontroller/values.yaml +++ b/charts/ingressmonitorcontroller/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: repository: stakater/ingressmonitorcontroller - tag: v2.1.58 + tag: v2.1.59 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 9c9bffb9..f7760bc7 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: stakater/ingressmonitorcontroller - newTag: v2.1.58 + newTag: v2.1.59