Skip to content

Commit

Permalink
Merge pull request crossplane#980 from soorena776/issue_905_testing_f…
Browse files Browse the repository at this point in the history
…ixes

Fixes to the stacks guides and resources, as a result of testing
  • Loading branch information
negz authored Oct 26, 2019
2 parents 7cc8205 + e296edf commit a79aef2
Show file tree
Hide file tree
Showing 20 changed files with 14 additions and 439 deletions.
6 changes: 3 additions & 3 deletions cluster/examples/aws-setup-provider/provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ data:
credentials: ((AWS_CREDS_BASE64))
kind: Secret
metadata:
name: aws-account-creds
namespace: crossplane-system
name: example-creds
type: Opaque
---
apiVersion: aws.crossplane.io/v1alpha2
kind: Provider
metadata:
name: example
name: aws-provider
spec:
credentialsSecretRef:
namespace: crossplane-system
name: example-creds
name: aws-account-creds
key: credentials
region: ((AWS_REGION))
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,5 @@ metadata:
labels:
app: wordpress-demo
spec:
classSelector:
matchLabels:
example: "true"
writeConnectionSecretToRef:
name: wordpress-demo-cluster
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ metadata:
name: sql
spec:
engineVersion: "5.7"
classSelector:
matchLabels:
example: "true"
# A secret is exported by providing the secret name
# to export it under. This is the name of the secret
# in the crossplane cluster, and it's scoped to this claim's namespace.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: DBSubnetGroup
metadata:
name: sample-dbsubnetgroup
spec:
groupName: sample_dbsubnetgroup
groupName: my-cool-dbsubnetgroup
description: EKS vpc to rds
subnetIdRefs:
- name: sample-subnet1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: IAMRole
metadata:
name: sample-eks-cluster-role
spec:
roleName: sample-eks-cluster-role
roleName: my-cool-eks-cluster-role
description: a role that gives a cool power
assumeRolePolicyDocument: |
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ resources:
- eks-securitygroup.yaml
- dbsubnetgroup.yaml
- rds-securitygroup.yaml
- rds-class.yaml
- eks-class.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ metadata:
annotations:
resourceclass.crossplane.io/is-default-class: "true"
specTemplate:
writeConnectionSecretsToNamespace: crossplane-system
region: us-west-2
roleARNRef:
name: sample-eks-cluster-role
Expand All @@ -23,7 +24,7 @@ specTemplate:
nodeAutoScalingGroupMaxSize: 1
nodeGroupName: demo-nodes
clusterControlPlaneSecurityGroupRef:
- name: sample-cluster-sg
name: sample-cluster-sg
providerRef:
name: aws-provider
reclaimPolicy: Delete
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ metadata:
annotations:
resourceclass.crossplane.io/is-default-class: "true"
specTemplate:
writeConnectionSecretsToNamespace: crossplane-system
class: db.t2.small
masterUsername: a-cool-masteruser
masterUsername: cool_user
securityGroupIdRefs:
- name: sample-rds-sg
subnetGroupNameRef:
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit a79aef2

Please sign in to comment.