Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

remove prom scrape annotation #1053

Merged

Conversation

discostur
Copy link

This closes #1049

Summary Of Changes

Remove legacy prometheus scrape annotations of statefulset / pod

Local Testing

All tests have passed successfully.

$  make unit-tests integration-tests
go mod download
grep _ tools/tools.go | awk -F '"' '{print $2}' | xargs -t go install
go install github.com/elastic/crd-ref-docs github.com/mikefarah/yq/v4 github.com/onsi/ginkgo/v2/ginkgo github.com/sclevine/yj sigs.k8s.io/controller-runtime/tools/setup-envtest sigs.k8s.io/controller-tools/cmd/controller-gen sigs.k8s.io/kind sigs.k8s.io/kustomize/kustomize/v4
crd-ref-docs \
                --source-path ./api/v1beta1 \
                --config ./docs/api/autogen/config.yaml \
                --templates-dir ./docs/api/autogen/templates \
                --output-path ./docs/api/rabbitmq.com.ref.asciidoc \
                --max-depth 30
2022-06-01T11:08:10.068+0200    INFO    crd-ref-docs    Loading configuration   {"path": "./docs/api/autogen/config.yaml"}
2022-06-01T11:08:10.069+0200    INFO    crd-ref-docs    Processing source directory     {"directory": "./api/v1beta1", "depth": 30}
2022-06-01T11:08:10.778+0200    WARN    crd-ref-docs    Failed to find type     {"name": "Quantity", "package": "k8s.io/apimachinery/pkg/api/resource"}
2022-06-01T11:08:10.779+0200    WARN    crd-ref-docs    Failed to find type     {"name": "IntOrString", "package": "k8s.io/apimachinery/pkg/util/intstr"}
2022-06-01T11:08:10.784+0200    INFO    crd-ref-docs    Rendering output        {"path": "./docs/api/rabbitmq.com.ref.asciidoc"}
2022-06-01T11:08:10.799+0200    INFO    crd-ref-docs    CRD reference documentation generated
2022-06-01T11:08:10.799+0200    INFO    crd-ref-docs    Execution time: 730.012479ms
controller-gen object:headerFile=./hack/NOTICE.go.txt paths=./api/...
controller-gen object:headerFile=./hack/NOTICE.go.txt paths=./internal/status/...
go fmt ./...
go vet ./...
controller-gen crd rbac:roleName=operator-role paths="./api/...;./controllers/..." output:crd:artifacts:config=config/crd/bases
./hack/remove-override-descriptions.sh
./hack/add-notice-to-yaml.sh config/rbac/role.yaml
./hack/add-notice-to-yaml.sh config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml
ginkgo -r --randomize-all api/ internal/
[1654074498] v1beta1 Suite - 26/26 specs •••••••••••••••••••••••••• SUCCESS! 8.542292731s PASS
[1654074498] Metadata Suite - 6/6 specs •••••• SUCCESS! 442.097µs PASS
[1654074498] Resource Suite - 221/221 specs ••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••• SUCCESS! 240.71162ms PASS
[1654074498] Scaling Suite - 9/9 specs ••••••••• SUCCESS! 1.225194ms PASS
[1654074498] Status Suite - 49/49 specs ••••••••••••••••••••••••••••••••••••••••••••••••• SUCCESS! 3.384262ms PASS

Ginkgo ran 5 suites in 14.952961218s
Test Suite Passed
ginkgo -r controllers/
Running Suite: Controller Suite - /Users/kilianries/git/github/cluster-operator/controllers
===========================================================================================
Random Seed: 1654074513

Will run 51 of 51 specs
•••
------------------------------
• [SLOW TEST] [12.021 seconds]
Reconcile CLI when the cluster is not configured to run post-deploy steps when the cluster is updated does not trigger the controller to run rabbitmq-queues rebalance all
/Users/kilianries/git/github/cluster-operator/controllers/reconcile_cli_test.go:171
------------------------------
• [SLOW TEST] [12.020 seconds]
Reconcile CLI when the cluster is a single node cluster when the cluster is updated does not trigger the controller to run rabbitmq-queues rebalance all
/Users/kilianries/git/github/cluster-operator/controllers/reconcile_cli_test.go:230
------------------------------
• [SLOW TEST] [11.026 seconds]
Persistence does not allow changing the capcity from zero (no persistence)
/Users/kilianries/git/github/cluster-operator/controllers/reconcile_no_persistence_test.go:54
------------------------------
• [SLOW TEST] [11.026 seconds]
Cluster scale down does not allow cluster scale down
/Users/kilianries/git/github/cluster-operator/controllers/reconcile_scale_down_test.go:34
------------------------------
•••
------------------------------
• [SLOW TEST] [11.026 seconds]
Persistence does not allow PVC shrink
/Users/kilianries/git/github/cluster-operator/controllers/reconcile_persistence_test.go:50
------------------------------
•••••••••••••••••••••••••••••••••••••••
------------------------------
• [SLOW TEST] [11.050 seconds]
RabbitmqClusterController Pause reconciliation works
/Users/kilianries/git/github/cluster-operator/controllers/rabbitmqcluster_controller_test.go:1171
------------------------------

Ran 51 of 51 Specs in 141.763 seconds
SUCCESS! -- 51 Passed | 0 Failed | 0 Pending | 0 Skipped
PASS

Ginkgo ran 1 suite in 2m26.29906911s
Test Suite Passed

Regards,
Kilian

@Zerpet Zerpet self-assigned this Jun 1, 2022
@Zerpet Zerpet self-requested a review June 1, 2022 10:26
Copy link
Collaborator

@Zerpet Zerpet left a comment

Choose a reason for hiding this comment

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

This looks correct to me. Thank you!
I will merge after the CI passes.

@Zerpet Zerpet merged commit 303b286 into rabbitmq:main Jun 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Duplicate prometheus metrics with operator deployment
2 participants