From e7fd5940ba48e8f40a9451d44eebecab662be786 Mon Sep 17 00:00:00 2001 From: DangPeng Liu Date: Mon, 6 Jan 2025 11:18:21 +0800 Subject: [PATCH 1/3] remove resource limit (#1310) Signed-off-by: root --- doc/event-exporter/values.yaml | 3 - .../scenario/Scenario4: kafka_metrics.md | 2 - .../scenario/Scenario5: postgres_metrics.md | 2 - .../v1alpha4/multiclusterglobalhub_types.go | 4 -- .../v1alpha4/zz_generated.deepcopy.go | 7 --- ...al-hub-operator.clusterserviceversion.yaml | 2 - ...-management.io_multiclusterglobalhubs.yaml | 55 ------------------- ...-management.io_multiclusterglobalhubs.yaml | 55 ------------------- .../default/manager_auth_proxy_patch.yaml | 3 - operator/config/manager/manager.yaml | 4 -- operator/pkg/config/addon_config.go | 3 - ...ticluster-global-hub-agent-deployment.yaml | 6 -- .../grafana/manifests/deployment.yaml | 6 -- .../manager/manifests/deployment.yaml | 6 -- .../manifests.sts/postgres-statefulset.yaml | 6 -- .../protocol/strimzi_transporter_test.go | 9 --- .../deployer/testdata/typedv1/deployment.yaml | 3 - .../testdata/typedv1/statefulset.yaml | 3 - .../deployer/testdata/typedv2/deployment.yaml | 3 - .../testdata/typedv2/statefulset.yaml | 3 - .../renderer/testdata/input/all-nginx.yaml | 3 - operator/pkg/renderer/testdata/input/all.yaml | 3 - .../pkg/renderer/testdata/input/default.yaml | 3 - .../pkg/renderer/testdata/input/external.yaml | 3 - operator/pkg/renderer/testdata/input/ha.yaml | 3 - .../testdata/output/all-nginx.golden.yaml | 3 - .../renderer/testdata/output/all.golden.yaml | 3 - .../testdata/output/default.golden.yaml | 3 - .../testdata/output/external.golden.yaml | 3 - .../renderer/testdata/output/ha.golden.yaml | 3 - operator/pkg/utils/utils.go | 26 ++------- operator/pkg/utils/utils_test.go | 27 +-------- .../operator/controllers/transporter_test.go | 7 --- 33 files changed, 7 insertions(+), 268 deletions(-) diff --git a/doc/event-exporter/values.yaml b/doc/event-exporter/values.yaml index 134143da7..f8cede625 100644 --- a/doc/event-exporter/values.yaml +++ b/doc/event-exporter/values.yaml @@ -32,9 +32,6 @@ resources: {} # choice for the user. This also increases chances charts run on environments with little # resources, such as Minikube. If you do want to specify resources, uncomment the following # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi # requests: # cpu: 100m # memory: 128Mi diff --git a/doc/simulation/scenario/Scenario4: kafka_metrics.md b/doc/simulation/scenario/Scenario4: kafka_metrics.md index 8889b12d6..7985d2113 100644 --- a/doc/simulation/scenario/Scenario4: kafka_metrics.md +++ b/doc/simulation/scenario/Scenario4: kafka_metrics.md @@ -57,8 +57,6 @@ ... replicas: 3 resources: - limits: - memory: 4Gi requests: cpu: 25m memory: 128Mi diff --git a/doc/simulation/scenario/Scenario5: postgres_metrics.md b/doc/simulation/scenario/Scenario5: postgres_metrics.md index 9deab330e..b1324420f 100644 --- a/doc/simulation/scenario/Scenario5: postgres_metrics.md +++ b/doc/simulation/scenario/Scenario5: postgres_metrics.md @@ -48,8 +48,6 @@ imagePullPolicy: Always name: multicluster-global-hub-postgresql resources: - limits: - memory: 4Gi requests: cpu: 25m memory: 128Mi diff --git a/operator/api/operator/v1alpha4/multiclusterglobalhub_types.go b/operator/api/operator/v1alpha4/multiclusterglobalhub_types.go index bdd6f52e4..0e681841e 100644 --- a/operator/api/operator/v1alpha4/multiclusterglobalhub_types.go +++ b/operator/api/operator/v1alpha4/multiclusterglobalhub_types.go @@ -140,10 +140,6 @@ type CommonSpec struct { // ResourceRequirements copied from corev1.ResourceRequirements // We do not need to support ResourceClaim type ResourceRequirements struct { - // Limits describes the maximum amount of compute resources allowed. - // For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - // +optional - Limits corev1.ResourceList `json:"limits,omitempty"` // Requests describes the minimum amount of compute resources required. // If requests are omitted for a container, it defaults to the specified limits. // If there are no specified limits, it defaults to an implementation-defined value. diff --git a/operator/api/operator/v1alpha4/zz_generated.deepcopy.go b/operator/api/operator/v1alpha4/zz_generated.deepcopy.go index ff6779e76..eb9e0c59b 100644 --- a/operator/api/operator/v1alpha4/zz_generated.deepcopy.go +++ b/operator/api/operator/v1alpha4/zz_generated.deepcopy.go @@ -275,13 +275,6 @@ func (in *PostgresSpec) DeepCopy() *PostgresSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ResourceRequirements) DeepCopyInto(out *ResourceRequirements) { *out = *in - if in.Limits != nil { - in, out := &in.Limits, &out.Limits - *out = make(v1.ResourceList, len(*in)) - for key, val := range *in { - (*out)[key] = val.DeepCopy() - } - } if in.Requests != nil { in, out := &in.Requests, &out.Requests *out = make(v1.ResourceList, len(*in)) diff --git a/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml b/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml index 8e7a64f49..851051c21 100644 --- a/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml +++ b/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml @@ -806,8 +806,6 @@ spec: initialDelaySeconds: 5 periodSeconds: 10 resources: - limits: - memory: 200Mi requests: cpu: 1m memory: 100Mi diff --git a/operator/bundle/manifests/operator.open-cluster-management.io_multiclusterglobalhubs.yaml b/operator/bundle/manifests/operator.open-cluster-management.io_multiclusterglobalhubs.yaml index 2c564ed88..496353f3c 100644 --- a/operator/bundle/manifests/operator.open-cluster-management.io_multiclusterglobalhubs.yaml +++ b/operator/bundle/manifests/operator.open-cluster-management.io_multiclusterglobalhubs.yaml @@ -66,17 +66,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: @@ -98,17 +87,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: @@ -130,17 +108,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: @@ -163,17 +130,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: @@ -195,17 +151,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: diff --git a/operator/config/crd/bases/operator.open-cluster-management.io_multiclusterglobalhubs.yaml b/operator/config/crd/bases/operator.open-cluster-management.io_multiclusterglobalhubs.yaml index 1491f8a0f..d632e8f82 100644 --- a/operator/config/crd/bases/operator.open-cluster-management.io_multiclusterglobalhubs.yaml +++ b/operator/config/crd/bases/operator.open-cluster-management.io_multiclusterglobalhubs.yaml @@ -66,17 +66,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: @@ -98,17 +87,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: @@ -130,17 +108,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: @@ -163,17 +130,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: @@ -195,17 +151,6 @@ spec: resources: description: Compute Resources required by this component properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: |- - Limits describes the maximum amount of compute resources allowed. - For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ - type: object requests: additionalProperties: anyOf: diff --git a/operator/config/default/manager_auth_proxy_patch.yaml b/operator/config/default/manager_auth_proxy_patch.yaml index c60b531fb..8f0c1476d 100644 --- a/operator/config/default/manager_auth_proxy_patch.yaml +++ b/operator/config/default/manager_auth_proxy_patch.yaml @@ -21,9 +21,6 @@ spec: protocol: TCP name: https resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 5m memory: 64Mi diff --git a/operator/config/manager/manager.yaml b/operator/config/manager/manager.yaml index c6e64c0b5..a7dd06d99 100644 --- a/operator/config/manager/manager.yaml +++ b/operator/config/manager/manager.yaml @@ -77,10 +77,6 @@ spec: # TODO(user): Configure the resources accordingly based on the project requirements. # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ resources: - limits: - # cpu: 50m - # https://home.robusta.dev/blog/stop-using-cpu-limits - memory: 200Mi requests: cpu: 1m memory: 100Mi diff --git a/operator/pkg/config/addon_config.go b/operator/pkg/config/addon_config.go index fe82c35aa..44437dee8 100644 --- a/operator/pkg/config/addon_config.go +++ b/operator/pkg/config/addon_config.go @@ -128,9 +128,6 @@ type ManifestsConfig struct { } type Resources struct { - // Limits corresponds to the JSON schema field "limits". - Limits *apiextensions.JSON `json:"limits,omitempty"` - // Requests corresponds to the JSON schema field "requests". Requests *apiextensions.JSON `json:"requests,omitempty"` } diff --git a/operator/pkg/controllers/agent/manifests/templates/agent/multicluster-global-hub-agent-deployment.yaml b/operator/pkg/controllers/agent/manifests/templates/agent/multicluster-global-hub-agent-deployment.yaml index 580a14024..d04d6ef44 100644 --- a/operator/pkg/controllers/agent/manifests/templates/agent/multicluster-global-hub-agent-deployment.yaml +++ b/operator/pkg/controllers/agent/manifests/templates/agent/multicluster-global-hub-agent-deployment.yaml @@ -21,12 +21,6 @@ spec: - name: multicluster-global-hub-agent image: {{ .HoHAgentImage }} resources: - {{- if .Resources.Limits }} - limits: - {{- range $key, $value := .Resources.Limits }} - {{$key}}: {{$value}} - {{- end }} - {{- end }} {{- if .Resources.Requests }} requests: {{- range $key, $value := .Resources.Requests }} diff --git a/operator/pkg/controllers/grafana/manifests/deployment.yaml b/operator/pkg/controllers/grafana/manifests/deployment.yaml index cac4c1e80..a748700d4 100644 --- a/operator/pkg/controllers/grafana/manifests/deployment.yaml +++ b/operator/pkg/controllers/grafana/manifests/deployment.yaml @@ -55,12 +55,6 @@ spec: fieldRef: fieldPath: status.podIP resources: - {{- if .Resources.Limits }} - limits: - {{- range $key, $value := .Resources.Limits }} - {{$key}}: {{.ToUnstructured}} - {{- end }} - {{- end }} {{- if .Resources.Requests }} requests: {{- range $key, $value := .Resources.Requests }} diff --git a/operator/pkg/controllers/manager/manifests/deployment.yaml b/operator/pkg/controllers/manager/manifests/deployment.yaml index afe8779aa..54027bfca 100644 --- a/operator/pkg/controllers/manager/manifests/deployment.yaml +++ b/operator/pkg/controllers/manager/manifests/deployment.yaml @@ -20,12 +20,6 @@ spec: - name: multicluster-global-hub-manager image: {{.Image}} resources: - {{- if .Resources.Limits }} - limits: - {{- range $key, $value := .Resources.Limits }} - {{$key}}: {{.ToUnstructured}} - {{- end }} - {{- end }} {{- if .Resources.Requests }} requests: {{- range $key, $value := .Resources.Requests }} diff --git a/operator/pkg/controllers/storage/manifests.sts/postgres-statefulset.yaml b/operator/pkg/controllers/storage/manifests.sts/postgres-statefulset.yaml index 4d6a8b497..5b90752a5 100644 --- a/operator/pkg/controllers/storage/manifests.sts/postgres-statefulset.yaml +++ b/operator/pkg/controllers/storage/manifests.sts/postgres-statefulset.yaml @@ -51,12 +51,6 @@ spec: initialDelaySeconds: 5 timeoutSeconds: 1 resources: - {{- if .Resources.Limits }} - limits: - {{- range $key, $value := .Resources.Limits }} - {{$key}}: {{.ToUnstructured}} - {{- end }} - {{- end }} {{- if .Resources.Requests }} requests: {{- range $key, $value := .Resources.Requests }} diff --git a/operator/pkg/controllers/transporter/protocol/strimzi_transporter_test.go b/operator/pkg/controllers/transporter/protocol/strimzi_transporter_test.go index 15665b669..2b37e8b5a 100644 --- a/operator/pkg/controllers/transporter/protocol/strimzi_transporter_test.go +++ b/operator/pkg/controllers/transporter/protocol/strimzi_transporter_test.go @@ -118,9 +118,6 @@ func TestNewKafkaCluster(t *testing.T) { } ], "resources": { - "limits": { - "memory": "4Gi" - }, "requests": { "cpu": "25m", "memory": "128Mi" @@ -191,9 +188,6 @@ func TestNewKafkaCluster(t *testing.T) { } ], "resources": { - "limits": { - "memory": "4Gi" - }, "requests": { "cpu": "25m", "memory": "128Mi" @@ -278,9 +272,6 @@ func TestNewKafkaCluster(t *testing.T) { } ], "resources": { - "limits": { - "memory": "4Gi" - }, "requests": { "cpu": "25m", "memory": "128Mi" diff --git a/operator/pkg/deployer/testdata/typedv1/deployment.yaml b/operator/pkg/deployer/testdata/typedv1/deployment.yaml index f337b19a6..fe3e2ff2e 100644 --- a/operator/pkg/deployer/testdata/typedv1/deployment.yaml +++ b/operator/pkg/deployer/testdata/typedv1/deployment.yaml @@ -36,9 +36,6 @@ spec: path: / port: http resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 250m memory: 64Mi diff --git a/operator/pkg/deployer/testdata/typedv1/statefulset.yaml b/operator/pkg/deployer/testdata/typedv1/statefulset.yaml index b94382f5b..182634006 100644 --- a/operator/pkg/deployer/testdata/typedv1/statefulset.yaml +++ b/operator/pkg/deployer/testdata/typedv1/statefulset.yaml @@ -36,9 +36,6 @@ spec: path: / port: http resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 250m memory: 64Mi diff --git a/operator/pkg/deployer/testdata/typedv2/deployment.yaml b/operator/pkg/deployer/testdata/typedv2/deployment.yaml index 75870539a..81903e8a9 100644 --- a/operator/pkg/deployer/testdata/typedv2/deployment.yaml +++ b/operator/pkg/deployer/testdata/typedv2/deployment.yaml @@ -36,9 +36,6 @@ spec: path: / port: http resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 250m memory: 64Mi diff --git a/operator/pkg/deployer/testdata/typedv2/statefulset.yaml b/operator/pkg/deployer/testdata/typedv2/statefulset.yaml index 952f8dae6..a133df033 100644 --- a/operator/pkg/deployer/testdata/typedv2/statefulset.yaml +++ b/operator/pkg/deployer/testdata/typedv2/statefulset.yaml @@ -36,9 +36,6 @@ spec: path: / port: http resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 250m memory: 64Mi diff --git a/operator/pkg/renderer/testdata/input/all-nginx.yaml b/operator/pkg/renderer/testdata/input/all-nginx.yaml index 43a363285..6bbe57503 100644 --- a/operator/pkg/renderer/testdata/input/all-nginx.yaml +++ b/operator/pkg/renderer/testdata/input/all-nginx.yaml @@ -29,9 +29,6 @@ resources: requests: memory: 64Mi cpu: 250m - limits: - memory: 128Mi - cpu: 500m nodeSelector: node-role.kubernetes.io/worker: "" tolerations: diff --git a/operator/pkg/renderer/testdata/input/all.yaml b/operator/pkg/renderer/testdata/input/all.yaml index 43a363285..6bbe57503 100644 --- a/operator/pkg/renderer/testdata/input/all.yaml +++ b/operator/pkg/renderer/testdata/input/all.yaml @@ -29,9 +29,6 @@ resources: requests: memory: 64Mi cpu: 250m - limits: - memory: 128Mi - cpu: 500m nodeSelector: node-role.kubernetes.io/worker: "" tolerations: diff --git a/operator/pkg/renderer/testdata/input/default.yaml b/operator/pkg/renderer/testdata/input/default.yaml index 38e91cc87..b3b9f9e30 100644 --- a/operator/pkg/renderer/testdata/input/default.yaml +++ b/operator/pkg/renderer/testdata/input/default.yaml @@ -25,9 +25,6 @@ resources: requests: memory: 64Mi cpu: 250m - limits: - memory: 128Mi - cpu: 500m nodeSelector: node-role.kubernetes.io/worker: "" tolerations: diff --git a/operator/pkg/renderer/testdata/input/external.yaml b/operator/pkg/renderer/testdata/input/external.yaml index b556e729d..9128806ef 100644 --- a/operator/pkg/renderer/testdata/input/external.yaml +++ b/operator/pkg/renderer/testdata/input/external.yaml @@ -25,9 +25,6 @@ resources: requests: memory: 64Mi cpu: 250m - limits: - memory: 128Mi - cpu: 500m nodeSelector: node-role.kubernetes.io/worker: "" tolerations: diff --git a/operator/pkg/renderer/testdata/input/ha.yaml b/operator/pkg/renderer/testdata/input/ha.yaml index 48b7d4aa1..994602fc2 100644 --- a/operator/pkg/renderer/testdata/input/ha.yaml +++ b/operator/pkg/renderer/testdata/input/ha.yaml @@ -29,9 +29,6 @@ resources: requests: memory: 64Mi cpu: 250m - limits: - memory: 128Mi - cpu: 500m nodeSelector: node-role.kubernetes.io/worker: "" tolerations: diff --git a/operator/pkg/renderer/testdata/output/all-nginx.golden.yaml b/operator/pkg/renderer/testdata/output/all-nginx.golden.yaml index 32897932f..4371367da 100644 --- a/operator/pkg/renderer/testdata/output/all-nginx.golden.yaml +++ b/operator/pkg/renderer/testdata/output/all-nginx.golden.yaml @@ -35,9 +35,6 @@ spec: path: / port: http resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 250m memory: 64Mi diff --git a/operator/pkg/renderer/testdata/output/all.golden.yaml b/operator/pkg/renderer/testdata/output/all.golden.yaml index 258320a71..f3dbbf40c 100644 --- a/operator/pkg/renderer/testdata/output/all.golden.yaml +++ b/operator/pkg/renderer/testdata/output/all.golden.yaml @@ -35,9 +35,6 @@ spec: path: / port: http resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 250m memory: 64Mi diff --git a/operator/pkg/renderer/testdata/output/default.golden.yaml b/operator/pkg/renderer/testdata/output/default.golden.yaml index a831b03a3..91772002c 100644 --- a/operator/pkg/renderer/testdata/output/default.golden.yaml +++ b/operator/pkg/renderer/testdata/output/default.golden.yaml @@ -47,9 +47,6 @@ spec: path: / port: http resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 250m memory: 64Mi diff --git a/operator/pkg/renderer/testdata/output/external.golden.yaml b/operator/pkg/renderer/testdata/output/external.golden.yaml index c16c9e9a6..85f90d850 100644 --- a/operator/pkg/renderer/testdata/output/external.golden.yaml +++ b/operator/pkg/renderer/testdata/output/external.golden.yaml @@ -36,9 +36,6 @@ spec: path: / port: http resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 250m memory: 64Mi diff --git a/operator/pkg/renderer/testdata/output/ha.golden.yaml b/operator/pkg/renderer/testdata/output/ha.golden.yaml index 0521deacb..1258949a7 100644 --- a/operator/pkg/renderer/testdata/output/ha.golden.yaml +++ b/operator/pkg/renderer/testdata/output/ha.golden.yaml @@ -46,9 +46,6 @@ spec: path: / port: http resources: - limits: - cpu: 500m - memory: 128Mi requests: cpu: 250m memory: 64Mi diff --git a/operator/pkg/utils/utils.go b/operator/pkg/utils/utils.go index 6d74b7ff4..21131a445 100644 --- a/operator/pkg/utils/utils.go +++ b/operator/pkg/utils/utils.go @@ -283,56 +283,48 @@ func GetReadyMulticlusterGlobalHub(ctx context.Context, client client.Client) (* func GetResources(component string, advanced *v1alpha4.AdvancedSpec) *corev1.ResourceRequirements { resourceReq := corev1.ResourceRequirements{} requests := corev1.ResourceList{} - limits := corev1.ResourceList{} switch component { case operatorconstants.Grafana: requests[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.GrafanaMemoryRequest) requests[corev1.ResourceName(corev1.ResourceCPU)] = resource.MustParse(operatorconstants.GrafanaCPURequest) - limits[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.GrafanaMemoryLimit) - limits[corev1.ResourceName(corev1.ResourceCPU)] = resource.MustParse(operatorconstants.GrafanaCPULimit) if advanced != nil && advanced.Grafana != nil { - setResourcesFromCR(advanced.Grafana.Resources, requests, limits) + setResourcesFromCR(advanced.Grafana.Resources, requests) } case operatorconstants.Postgres: requests[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.PostgresMemoryRequest) requests[corev1.ResourceName(corev1.ResourceCPU)] = resource.MustParse(operatorconstants.PostgresCPURequest) - limits[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.PostgresMemoryLimit) if advanced != nil && advanced.Postgres != nil { - setResourcesFromCR(advanced.Postgres.Resources, requests, limits) + setResourcesFromCR(advanced.Postgres.Resources, requests) } case operatorconstants.Manager: requests[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.ManagerMemoryRequest) requests[corev1.ResourceName(corev1.ResourceCPU)] = resource.MustParse(operatorconstants.ManagerCPURequest) - limits[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.ManagerMemoryLimit) if advanced != nil && advanced.Manager != nil { - setResourcesFromCR(advanced.Manager.Resources, requests, limits) + setResourcesFromCR(advanced.Manager.Resources, requests) } case operatorconstants.Agent: requests[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.AgentMemoryRequest) requests[corev1.ResourceName(corev1.ResourceCPU)] = resource.MustParse(operatorconstants.AgentCPURequest) - limits[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.AgentMemoryLimit) if advanced != nil && advanced.Agent != nil { - setResourcesFromCR(advanced.Agent.Resources, requests, limits) + setResourcesFromCR(advanced.Agent.Resources, requests) } case operatorconstants.Kafka: requests[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.KafkaMemoryRequest) requests[corev1.ResourceName(corev1.ResourceCPU)] = resource.MustParse(operatorconstants.KafkaCPURequest) - limits[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(operatorconstants.KafkaMemoryLimit) if advanced != nil && advanced.Kafka != nil { - setResourcesFromCR(advanced.Kafka.Resources, requests, limits) + setResourcesFromCR(advanced.Kafka.Resources, requests) } } - resourceReq.Limits = limits resourceReq.Requests = requests return &resourceReq } -func setResourcesFromCR(res *v1alpha4.ResourceRequirements, requests, limits corev1.ResourceList) { +func setResourcesFromCR(res *v1alpha4.ResourceRequirements, requests corev1.ResourceList) { if res != nil { if res.Requests.Memory().String() != "0" { requests[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(res.Requests.Memory().String()) @@ -340,12 +332,6 @@ func setResourcesFromCR(res *v1alpha4.ResourceRequirements, requests, limits cor if res.Requests.Cpu().String() != "0" { requests[corev1.ResourceName(corev1.ResourceCPU)] = resource.MustParse(res.Requests.Cpu().String()) } - if res.Limits.Memory().String() != "0" { - limits[corev1.ResourceName(corev1.ResourceMemory)] = resource.MustParse(res.Limits.Memory().String()) - } - if res.Limits.Cpu().String() != "0" { - limits[corev1.ResourceName(corev1.ResourceCPU)] = resource.MustParse(res.Limits.Cpu().String()) - } } } diff --git a/operator/pkg/utils/utils_test.go b/operator/pkg/utils/utils_test.go index ce586a44e..2189501db 100644 --- a/operator/pkg/utils/utils_test.go +++ b/operator/pkg/utils/utils_test.go @@ -276,27 +276,21 @@ groups: func Test_GetResources(t *testing.T) { customCPURequest := "1m" - customCPULimit := "2m" customMemoryRequest := "1Mi" - customMemoryLimit := "2Mi" tests := []struct { name string component string advanced func(resReq *v1alpha4.ResourceRequirements) *v1alpha4.AdvancedSpec cpuRequest string - cpuLimit string memoryRequest string - memoryLimit string custom bool }{ { name: "Test Grafana with default values", component: constants.Grafana, cpuRequest: constants.GrafanaCPURequest, - cpuLimit: constants.GrafanaCPULimit, memoryRequest: constants.GrafanaMemoryRequest, - memoryLimit: constants.GrafanaMemoryLimit, }, { name: "Test Grafana with customized values", @@ -314,9 +308,7 @@ func Test_GetResources(t *testing.T) { name: "Test Postgres with default values", component: constants.Postgres, cpuRequest: constants.PostgresCPURequest, - cpuLimit: "0", memoryRequest: constants.PostgresMemoryRequest, - memoryLimit: constants.PostgresMemoryLimit, }, { name: "Test Postgres with customized values", @@ -334,9 +326,7 @@ func Test_GetResources(t *testing.T) { name: "Test Agent with default values", component: constants.Agent, cpuRequest: constants.AgentCPURequest, - cpuLimit: "0", memoryRequest: constants.AgentMemoryRequest, - memoryLimit: constants.AgentMemoryLimit, }, { name: "Test Agent with customized values", @@ -354,9 +344,7 @@ func Test_GetResources(t *testing.T) { name: "Test Manager with default values", component: constants.Manager, cpuRequest: constants.ManagerCPURequest, - cpuLimit: "0", memoryRequest: constants.ManagerMemoryRequest, - memoryLimit: constants.ManagerMemoryLimit, }, { name: "Test Manager with customized values", @@ -374,9 +362,7 @@ func Test_GetResources(t *testing.T) { name: "Test Kafka with default values", component: constants.Kafka, cpuRequest: constants.KafkaCPURequest, - cpuLimit: "0", memoryRequest: constants.KafkaMemoryRequest, - memoryLimit: constants.KafkaMemoryLimit, }, { name: "Test Kafka with customized values", @@ -393,10 +379,6 @@ func Test_GetResources(t *testing.T) { } resReq := &v1alpha4.ResourceRequirements{ - Limits: corev1.ResourceList{ - corev1.ResourceName(corev1.ResourceCPU): resource.MustParse(customCPULimit), - corev1.ResourceName(corev1.ResourceMemory): resource.MustParse(customMemoryLimit), - }, Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceMemory): resource.MustParse(customMemoryRequest), corev1.ResourceName(corev1.ResourceCPU): resource.MustParse(customCPURequest), @@ -409,17 +391,10 @@ func Test_GetResources(t *testing.T) { if tt.custom { advanced = tt.advanced(resReq) tt.cpuRequest = customCPURequest - tt.cpuLimit = customCPULimit - tt.memoryLimit = customMemoryLimit tt.memoryRequest = customMemoryRequest } res := GetResources(tt.component, advanced) - if res.Limits.Cpu().String() != tt.cpuLimit { - t.Errorf("expect cpu: %v, actual cpu: %v", tt.cpuLimit, res.Limits.Cpu().String()) - } - if res.Limits.Memory().String() != tt.memoryLimit { - t.Errorf("expect memory: %v, actual memory: %v", tt.memoryLimit, res.Limits.Memory().String()) - } + if res.Requests.Memory().String() != tt.memoryRequest { t.Errorf("expect memory: %v, actual memory: %v", tt.memoryRequest, res.Requests.Memory().String()) } diff --git a/test/integration/operator/controllers/transporter_test.go b/test/integration/operator/controllers/transporter_test.go index 3584f5424..1ba1adddd 100644 --- a/test/integration/operator/controllers/transporter_test.go +++ b/test/integration/operator/controllers/transporter_test.go @@ -244,16 +244,10 @@ var _ = Describe("transporter", Ordered, func() { ) customCPURequest := "1m" - customCPULimit := "2m" customMemoryRequest := "1Mi" - customMemoryLimit := "2Mi" mgh.Spec.AdvancedSpec = &v1alpha4.AdvancedSpec{ Kafka: &v1alpha4.CommonSpec{ Resources: &v1alpha4.ResourceRequirements{ - Limits: corev1.ResourceList{ - corev1.ResourceName(corev1.ResourceCPU): resource.MustParse(customCPULimit), - corev1.ResourceName(corev1.ResourceMemory): resource.MustParse(customMemoryLimit), - }, Requests: corev1.ResourceList{ corev1.ResourceName(corev1.ResourceMemory): resource.MustParse(customMemoryRequest), corev1.ResourceName(corev1.ResourceCPU): resource.MustParse(customCPURequest), @@ -321,7 +315,6 @@ var _ = Describe("transporter", Ordered, func() { Expect(kafka.Spec.Kafka.Template.Pod.ImagePullSecrets).NotTo(BeEmpty()) Expect(string(kafka.Spec.Kafka.Resources.Requests.Raw)).To(Equal(`{"cpu":"1m","memory":"1Mi"}`)) - Expect(string(kafka.Spec.Kafka.Resources.Limits.Raw)).To(Equal(`{"cpu":"2m","memory":"2Mi"}`)) Expect(kafka.Spec.EntityOperator.Template.Pod.Affinity.NodeAffinity).NotTo(BeNil()) Expect(kafka.Spec.EntityOperator.Template.Pod.Tolerations).NotTo(BeEmpty()) From 3325b06292a026f4d9d76485fa91803a5033186a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:19:42 +0800 Subject: [PATCH 2/3] :seedling: Bump github.com/IBM/sarama from 1.40.1 to 1.44.0 (#1313) Bumps [github.com/IBM/sarama](https://github.com/IBM/sarama) from 1.40.1 to 1.44.0. - [Release notes](https://github.com/IBM/sarama/releases) - [Changelog](https://github.com/IBM/sarama/blob/main/CHANGELOG.md) - [Commits](https://github.com/IBM/sarama/compare/v1.40.1...v1.44.0) --- updated-dependencies: - dependency-name: github.com/IBM/sarama dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 10 +++++----- go.sum | 29 +++++++++++------------------ 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index 77d6ec0f7..2f1b7cab8 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/stolostron/multicluster-global-hub go 1.23.2 require ( - github.com/IBM/sarama v1.40.1 + github.com/IBM/sarama v1.44.0 github.com/RedHatInsights/strimzi-client-go v0.34.2 github.com/cenkalti/backoff/v4 v4.3.0 github.com/cloudevents/sdk-go/protocol/kafka_confluent/v2 v2.0.0-20241021120453-70fb95191324 @@ -89,8 +89,8 @@ require ( github.com/containerd/containerd/api v1.8.0 // indirect github.com/cyphar/filepath-securejoin v0.3.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/eapache/go-resiliency v1.3.0 // indirect - github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect + github.com/eapache/go-resiliency v1.7.0 // indirect + github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/emicklei/go-restful/v3 v3.12.0 // indirect github.com/evanphx/json-patch/v5 v5.9.0 // indirect @@ -145,7 +145,7 @@ require ( github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/gofork v1.7.6 // indirect - github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect @@ -171,7 +171,7 @@ require ( github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect - github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_golang v1.20.5 diff --git a/go.sum b/go.sum index 7a704e79c..da88c5553 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/IBM/sarama v1.40.1 h1:lL01NNg/iBeigUbT+wpPysuTYW6roHo6kc1QrffRf0k= -github.com/IBM/sarama v1.40.1/go.mod h1:+5OFwA5Du9I6QrznhaMHsuwWdWZNMjaBSIxEWEgKOYE= +github.com/IBM/sarama v1.44.0 h1:puNKqcScjSAgVLramjsuovZrS0nJZFVsrvuUymkWqhE= +github.com/IBM/sarama v1.44.0/go.mod h1:MxQ9SvGfvKIorbk077Ff6DUnBlGpidiQOtU2vuBaxVw= github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -88,10 +88,7 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc= -github.com/Shopify/toxiproxy/v2 v2.5.0/go.mod h1:yhM2epWtAmel9CB8r2+L+PCmhH6yH2pITaPAo7jxJl0= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= @@ -324,11 +321,11 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-resiliency v1.3.0 h1:RRL0nge+cWGlxXbUzJ7yMcq6w2XBEr19dCN6HECGaT0= -github.com/eapache/go-resiliency v1.3.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= +github.com/eapache/go-resiliency v1.7.0 h1:n3NRTnBn5N0Cbi/IeOHuQn9s2UwVUH7Ga0ZWcP+9JTA= +github.com/eapache/go-resiliency v1.7.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 h1:8yY/I9ndfrgrXUbOGObLHKBR4Fl3nZXwM2c7OYTT8hM= -github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4ALJ04o5Qqpdz8XLIpNA3WM/iSIXqxtqo7UGVws= +github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= @@ -739,8 +736,8 @@ github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVET github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= -github.com/jcmturner/gokrb5/v8 v8.4.3 h1:iTonLeSJOn7MVUtyMT+arAn5AKAPrkilzhGw8wE/Tq8= -github.com/jcmturner/gokrb5/v8 v8.4.3/go.mod h1:dqRwJGXznQrzw6cWmyo6kH+E7jksEQG/CyVWsJEsJO0= +github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= +github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= @@ -1006,8 +1003,8 @@ github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rK github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 h1:Ii+DKncOVM8Cu1Hc+ETb5K+23HdAMvESYE3ZJ5b5cMI= github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= +github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1363,7 +1360,7 @@ golang.org/x/crypto v0.0.0-20201124201722-c8d3bf9c5392/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= @@ -1456,9 +1453,7 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= @@ -1554,7 +1549,6 @@ golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1592,7 +1586,6 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= From 1b7a94e320fe84abfe826b7c5750f030d5fc0ad0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:19:58 +0800 Subject: [PATCH 3/3] :seedling: Bump gorm.io/datatypes from 1.2.4 to 1.2.5 (#1312) Bumps [gorm.io/datatypes](https://github.com/go-gorm/datatypes) from 1.2.4 to 1.2.5. - [Commits](https://github.com/go-gorm/datatypes/compare/v1.2.4...v1.2.5) --- updated-dependencies: - dependency-name: gorm.io/datatypes dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 2f1b7cab8..32fae5e54 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( go.uber.org/zap v1.27.0 gopkg.in/ini.v1 v1.67.0 gopkg.in/yaml.v2 v2.4.0 - gorm.io/datatypes v1.2.4 + gorm.io/datatypes v1.2.5 gorm.io/driver/postgres v1.5.9 gorm.io/gorm v1.25.12 helm.sh/helm/v3 v3.16.4 diff --git a/go.sum b/go.sum index da88c5553..937c2ba54 100644 --- a/go.sum +++ b/go.sum @@ -854,8 +854,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182aff github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= -github.com/microsoft/go-mssqldb v0.17.0 h1:Fto83dMZPnYv1Zwx5vHHxpNraeEaUlQ/hhHLgZiaenE= -github.com/microsoft/go-mssqldb v0.17.0/go.mod h1:OkoNGhGEs8EZqchVTtochlXruEhEOaO4S0d2sB5aeGQ= +github.com/microsoft/go-mssqldb v1.7.2 h1:CHkFJiObW7ItKTJfHo1QX7QBBD1iV+mn1eOyRP3b/PA= +github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU= github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= @@ -1798,16 +1798,16 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/datatypes v1.2.4 h1:uZmGAcK/QZ0uyfCuVg0VQY1ZmV9h1fuG0tMwKByO1z4= -gorm.io/datatypes v1.2.4/go.mod h1:f4BsLcFAX67szSv8svwLRjklArSHAvHLeE3pXAS5DZI= +gorm.io/datatypes v1.2.5 h1:9UogU3jkydFVW1bIVVeoYsTpLRgwDVW3rHfJG6/Ek9I= +gorm.io/datatypes v1.2.5/go.mod h1:I5FUdlKpLb5PMqeMQhm30CQ6jXP8Rj89xkTeCSAaAD4= gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8= gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM= gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= gorm.io/driver/sqlite v1.5.6 h1:fO/X46qn5NUEEOZtnjJRWRzZMe8nqJiQ9E+0hi+hKQE= gorm.io/driver/sqlite v1.5.6/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4= -gorm.io/driver/sqlserver v1.4.1 h1:t4r4r6Jam5E6ejqP7N82qAJIJAht27EGT41HyPfXRw0= -gorm.io/driver/sqlserver v1.4.1/go.mod h1:DJ4P+MeZbc5rvY58PnmN1Lnyvb5gw5NPzGshHDnJLig= +gorm.io/driver/sqlserver v1.5.4 h1:xA+Y1KDNspv79q43bPyjDMUgHoYHLhXYmdFcYPobg8g= +gorm.io/driver/sqlserver v1.5.4/go.mod h1:+frZ/qYmuna11zHPlh5oc2O6ZA/lS88Keb0XSH1Zh/g= gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8= gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=