Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Katka92 committed Dec 16, 2024
2 parents 7f3668d + 87a1f7a commit 788dac4
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 30 deletions.
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
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
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 }}"
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
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

0 comments on commit 788dac4

Please sign in to comment.