bump version, add cf app manifest

awslabs · May 31, 2019 · c23edac · c23edac
1 parent b416683
commit c23edac
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 8 deletions.
diff --git a/docs/getting-started-k8s.md b/docs/getting-started-k8s.md
@@ -28,9 +28,9 @@ helm inspect aws-sb/aws-servicebroker --version 1.0.0-beta.4
 ### Note: If setting aws.targetaccountid on the helm cli, do not use --set, use --set-string, see https://github.com/helm/helm/issues/1707 for more info
 
 # Minimal broker install, assuming defaults above. Sets up a ClusterServiceBroker. Add flags to set credentials, region, etc
-helm install aws-sb/aws-servicebroker --name aws-servicebroker --namespace aws-sb --version 1.0.0-beta.4
+helm install aws-sb/aws-servicebroker --name aws-servicebroker --namespace aws-sb
 
 # Install broker for the specified namespace only
-helm install aws-sb/aws-servicebroker --name aws-servicebroker --namespace aws-sb --version 1.0.0-beta.4 \
+helm install aws-sb/aws-servicebroker --name aws-servicebroker --namespace aws-sb \
   --set deployNamespacedServiceBroker=true
 ```
diff --git a/docs/getting-started-openshift.md b/docs/getting-started-openshift.md
@@ -11,9 +11,9 @@ mkdir awssb
 cd awssb
 
 ### Fetch installation artifacts
-wget https://raw.githubusercontent.com/awslabs/aws-servicebroker/release-v1.0.0-beta.2/packaging/openshift/deploy.sh
-wget https://raw.githubusercontent.com/awslabs/aws-servicebroker/release-v1.0.0-beta.2/packaging/openshift/aws-servicebroker.yaml
-wget https://raw.githubusercontent.com/awslabs/aws-servicebroker/release-v1.0.0-beta.2/packaging/openshift/parameters.env
+wget https://raw.githubusercontent.com/awslabs/aws-servicebroker/release-v1.0.1/packaging/openshift/deploy.sh
+wget https://raw.githubusercontent.com/awslabs/aws-servicebroker/release-v1.0.1/packaging/openshift/aws-servicebroker.yaml
+wget https://raw.githubusercontent.com/awslabs/aws-servicebroker/release-v1.0.1/packaging/openshift/parameters.env
 chmod +x deploy.sh
 
 ### Edit parameters.env and update parameters as needed

diff --git a/packaging/cloudfoundry/manifest.yml b/packaging/cloudfoundry/manifest.yml
@@ -0,0 +1,30 @@
+applications:
+- name: aws-service-broker
+  buildpacks:
+  - binary_buildpack
+  command: |
+    export PARAM_OVERRIDE_${BROKER_ID}_all_all_all_region=${AWS_DEFAULT_REGION} ; ./cfnsb --logtostderr --prescribeOverrides=${PRESCRIBE} --v=${VERBOSITY} --brokerId=${BROKER_ID} --enableBasicAuth=true --insecure=${INSECURE} --port=${PORT} --region=${AWS_DEFAULT_REGION} --s3Bucket=${S3_BUCKET} --s3Key=${S3_KEY} --s3Region=${S3_REGION} --tableName=${TABLE_NAME} --templateFilter=${TEMPLATE_FILTER} --tlsCert=${TLS_CERT} --tlsKey=${TLS_KEY}
+  disk_quota: 1G
+  env:
+    # Required
+    AWS_ACCESS_KEY_ID:
+    AWS_SECRET_ACCESS_KEY:
+    SECURITY_USER_NAME: awssb
+    SECURITY_USER_PASSWORD:
+    AWS_DEFAULT_REGION: us-east-1
+    # Optional
+    BROKER_ID: awsservicebroker
+    INSECURE: "true"
+    PRESCRIBE: "true"
+    S3_BUCKET: awsservicebroker
+    S3_KEY: templates/latest
+    S3_REGION: us-east-1
+    TABLE_NAME: awssb
+    TEMPLATE_FILTER: -main.yaml
+    TLS_CERT: ""
+    TLS_KEY: ""
+    VERBOSITY: "5"
+    ROOT: $HOME
+    SCHEME: https
+  instances: 1
+  memory: 1G
diff --git a/packaging/cloudfoundry/tile-history.yml b/packaging/cloudfoundry/tile-history.yml
@@ -30,4 +30,7 @@ history:
 - 1.0.0-beta
 - 1.0.0-beta.2
 - 1.0.0-beta.3
-version: 1.0.0-beta.4
+- 1.0.0-beta.4
+- 1.0.0
+- 1.0.1
+version: 1.0.1
diff --git a/packaging/helm/aws-servicebroker/Chart.yaml b/packaging/helm/aws-servicebroker/Chart.yaml
@@ -1,3 +1,3 @@
 name: aws-servicebroker
 description: Deploys the AWS Service Broker
-version: 1.0.0-beta.4
+version: 1.0.1
diff --git a/version b/version
@@ -1 +1 @@
-1.0.0
+1.0.1