Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: stolostron/multicluster-observability-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 381b3ac436d729c14d852b72db12a986c979869a
Choose a base ref
..
head repository: stolostron/multicluster-observability-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce342fb08d9bfb12c1bc00ccc2eb611cbe563fb9
Choose a head ref
7 changes: 1 addition & 6 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -33,9 +33,4 @@ jobs:
# We exclude the dockerfile as we have manually modified that to use a different user.
# In addition we exclude createdAt changes in the CSV file that happen on each make bundle.
- name: check diff
run: |
git diff -I '^ createdAt: ' --exit-code -- . \
':(exclude)operators/multiclusterobservability/bundle.Dockerfile' \
':(exclude)operators/multiclusterobservability/bundle/manifests/multicluster-observability-operator.clusterserviceversion.yaml' \
':(exclude)operators/multiclusterobservability/manifests/base/grafana/deployment.yaml' \
':(exclude)operators/multiclusterobservability/manifests/base/observatorium/operator.yaml'
run: "git diff -I '^ createdAt: ' --exit-code -- . ':(exclude)operators/multiclusterobservability/bundle.Dockerfile'"
Original file line number Diff line number Diff line change
@@ -62,9 +62,6 @@ spec:
exec:
command: ["/bin/sh", "-c", "/usr/local/bin/prestop.sh"]
resources:
limits:
cpu: 600m
memory: 3Gi
requests:
cpu: 100m
memory: 128Mi
Original file line number Diff line number Diff line change
@@ -163,6 +163,10 @@ data:
- kubevirt_vmi_storage_iops_read_total
- kubevirt_vmi_storage_iops_write_total
- kubevirt_vm_resource_requests
- kubevirt_vmi_storage_write_traffic_bytes_total
- kubevirt_vmi_storage_read_traffic_bytes_total
- node_memory_MemTotal_bytes
- node_cpu_seconds_total
matches:
Original file line number Diff line number Diff line change
@@ -35,6 +35,10 @@ spec:
- '{__name__="kubevirt_vmi_phase_count"}'
- '{__name__="kubevirt_vmi_storage_iops_read_total"}'
- '{__name__="kubevirt_vmi_storage_iops_write_total"}'
- '{__name__="kubevirt_vmi_storage_write_traffic_bytes_total"}'
- '{__name__="kubevirt_vmi_storage_read_traffic_bytes_total"}'
- '{__name__="node_memory_MemTotal_bytes"}'
- '{__name__="node_cpu_seconds_total"}'
metricRelabelings:
- action: labeldrop
regex: prometheus_replica|managed_cluster|id
2 changes: 1 addition & 1 deletion tests/pkg/utils/utils.go
Original file line number Diff line number Diff line change
@@ -597,7 +597,7 @@ func GetPullSecret(opt TestOptions) (string, error) {

func LoginOCUser(opt TestOptions, user string, password string) error {
klog.Errorf("Login as %s with server url %s", user, opt.HubCluster.ClusterServerURL)
cmd, err := exec.Command("oc", "login", "-u", user, "-p", password, "--server", opt.HubCluster.ClusterServerURL, "--insecure-skip-tls-verify").CombinedOutput()
cmd, err := exec.Command("oc", "login", "-u", user, "-p", password, "--server", opt.HubCluster.ClusterServerURL, "--insecure-skip-tls-verify").CombinedOutput() //nolint:gosec
if err != nil {
return fmt.Errorf("failed to login as %s: %s", user, string(cmd))
}