Skip to content

Commit f8c60d5

Browse files
TheBigLeeTheBigLee
authored
Merge pull request #1041 from vshn/fix/prom_rule_annotation
Remove empty annotation from prometheusRule
2 parents c6bb0fe + f832019 commit f8c60d5

File tree

13 files changed

+62
-68
lines changed

13 files changed

+62
-68
lines changed

‎component/appcat_controller.jsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ local servicemonitor = loadManifest('servicemonitor.yaml') {
175175
},
176176
};
177177

178-
local prometheusrule = kube._Object('monitoring.coreos.com/v1', 'PrometheusRule', 'appcat-crossplane-resources') {
178+
local prometheusrule = std.prune(kube._Object('monitoring.coreos.com/v1', 'PrometheusRule', 'appcat-crossplane-resources') {
179179
metadata+: {
180180
namespace: controllersParams.namespace,
181181
labels: {
@@ -222,7 +222,7 @@ local prometheusrule = kube._Object('monitoring.coreos.com/v1', 'PrometheusRule'
222222
},
223223
],
224224
},
225-
};
225+
});
226226

227227
local webhookService = loadManifest('webhook-service.yaml') {
228228
metadata+: {

‎tests/golden/control-plane/appcat/appcat/10_function_appcat.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ metadata:
1818
annotations:
1919
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
2020
argocd.argoproj.io/sync-wave: '-40'
21-
name: function-appcat-v3-61-0-v4-174-0
21+
name: function-appcat-v3-61-1-v4-174-1
2222
spec:
23-
package: ghcr.io/vshn/appcat:v4.174.0-func
23+
package: ghcr.io/vshn/appcat:v4.174.1-func
2424
packagePullPolicy: IfNotPresent
2525
runtimeConfigRef:
2626
name: function-appcat
@@ -32,9 +32,9 @@ metadata:
3232
annotations:
3333
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
3434
argocd.argoproj.io/sync-wave: '-40'
35-
name: function-appcat-v3-61-1-v4-174-1
35+
name: function-appcat-v3-62-0-v4-175-0
3636
spec:
37-
package: ghcr.io/vshn/appcat:v4.174.1-func
37+
package: ghcr.io/vshn/appcat:v4.175.0-func
3838
packagePullPolicy: IfNotPresent
3939
runtimeConfigRef:
4040
name: function-appcat
@@ -46,9 +46,9 @@ metadata:
4646
annotations:
4747
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
4848
argocd.argoproj.io/sync-wave: '-40'
49-
name: function-appcat-v3-62-0-v4-175-0
49+
name: function-appcat-v3-62-1-v4-176-0
5050
spec:
51-
package: ghcr.io/vshn/appcat:v4.175.0-func
51+
package: ghcr.io/vshn/appcat:v4.176.0-func
5252
packagePullPolicy: IfNotPresent
5353
runtimeConfigRef:
5454
name: function-appcat
@@ -60,9 +60,9 @@ metadata:
6060
annotations:
6161
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
6262
argocd.argoproj.io/sync-wave: '-40'
63-
name: function-appcat-v3-62-1-v4-176-0
63+
name: function-appcat-v3-63-0-v4-177-0
6464
spec:
65-
package: ghcr.io/vshn/appcat:v4.176.0-func
65+
package: ghcr.io/vshn/appcat:v4.177.0-func
6666
packagePullPolicy: IfNotPresent
6767
runtimeConfigRef:
6868
name: function-appcat
@@ -74,9 +74,9 @@ metadata:
7474
annotations:
7575
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
7676
argocd.argoproj.io/sync-wave: '-40'
77-
name: function-appcat-v3-63-0-v4-177-0
77+
name: function-appcat-v3-64-0-v4-178-0
7878
spec:
79-
package: ghcr.io/vshn/appcat:v4.177.0-func
79+
package: ghcr.io/vshn/appcat:v4.178.0-func
8080
packagePullPolicy: IfNotPresent
8181
runtimeConfigRef:
8282
name: function-appcat

‎tests/golden/control-plane/appcat/appcat/controllers/appcat/40_prometheusrule.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: monitoring.coreos.com/v1
22
kind: PrometheusRule
33
metadata:
4-
annotations: {}
54
labels:
65
app.kubernetes.io/managed-by: commodore
76
app.kubernetes.io/name: appcat

‎tests/golden/defaults/appcat/appcat/10_function_appcat.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ metadata:
1818
annotations:
1919
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
2020
argocd.argoproj.io/sync-wave: '-40'
21-
name: function-appcat-v3-61-0-v4-174-0
21+
name: function-appcat-v3-61-1-v4-174-1
2222
spec:
23-
package: ghcr.io/vshn/appcat:v4.174.0-func
23+
package: ghcr.io/vshn/appcat:v4.174.1-func
2424
packagePullPolicy: IfNotPresent
2525
runtimeConfigRef:
2626
name: function-appcat
@@ -32,9 +32,9 @@ metadata:
3232
annotations:
3333
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
3434
argocd.argoproj.io/sync-wave: '-40'
35-
name: function-appcat-v3-61-1-v4-174-1
35+
name: function-appcat-v3-62-0-v4-175-0
3636
spec:
37-
package: ghcr.io/vshn/appcat:v4.174.1-func
37+
package: ghcr.io/vshn/appcat:v4.175.0-func
3838
packagePullPolicy: IfNotPresent
3939
runtimeConfigRef:
4040
name: function-appcat
@@ -46,9 +46,9 @@ metadata:
4646
annotations:
4747
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
4848
argocd.argoproj.io/sync-wave: '-40'
49-
name: function-appcat-v3-62-0-v4-175-0
49+
name: function-appcat-v3-62-1-v4-176-0
5050
spec:
51-
package: ghcr.io/vshn/appcat:v4.175.0-func
51+
package: ghcr.io/vshn/appcat:v4.176.0-func
5252
packagePullPolicy: IfNotPresent
5353
runtimeConfigRef:
5454
name: function-appcat
@@ -60,9 +60,9 @@ metadata:
6060
annotations:
6161
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
6262
argocd.argoproj.io/sync-wave: '-40'
63-
name: function-appcat-v3-62-1-v4-176-0
63+
name: function-appcat-v3-63-0-v4-177-0
6464
spec:
65-
package: ghcr.io/vshn/appcat:v4.176.0-func
65+
package: ghcr.io/vshn/appcat:v4.177.0-func
6666
packagePullPolicy: IfNotPresent
6767
runtimeConfigRef:
6868
name: function-appcat
@@ -74,9 +74,9 @@ metadata:
7474
annotations:
7575
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
7676
argocd.argoproj.io/sync-wave: '-40'
77-
name: function-appcat-v3-63-0-v4-177-0
77+
name: function-appcat-v3-64-0-v4-178-0
7878
spec:
79-
package: ghcr.io/vshn/appcat:v4.177.0-func
79+
package: ghcr.io/vshn/appcat:v4.178.0-func
8080
packagePullPolicy: IfNotPresent
8181
runtimeConfigRef:
8282
name: function-appcat

‎tests/golden/dev/appcat/appcat/10_function_appcat.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ metadata:
1818
annotations:
1919
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
2020
argocd.argoproj.io/sync-wave: '-40'
21-
name: function-appcat-v3-61-0-v4-174-0
21+
name: function-appcat-v3-61-1-v4-174-1
2222
spec:
23-
package: ghcr.io/vshn/appcat:v4.174.0-func
23+
package: ghcr.io/vshn/appcat:v4.174.1-func
2424
packagePullPolicy: Always
2525
runtimeConfigRef:
2626
name: enable-proxy
@@ -32,9 +32,9 @@ metadata:
3232
annotations:
3333
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
3434
argocd.argoproj.io/sync-wave: '-40'
35-
name: function-appcat-v3-61-1-v4-174-1
35+
name: function-appcat-v3-62-0-v4-175-0
3636
spec:
37-
package: ghcr.io/vshn/appcat:v4.174.1-func
37+
package: ghcr.io/vshn/appcat:v4.175.0-func
3838
packagePullPolicy: Always
3939
runtimeConfigRef:
4040
name: enable-proxy
@@ -46,9 +46,9 @@ metadata:
4646
annotations:
4747
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
4848
argocd.argoproj.io/sync-wave: '-40'
49-
name: function-appcat-v3-62-0-v4-175-0
49+
name: function-appcat-v3-62-1-v4-176-0
5050
spec:
51-
package: ghcr.io/vshn/appcat:v4.175.0-func
51+
package: ghcr.io/vshn/appcat:v4.176.0-func
5252
packagePullPolicy: Always
5353
runtimeConfigRef:
5454
name: enable-proxy
@@ -60,9 +60,9 @@ metadata:
6060
annotations:
6161
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
6262
argocd.argoproj.io/sync-wave: '-40'
63-
name: function-appcat-v3-62-1-v4-176-0
63+
name: function-appcat-v3-63-0-v4-177-0
6464
spec:
65-
package: ghcr.io/vshn/appcat:v4.176.0-func
65+
package: ghcr.io/vshn/appcat:v4.177.0-func
6666
packagePullPolicy: Always
6767
runtimeConfigRef:
6868
name: enable-proxy
@@ -74,9 +74,9 @@ metadata:
7474
annotations:
7575
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
7676
argocd.argoproj.io/sync-wave: '-40'
77-
name: function-appcat-v3-63-0-v4-177-0
77+
name: function-appcat-v3-64-0-v4-178-0
7878
spec:
79-
package: ghcr.io/vshn/appcat:v4.177.0-func
79+
package: ghcr.io/vshn/appcat:v4.178.0-func
8080
packagePullPolicy: Always
8181
runtimeConfigRef:
8282
name: enable-proxy

‎tests/golden/dev/appcat/appcat/controllers/appcat/40_prometheusrule.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: monitoring.coreos.com/v1
22
kind: PrometheusRule
33
metadata:
4-
annotations: {}
54
labels:
65
app.kubernetes.io/managed-by: commodore
76
app.kubernetes.io/name: appcat

‎tests/golden/exodev/appcat/appcat/10_function_appcat.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ metadata:
1818
annotations:
1919
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
2020
argocd.argoproj.io/sync-wave: '-40'
21-
name: function-appcat-v3-61-0-v4-174-0
21+
name: function-appcat-v3-61-1-v4-174-1
2222
spec:
23-
package: ghcr.io/vshn/appcat:v4.174.0-func
23+
package: ghcr.io/vshn/appcat:v4.174.1-func
2424
packagePullPolicy: IfNotPresent
2525
runtimeConfigRef:
2626
name: function-appcat
@@ -32,9 +32,9 @@ metadata:
3232
annotations:
3333
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
3434
argocd.argoproj.io/sync-wave: '-40'
35-
name: function-appcat-v3-61-1-v4-174-1
35+
name: function-appcat-v3-62-0-v4-175-0
3636
spec:
37-
package: ghcr.io/vshn/appcat:v4.174.1-func
37+
package: ghcr.io/vshn/appcat:v4.175.0-func
3838
packagePullPolicy: IfNotPresent
3939
runtimeConfigRef:
4040
name: function-appcat
@@ -46,9 +46,9 @@ metadata:
4646
annotations:
4747
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
4848
argocd.argoproj.io/sync-wave: '-40'
49-
name: function-appcat-v3-62-0-v4-175-0
49+
name: function-appcat-v3-62-1-v4-176-0
5050
spec:
51-
package: ghcr.io/vshn/appcat:v4.175.0-func
51+
package: ghcr.io/vshn/appcat:v4.176.0-func
5252
packagePullPolicy: IfNotPresent
5353
runtimeConfigRef:
5454
name: function-appcat
@@ -60,9 +60,9 @@ metadata:
6060
annotations:
6161
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
6262
argocd.argoproj.io/sync-wave: '-40'
63-
name: function-appcat-v3-62-1-v4-176-0
63+
name: function-appcat-v3-63-0-v4-177-0
6464
spec:
65-
package: ghcr.io/vshn/appcat:v4.176.0-func
65+
package: ghcr.io/vshn/appcat:v4.177.0-func
6666
packagePullPolicy: IfNotPresent
6767
runtimeConfigRef:
6868
name: function-appcat
@@ -74,9 +74,9 @@ metadata:
7474
annotations:
7575
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
7676
argocd.argoproj.io/sync-wave: '-40'
77-
name: function-appcat-v3-63-0-v4-177-0
77+
name: function-appcat-v3-64-0-v4-178-0
7878
spec:
79-
package: ghcr.io/vshn/appcat:v4.177.0-func
79+
package: ghcr.io/vshn/appcat:v4.178.0-func
8080
packagePullPolicy: IfNotPresent
8181
runtimeConfigRef:
8282
name: function-appcat

‎tests/golden/exodev/appcat/appcat/controllers/appcat/40_prometheusrule.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: monitoring.coreos.com/v1
22
kind: PrometheusRule
33
metadata:
4-
annotations: {}
54
labels:
65
app.kubernetes.io/managed-by: commodore
76
app.kubernetes.io/name: appcat

‎tests/golden/service-cluster/appcat/appcat/controllers/appcat/40_prometheusrule.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: monitoring.coreos.com/v1
22
kind: PrometheusRule
33
metadata:
4-
annotations: {}
54
labels:
65
app.kubernetes.io/managed-by: commodore
76
app.kubernetes.io/name: appcat

‎tests/golden/vshn-cloud/appcat/appcat/10_function_appcat.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ metadata:
1818
annotations:
1919
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
2020
argocd.argoproj.io/sync-wave: '-40'
21-
name: function-appcat-v3-61-0-v4-174-0
21+
name: function-appcat-v3-61-1-v4-174-1
2222
spec:
23-
package: ghcr.io/vshn/appcat:v4.174.0-func
23+
package: ghcr.io/vshn/appcat:v4.174.1-func
2424
packagePullPolicy: IfNotPresent
2525
runtimeConfigRef:
2626
name: function-appcat
@@ -32,9 +32,9 @@ metadata:
3232
annotations:
3333
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
3434
argocd.argoproj.io/sync-wave: '-40'
35-
name: function-appcat-v3-61-1-v4-174-1
35+
name: function-appcat-v3-62-0-v4-175-0
3636
spec:
37-
package: ghcr.io/vshn/appcat:v4.174.1-func
37+
package: ghcr.io/vshn/appcat:v4.175.0-func
3838
packagePullPolicy: IfNotPresent
3939
runtimeConfigRef:
4040
name: function-appcat
@@ -46,9 +46,9 @@ metadata:
4646
annotations:
4747
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
4848
argocd.argoproj.io/sync-wave: '-40'
49-
name: function-appcat-v3-62-0-v4-175-0
49+
name: function-appcat-v3-62-1-v4-176-0
5050
spec:
51-
package: ghcr.io/vshn/appcat:v4.175.0-func
51+
package: ghcr.io/vshn/appcat:v4.176.0-func
5252
packagePullPolicy: IfNotPresent
5353
runtimeConfigRef:
5454
name: function-appcat
@@ -60,9 +60,9 @@ metadata:
6060
annotations:
6161
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
6262
argocd.argoproj.io/sync-wave: '-40'
63-
name: function-appcat-v3-62-1-v4-176-0
63+
name: function-appcat-v3-63-0-v4-177-0
6464
spec:
65-
package: ghcr.io/vshn/appcat:v4.176.0-func
65+
package: ghcr.io/vshn/appcat:v4.177.0-func
6666
packagePullPolicy: IfNotPresent
6767
runtimeConfigRef:
6868
name: function-appcat
@@ -74,9 +74,9 @@ metadata:
7474
annotations:
7575
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
7676
argocd.argoproj.io/sync-wave: '-40'
77-
name: function-appcat-v3-63-0-v4-177-0
77+
name: function-appcat-v3-64-0-v4-178-0
7878
spec:
79-
package: ghcr.io/vshn/appcat:v4.177.0-func
79+
package: ghcr.io/vshn/appcat:v4.178.0-func
8080
packagePullPolicy: IfNotPresent
8181
runtimeConfigRef:
8282
name: function-appcat

0 commit comments

Comments
 (0)