From 926cef46ee856d690294ed02009149563d493c33 Mon Sep 17 00:00:00 2001 From: Michael Valdron Date: Wed, 29 May 2024 09:43:04 -0400 Subject: [PATCH] chore(DEVHAS-661): Remove Environment API (#480) * bump quay.io/redhat-appstudio/application-api to ref 'c647c0b' Signed-off-by: Michael Valdron * remove grafana rate limiting metrics for SEB controller Signed-off-by: Michael Valdron * remove Environment API and SEB CR samples Signed-off-by: Michael Valdron * remove SEB and Environment CRs from cluster permission API groups in bundle CSV Signed-off-by: Michael Valdron --------- Signed-off-by: Michael Valdron --- ...ication-service.clusterserviceversion.yaml | 34 -- .../has-rate-limiting-metrics.json | 335 ------------------ config/samples/binding/binding.yaml | 45 --- config/samples/environment/environment.yaml | 13 - go.mod | 2 +- go.sum | 4 +- 6 files changed, 3 insertions(+), 430 deletions(-) delete mode 100644 config/samples/binding/binding.yaml delete mode 100644 config/samples/environment/environment.yaml diff --git a/bundle/manifests/application-service.clusterserviceversion.yaml b/bundle/manifests/application-service.clusterserviceversion.yaml index 727860018..14f7de3cf 100644 --- a/bundle/manifests/application-service.clusterserviceversion.yaml +++ b/bundle/manifests/application-service.clusterserviceversion.yaml @@ -102,32 +102,6 @@ spec: - get - patch - update - - apiGroups: - - appstudio.redhat.com - resources: - - snapshotenvironmentbindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - appstudio.redhat.com - resources: - - snapshotenvironmentbindings/finalizers - verbs: - - update - - apiGroups: - - appstudio.redhat.com - resources: - - snapshotenvironmentbindings/status - verbs: - - get - - patch - - update - apiGroups: - appstudio.redhat.com resources: @@ -188,14 +162,6 @@ spec: - get - patch - update - - apiGroups: - - appstudio.redhat.com - resources: - - environments - verbs: - - get - - list - - watch - apiGroups: - "" resources: diff --git a/config/monitoring/grafana-dashboards/has-rate-limiting-metrics.json b/config/monitoring/grafana-dashboards/has-rate-limiting-metrics.json index 6f602ed39..4075dafd9 100644 --- a/config/monitoring/grafana-dashboards/has-rate-limiting-metrics.json +++ b/config/monitoring/grafana-dashboards/has-rate-limiting-metrics.json @@ -4318,13 +4318,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\"}[1h]))", - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\"}[1h]))", @@ -4341,14 +4334,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\"}[1h]))", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\"}[1h]))", @@ -4441,14 +4426,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token1\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token1\"}[1h])) by (operation)", @@ -4465,14 +4442,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token1\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token1\"}[1h])) by (operation)", @@ -4554,14 +4523,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token2\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token2\"}[1h])) by (operation)", @@ -4578,14 +4539,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token2\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": " sum(increase(controller_git_request{controller=\"Component\",operation=\"CommitAndPush\", tokenName=\"token2\"}[1h])) by (operation)", @@ -4667,14 +4620,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token3\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token3\"}[1h])) by (operation)", @@ -4691,14 +4636,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token3\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token3\"}[1h])) by (operation)", @@ -4780,14 +4717,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token4\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token4\"}[1h])) by (operation)", @@ -4804,14 +4733,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token4\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token4\"}[1h])) by (operation)", @@ -4893,14 +4814,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token5\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token5\"}[1h])) by (operation)", @@ -4917,14 +4830,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token5\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token5\"}[1h])) by (operation)", @@ -5006,14 +4911,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token6\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token6\"}[1h])) by (operation)", @@ -5030,14 +4927,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token6\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token6\"}[1h])) by (operation)", @@ -5119,14 +5008,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token7\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token7\"}[1h])) by (operation)", @@ -5143,14 +5024,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token7\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token7\"}[1h])) by (operation)", @@ -5232,14 +5105,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token8\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token8\"}[1h])) by (operation)", @@ -5256,14 +5121,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token8\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token8\"}[1h])) by (operation)", @@ -5345,14 +5202,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token9\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token9\"}[1h])) by (operation)", @@ -5369,14 +5218,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token9\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token9\"}[1h])) by (operation)", @@ -5458,14 +5299,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token10\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token10\"}[1h])) by (operation)", @@ -5482,14 +5315,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token10\"}[1h])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token10\"}[1h])) by (operation)", @@ -5586,14 +5411,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token1\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token1\"}[5m])) by (operation)", @@ -5610,14 +5427,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token1\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token1\"}[5m])) by (operation)", @@ -5699,14 +5508,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token2\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token2\"}[5m])) by (operation)", @@ -5723,14 +5524,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token2\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token2\"}[5m])) by (operation)", @@ -5812,14 +5605,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token3\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token3\"}[5m])) by (operation)", @@ -5836,14 +5621,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\",operation=\"GenerateOverlaysAndPush\", tokenName=\"token3\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token3\"}[5m])) by (operation)", @@ -5925,14 +5702,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token4\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token4\"}[5m])) by (operation)", @@ -5949,14 +5718,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\",operation=\"GenerateOverlaysAndPush\", tokenName=\"token4\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token4\"}[5m])) by (operation)", @@ -6038,14 +5799,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token5\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token5\"}[5m])) by (operation)", @@ -6062,14 +5815,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token5\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token5\"}[5m])) by (operation)", @@ -6151,14 +5896,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token6\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token6\"}[5m])) by (operation)", @@ -6175,14 +5912,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token6\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token6\"}[5m])) by (operation)", @@ -6264,14 +5993,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token7\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token7\"}[5m])) by (operation)", @@ -6288,14 +6009,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token7\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token7\"}[5m])) by (operation)", @@ -6377,14 +6090,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token8\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token8\"}[5m])) by (operation)", @@ -6401,14 +6106,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token8\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token8\"}[5m])) by (operation)", @@ -6490,14 +6187,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token9\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token9\"}[5m])) by (operation)", @@ -6514,14 +6203,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token9\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token9\"}[5m])) by (operation)", @@ -6603,14 +6284,6 @@ }, "pluginVersion": "7.5.17", "targets": [ - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GetCommitIDFromRepo\", tokenName=\"token10\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GetCommitIDFromRepo", - "refId": "A" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"GetCommitIDFromRepo\", tokenName=\"token10\"}[5m])) by (operation)", @@ -6627,14 +6300,6 @@ "legendFormat": "Comp_CloneGenerateAndPush", "refId": "C" }, - { - "exemplar": true, - "expr": "sum(increase(controller_git_request{controller=\"SnapshotEnvironmentBinding\", operation=\"GenerateOverlaysAndPush\", tokenName=\"token10\"}[5m])) by (operation)", - "hide": false, - "interval": "", - "legendFormat": "ASEB_GenerateOverlaysAndPush", - "refId": "D" - }, { "exemplar": true, "expr": "sum(increase(controller_git_request{controller=\"Component\", operation=\"CommitAndPush\", tokenName=\"token10\"}[5m])) by (oepration)", diff --git a/config/samples/binding/binding.yaml b/config/samples/binding/binding.yaml deleted file mode 100644 index a8d7fb207..000000000 --- a/config/samples/binding/binding.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# API type definition is in https://github.com/redhat-appstudio/application-api/tree/main/api/v1alpha1 -apiVersion: appstudio.redhat.com/v1alpha1 -kind: SnapshotEnvironmentBinding -metadata: - name: snapshotenvironmentbinding-sample - labels: - # These labels are recommended, so that we can use label selectors to easily find all apps/envs, without needing to do a full namespace list. - # Pls check v3 draft https://docs.google.com/document/d/1-_rWLgALd5pdSlqNNcQ5FSrD00fZb0l_exU-_FiL68o/edit?pli=1#heading=h.ljlaq1jezwn for more info. - appstudio.application: application-sample # Should always match application value below - appstudio.environment: staging # Should always match env value below -spec: - application: application-sample - environment: staging - snapshot: snapshot-sample - components: - - name: component-sample - configuration: - replicas: 3 - env: - - name: FOO - value: BAR - resources: - limits: - memory: "500Mi" - cpu: "2" - storage: "400Mi" - requests: - memory: "400Mi" - cpu: "700m" - storage: "200Mi" - - name: component-sample2 - configuration: - replicas: 2 - env: - - name: FOO2 - value: BAR2 - resources: - limits: - memory: "500Mi" - cpu: "2" - storage: "400Mi" - requests: - memory: "400Mi" - cpu: "700m" - storage: "200Mi" diff --git a/config/samples/environment/environment.yaml b/config/samples/environment/environment.yaml deleted file mode 100644 index 41d1cd182..000000000 --- a/config/samples/environment/environment.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# API type definition is in https://github.com/redhat-appstudio/application-api/tree/main/api/v1alpha1 -apiVersion: appstudio.redhat.com/v1alpha1 -kind: Environment -metadata: - name: staging -spec: - type: POC - displayName: "Staging Environment" - deploymentStrategy: "AppStudioAutomated" - configuration: - env: - - name: FOO - value: Env_BAR \ No newline at end of file diff --git a/go.mod b/go.mod index 97fbe191f..0c6672bea 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/openshift/api v0.0.0-20220912161038-458ad9ca9ca5 github.com/pact-foundation/pact-go/v2 v2.0.0-beta.23 github.com/prometheus/client_golang v1.17.0 - github.com/redhat-appstudio/application-api v0.0.0-20231016183051-2dde965fce17 + github.com/redhat-appstudio/application-api v0.0.0-20240326104708-c647c0bdcda5 github.com/redhat-appstudio/application-service/cdq-analysis v0.0.0 github.com/redhat-appstudio/service-provider-integration-operator v0.2023.22-0.20230713080056-eae17aa8c172 github.com/redhat-developer/gitops-generator v0.0.0-20231030195824-c48f5bf6bf21 diff --git a/go.sum b/go.sum index 91245814a..4d50035bc 100644 --- a/go.sum +++ b/go.sum @@ -668,8 +668,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/redhat-appstudio/application-api v0.0.0-20231016183051-2dde965fce17 h1:j/PSJj8lrHvW/V06wJzpr7XEa4UBr5QhBmFMm4H8bvY= -github.com/redhat-appstudio/application-api v0.0.0-20231016183051-2dde965fce17/go.mod h1:E277KEEjL6rEXUHIhc0FQd6jyf3CzCQ7MOkauqF3gt4= +github.com/redhat-appstudio/application-api v0.0.0-20240326104708-c647c0bdcda5 h1:jhrq0LbJYYwSx2bDQVD4fUq6fj0JJSnXFsX0x1+0lm0= +github.com/redhat-appstudio/application-api v0.0.0-20240326104708-c647c0bdcda5/go.mod h1:YvckuKHe82eWloGk0/BpSw4YYG2owrGZAanztbOj3pQ= github.com/redhat-appstudio/remote-secret v0.0.0-20230713072146-a6094c712436 h1:6XYknDslXDSVpNqEKnI+gKj3Uu4afK2S+IIH3KogX1E= github.com/redhat-appstudio/remote-secret v0.0.0-20230713072146-a6094c712436/go.mod h1:QlcxNg0q63QFGr9ceI3dH7a7vO6gGh+2TJrbTiMf9DE= github.com/redhat-appstudio/service-provider-integration-operator v0.2023.22-0.20230713080056-eae17aa8c172 h1:Zibq2RBTzcoDgZcTfM5k2o1qrKuix3YPtYQ/NuP039Y=