diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/api-db-config.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/api-db-config.yaml index 9c80d1108..3c22ffbba 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/api-db-config.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/api-db-config.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: tekton-results-api - namespace: tekton-pipelines annotations: argocd.argoproj.io/sync-wave: "0" spec: diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/api-kube-rbac-proxy.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/api-kube-rbac-proxy.yaml index bf5205aca..03de51ea4 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/api-kube-rbac-proxy.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/api-kube-rbac-proxy.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: tekton-results-api - namespace: tekton-pipelines spec: template: spec: diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/api-migrator-config.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/api-migrator-config.yaml index 7aff0053f..557632710 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/api-migrator-config.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/api-migrator-config.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: tekton-results-api - namespace: tekton-pipelines annotations: argocd.argoproj.io/sync-wave: "0" spec: diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/api-route.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/api-route.yaml index 458c5e2e6..aab5384c8 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/api-route.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/api-route.yaml @@ -3,7 +3,6 @@ kind: Route apiVersion: route.openshift.io/v1 metadata: name: tekton-results - namespace: tekton-results labels: app.kubernetes.io/part-of: tekton-results annotations: diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/api-s3-config.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/api-s3-config.yaml index 91dfe14b8..539bd9f9f 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/api-s3-config.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/api-s3-config.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: tekton-results-api - namespace: tekton-pipelines annotations: argocd.argoproj.io/sync-wave: "0" spec: diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/api-service-sync.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/api-service-sync.yaml index f31309226..e7b15044f 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/api-service-sync.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/api-service-sync.yaml @@ -3,6 +3,5 @@ apiVersion: v1 kind: Service metadata: name: api-service - namespace: tekton-pipelines annotations: argocd.argoproj.io/sync-wave: "1" diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/api-service-tls.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/api-service-tls.yaml index 1a8c9b179..ed7f5b5f7 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/api-service-tls.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/api-service-tls.yaml @@ -3,7 +3,6 @@ apiVersion: v1 kind: Service metadata: name: api-service - namespace: tekton-pipelines annotations: service.beta.openshift.io/serving-cert-secret-name: tekton-results-tls argocd.argoproj.io/sync-wave: "0" diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/api-sync.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/api-sync.yaml index 2c34cba89..63cdda05d 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/api-sync.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/api-sync.yaml @@ -3,6 +3,5 @@ apiVersion: apps/v1 kind: Deployment metadata: name: tekton-results-api - namespace: tekton-pipelines annotations: argocd.argoproj.io/sync-wave: "1" diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml index efad8d2f8..f56651285 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/kustomization.yaml @@ -27,7 +27,6 @@ configMapGenerator: files: - config.env name: api-config - namespace: tekton-pipelines options: disableNameSuffixHash: true diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/service-monitor.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/service-monitor.yaml index c776a9cfb..ce8c6076b 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/service-monitor.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/service-monitor.yaml @@ -3,7 +3,6 @@ apiVersion: v1 kind: ServiceAccount metadata: name: metrics-reader - namespace: tekton-results annotations: argocd.argoproj.io/sync-wave: "0" --- @@ -11,7 +10,6 @@ apiVersion: v1 kind: Secret metadata: name: metrics-reader - namespace: tekton-results annotations: kubernetes.io/service-account.name: metrics-reader argocd.argoproj.io/sync-wave: "0" @@ -42,13 +40,11 @@ roleRef: subjects: - kind: ServiceAccount name: metrics-reader - namespace: tekton-results --- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: tekton-results-api - namespace: tekton-results annotations: argocd.argoproj.io/sync-wave: "0" spec: @@ -70,7 +66,6 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: tekton-results-watcher - namespace: tekton-results annotations: argocd.argoproj.io/sync-wave: "0" spec: diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-config.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-config.yaml index e2e60e3b4..862fd9519 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-config.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-config.yaml @@ -4,7 +4,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: tekton-results-watcher - namespace: tekton-pipelines annotations: argocd.argoproj.io/sync-wave: "0" spec: diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-kube-rbac-proxy.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-kube-rbac-proxy.yaml index 4f7760c61..8ddf7abc9 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-kube-rbac-proxy.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-kube-rbac-proxy.yaml @@ -3,7 +3,6 @@ apiVersion: apps/v1 kind: Deployment metadata: name: tekton-results-watcher - namespace: tekton-pipelines spec: template: spec: diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-logging-rbac.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-logging-rbac.yaml index b08879ae5..d2fe465e9 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-logging-rbac.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-logging-rbac.yaml @@ -8,7 +8,6 @@ metadata: subjects: - kind: ServiceAccount name: tekton-results-watcher - namespace: tekton-results roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-logging.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-logging.yaml index 61740da12..d1f4aebdf 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-logging.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-logging.yaml @@ -3,7 +3,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: tekton-results-config-logging - namespace: tekton-pipelines annotations: argocd.argoproj.io/sync-wave: "0" data: diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-rbac.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-rbac.yaml index 294f43c2c..0ecfa402e 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-rbac.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-rbac.yaml @@ -25,7 +25,6 @@ metadata: subjects: - kind: ServiceAccount name: watcher - namespace: tekton-pipelines roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-service-sync.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-service-sync.yaml index 0168aa176..b710fb892 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-service-sync.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-service-sync.yaml @@ -3,6 +3,5 @@ apiVersion: v1 kind: Service metadata: name: tekton-results-watcher - namespace: tekton-pipelines annotations: argocd.argoproj.io/sync-wave: "2" diff --git a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-sync.yaml b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-sync.yaml index 7078d6644..630573f4e 100644 --- a/operator/gitops/argocd/pipeline-service/tekton-results/watcher-sync.yaml +++ b/operator/gitops/argocd/pipeline-service/tekton-results/watcher-sync.yaml @@ -3,6 +3,5 @@ apiVersion: apps/v1 kind: Deployment metadata: name: tekton-results-watcher - namespace: tekton-pipelines annotations: argocd.argoproj.io/sync-wave: "2"