-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #193 from appuio/release-4.14
Support for OCP 4.14
- Loading branch information
Showing
38 changed files
with
3,050 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
23 changes: 23 additions & 0 deletions
23
.../golden/release-4.14/openshift4-monitoring/openshift4-monitoring/00_namespace_labels.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| apiVersion: redhatcop.redhat.io/v1alpha1 | ||
| kind: Patch | ||
| metadata: | ||
| annotations: | ||
| argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true | ||
| labels: | ||
| name: namespace-openshift-monitoring-c4273dc15ddfdf7 | ||
| name: namespace-openshift-monitoring-c4273dc15ddfdf7 | ||
| namespace: syn-patch-operator | ||
| spec: | ||
| patches: | ||
| namespace-openshift-monitoring-c4273dc15ddfdf7-patch: | ||
| patchTemplate: |- | ||
| "metadata": | ||
| "labels": | ||
| "network.openshift.io/policy-group": "monitoring" | ||
| patchType: application/strategic-merge-patch+json | ||
| targetObjectRef: | ||
| apiVersion: v1 | ||
| kind: Namespace | ||
| name: openshift-monitoring | ||
| serviceAccountRef: | ||
| name: patch-sa |
Empty file.
17 changes: 17 additions & 0 deletions
17
.../release-4.14/openshift4-monitoring/openshift4-monitoring/02_aggregated_clusterroles.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| annotations: {} | ||
| labels: | ||
| name: syn-openshift4-monitoring-cluster-reader | ||
| rbac.authorization.k8s.io/aggregate-to-cluster-reader: 'true' | ||
| name: syn-openshift4-monitoring-cluster-reader | ||
| rules: | ||
| - apiGroups: | ||
| - monitoring.coreos.com | ||
| resources: | ||
| - '*' | ||
| verbs: | ||
| - get | ||
| - list | ||
| - watch |
39 changes: 39 additions & 0 deletions
39
...lden/release-4.14/openshift4-monitoring/openshift4-monitoring/10_alertmanager_config.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| apiVersion: v1 | ||
| data: {} | ||
| kind: Secret | ||
| metadata: | ||
| annotations: {} | ||
| labels: | ||
| name: alertmanager-main | ||
| name: alertmanager-main | ||
| namespace: openshift-monitoring | ||
| stringData: | ||
| alertmanager.yaml: |- | ||
| "inhibit_rules": | ||
| - "equal": | ||
| - "namespace" | ||
| - "alertname" | ||
| "source_match": | ||
| "severity": "critical" | ||
| "target_match_re": | ||
| "severity": "warning|info" | ||
| - "equal": | ||
| - "namespace" | ||
| - "alertname" | ||
| "source_match": | ||
| "severity": "warning" | ||
| "target_match_re": | ||
| "severity": "info" | ||
| "receivers": | ||
| - "name": "__component_openshift4_monitoring_null" | ||
| "route": | ||
| "group_interval": "5s" | ||
| "group_wait": "0s" | ||
| "repeat_interval": "10m" | ||
| "routes": | ||
| - "continue": false | ||
| "matchers": | ||
| - "namespace =~ \"\"" | ||
| "receiver": "__component_openshift4_monitoring_null" | ||
| - "receiver": "__component_openshift4_monitoring_null" | ||
| type: Opaque |
55 changes: 55 additions & 0 deletions
55
tests/golden/release-4.14/openshift4-monitoring/openshift4-monitoring/10_configmap.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| apiVersion: v1 | ||
| data: | ||
| config.yaml: |- | ||
| "alertmanagerMain": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "volumeClaimTemplate": | ||
| "spec": | ||
| "resources": | ||
| "requests": | ||
| "storage": "2Gi" | ||
| "enableUserWorkload": true | ||
| "grafana": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "k8sPrometheusAdapter": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "kubeStateMetrics": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "openshiftStateMetrics": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "prometheusK8s": | ||
| "externalLabels": | ||
| "cluster_id": "c-green-test-1234" | ||
| "cluster_name": "Test Cluster 1234" | ||
| "tenant_id": "t-silent-test-1234" | ||
| "tenant_name": "Test Tenant 1234" | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "remoteWrite": [] | ||
| "retention": "8d" | ||
| "volumeClaimTemplate": | ||
| "spec": | ||
| "resources": | ||
| "requests": | ||
| "storage": "50Gi" | ||
| "prometheusOperator": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "telemeterClient": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "thanosQuerier": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| kind: ConfigMap | ||
| metadata: | ||
| annotations: {} | ||
| labels: | ||
| name: cluster-monitoring-config | ||
| name: cluster-monitoring-config | ||
| namespace: openshift-monitoring |
41 changes: 41 additions & 0 deletions
41
.../release-4.14/openshift4-monitoring/openshift4-monitoring/10_configmap_user_workload.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| apiVersion: v1 | ||
| data: | ||
| config.yaml: |- | ||
| "alertmanager": | ||
| "enableAlertmanagerConfig": true | ||
| "enabled": true | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "volumeClaimTemplate": | ||
| "spec": | ||
| "resources": | ||
| "requests": | ||
| "storage": "2Gi" | ||
| "prometheus": | ||
| "externalLabels": | ||
| "cluster_id": "c-green-test-1234-user-workload" | ||
| "cluster_name": "Test Cluster 1234 User Workload" | ||
| "tenant_id": "t-silent-test-1234" | ||
| "tenant_name": "Test Tenant 1234" | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "remoteWrite": [] | ||
| "retention": "8d" | ||
| "volumeClaimTemplate": | ||
| "spec": | ||
| "resources": | ||
| "requests": | ||
| "storage": "50Gi" | ||
| "prometheusOperator": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| "thanosRuler": | ||
| "nodeSelector": | ||
| "node-role.kubernetes.io/infra": "" | ||
| kind: ConfigMap | ||
| metadata: | ||
| annotations: {} | ||
| labels: | ||
| name: user-workload-monitoring-config | ||
| name: user-workload-monitoring-config | ||
| namespace: openshift-user-workload-monitoring |
Oops, something went wrong.