Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 0 additions & 17 deletions deploy/charts/emailsender/templates/emailsender-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,4 @@ spec:
remoteRef:
key: "cluster-{{ .Values.clusterName }}-emailsender-db"
property: "port"
---
apiVersion: external-secrets.io/v1beta1
kind: ExternalSecret
metadata:
name: emailsender-ext-parameters
namespace: {{ .Release.Namespace }}
spec:
secretStoreRef:
name: {{ .Values.secretStore.aws.parameterStoreSecretStoreName }}
kind: ClusterSecretStore
target:
name: emailsender-parameters
creationPolicy: Owner
data:
- secretKey: aws-role-arn # pragma: allowlist secret
remoteRef:
key: "/emailsender/aws_role_arn"
{{- end }}
5 changes: 1 addition & 4 deletions deploy/charts/emailsender/templates/emailsender.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,7 @@ spec:
- name: AWS_REGION
value: {{ .Values.aws.region }}
- name: AWS_ROLE_ARN
valueFrom:
secretKeyRef:
name: emailsender-parameters
key: "aws-role-arn"
value: {{ .Values.aws.roleArn }}
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: "/var/run/secrets/tokens/aws-token"
ports:
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/emailsender/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ authConfigFromKubernetes: true
# AWS configuration
aws:
region: "us-east-1"
roleArn: ""
# Resource limits and requests
resources:
requests:
Expand All @@ -36,4 +37,3 @@ createExternalSecrets: true
secretStore:
aws:
secretsManagerSecretStoreName: secrets-manager-secret-store # pragma: allowlist secret
parameterStoreSecretStoreName: parameter-store-secret-store # pragma: allowlist secret
7 changes: 0 additions & 7 deletions dev/env/manifests/emailsender-db/emailsender-db.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,3 @@ metadata:
name: emailsender-db
stringData:
db.host: "emailsender-db"
---
apiVersion: v1
kind: Secret
metadata:
name: emailsender-parameters
stringData:
aws-role-arn: "placeholder"
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,3 @@ spec:
name: aws-access-keys
key: secret-access-key
namespace: rhacs
---
apiVersion: external-secrets.io/v1beta1
kind: ClusterSecretStore
metadata:
name: parameter-store-secret-store
spec:
provider:
aws:
service: ParameterStore
region: us-east-1
auth:
secretRef:
accessKeyIDSecretRef:
name: aws-access-keys
key: access-key-id
namespace: rhacs
secretAccessKeySecretRef:
name: aws-access-keys
key: secret-access-key
namespace: rhacs
2 changes: 2 additions & 0 deletions dev/env/values/emailsender/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ db:
image:
repo: "quay.io/rhacs-eng/emailsender"
createExternalSecrets: false
aws:
roleArn: placeholder
95 changes: 0 additions & 95 deletions docs/development/setup-osd-cluster-idp.md

This file was deleted.

105 changes: 0 additions & 105 deletions dp-terraform/osd-cluster-idp-setup.sh

This file was deleted.

2 changes: 1 addition & 1 deletion fleetshard/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ make fleetshard-sync
```

## External configuration
To run Fleetshard-sync locally, you may need to download the development configuration from AWS Parameter Store:
To run Fleetshard-sync locally, you may need to download the development configuration from AWS Secrets Manager:
```shell
export AWS_AUTH_HELPER=aws-saml
source ./scripts/lib/external_config.sh
Expand Down
14 changes: 0 additions & 14 deletions scripts/lib/external_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,3 @@ auth_init_error() {
auth_helper_error() {
die "Error: $1. Please refer to the troubleshooting section in docs/development/secret-management.md for a possible cause."
}

# Loads config from the external storage to the environment and applying a prefix to a variable name (if exists).
load_external_config() {
local service="$1"
local prefix="${2:-}"
local parameter_store_output
local secrets_manager_output
parameter_store_output=$(chamber env "$service" --backend ssm)
# chamber fails for secretsmanager backend, but not for ssm (parameter store).
# We suppress pipefail error for secretsmanager backend to get similar behaviour.
secrets_manager_output=$(chamber env "$service" --backend secretsmanager) || true
[[ -z "$parameter_store_output" && -z "$secrets_manager_output" ]] && echo "WARNING: no parameters found under '/$service' of this environment"
eval "$(printf '%s\n%s' "$parameter_store_output" "$secrets_manager_output" | sed -E "s/(^export +)(.*)/readonly ${prefix}\2/")"
}
Loading