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.

Sign up for GitHub

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

Fix issue with external secret Vector logging #5152

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Fix issue with external secret Vector logging #5152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions components/pipeline-service/base/external-secrets/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ kind: Kustomization
resources:
- openshift-pipelines
- tekton-results
- tekton-logging
5 changes: 5 additions & 0 deletions components/pipeline-service/base/external-secrets/tekton-logging/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- tekton-results-s3.yaml
namespace: tekton-logging
27 changes: 27 additions & 0 deletions components/pipeline-service/base/external-secrets/tekton-logging/tekton-results-s3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: tekton-results-s3
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: "-1"
spec:
dataFrom:
- extract:
key: "" # will be added by the overlays
refreshInterval: 1h
secretStoreRef:
kind: ClusterSecretStore
name: appsre-vault
target:
creationPolicy: Owner
deletionPolicy: Delete
name: tekton-results-s3
template:
data:
aws_access_key_id: "{{ .aws_access_key_id }}"
aws_secret_access_key: "{{ .aws_secret_access_key }}"
aws_region: "{{ .aws_region }}"
bucket: "{{ .bucket }}"
endpoint: "https://{{ .endpoint }}"
s3_url: "s3://{{ .bucket }}"
30 changes: 2 additions & 28 deletions components/pipeline-service/production/base/main-pipeline-service-configuration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,8 @@ data:
runAt: 5 5 * * 0
kind: ConfigMap
metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
labels:
app.kubernetes.io/name: tekton-results-retention-policy
app.kubernetes.io/part-of: tekton-results
Expand Down Expand Up @@ -1692,34 +1694,6 @@ spec:
- name: AUTOINSTALL_COMPONENTS
value: "false"
---
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: "-1"
name: s3-conf
namespace: tekton-logging
spec:
dataFrom:
- extract:
key: integrations-output/terraform-resources/appsres07ue1/stonesoup-infra-stage/redhat-stg-plnsvc-s3
refreshInterval: 1h
secretStoreRef:
kind: ClusterSecretStore
name: appsre-vault
target:
creationPolicy: Owner
deletionPolicy: Delete
name: tekton-results-s3
template:
data:
aws_access_key_id: '{{ .aws_access_key_id }}'
aws_region: '{{ .aws_region }}'
aws_secret_access_key: '{{ .aws_secret_access_key }}'
bucket: '{{ .bucket }}'
endpoint: https://{{ .endpoint }}
---
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
Expand Down
5 changes: 3 additions & 2 deletions components/pipeline-service/production/stone-prod-p01/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1929,12 +1929,12 @@ metadata:
annotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
argocd.argoproj.io/sync-wave: "-1"
name: s3-conf
name: tekton-results-s3
namespace: tekton-logging
spec:
dataFrom:
- extract:
key: integrations-output/terraform-resources/appsres07ue1/stonesoup-infra-stage/redhat-stg-plnsvc-s3
key: integrations-output/terraform-resources/appsrep09ue1/stone-prod-p01/stone-prod-p01-plnsvc-s3
refreshInterval: 1h
secretStoreRef:
kind: ClusterSecretStore
Expand All @@ -1950,6 +1950,7 @@ spec:
aws_secret_access_key: '{{ .aws_secret_access_key }}'
bucket: '{{ .bucket }}'
endpoint: https://{{ .endpoint }}
s3_url: s3://{{ .bucket }}
---
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
Expand Down
Loading