Skip to content
This repository has been archived by the owner on Nov 2, 2023. It is now read-only.

fix k8s templates that are out of date #48

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion charts/oci-service-broker/samples/adw/adw-demo-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ metadata:
name: adw-user-cred
data:
# "s123456789S@"
password: czEyMzQ1Njc4OVNACg==
password: czEyMzQ1Njc4OVNA
# "Welcome_123"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the password secret has extra newline character causing the login to fail.
it should be encoded with `echo -n 's123456789S@' | base64 -w0

walletPassword: V2VsY29tZV8xMjMK
5 changes: 4 additions & 1 deletion charts/oci-service-broker/samples/adw/adw-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: adw-demo
spec:
replicas: 1
selector:
matchLabels:
app: adw-demo
template:
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion charts/oci-service-broker/samples/atp/atp-demo-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ metadata:
name: atp-user-cred
data:
# "s123456789S@"
password: czEyMzQ1Njc4OVNACg==
password: czEyMzQ1Njc4OVNA
# "Welcome_123"
walletPassword: V2VsY29tZV8xMjMK
7 changes: 5 additions & 2 deletions charts/oci-service-broker/samples/atp/atp-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: atp-demo
spec:
replicas: 1
selector:
matchLabels:
app: atp-demo
template:
metadata:
labels:
Expand All @@ -32,7 +35,7 @@ spec:
containers:
# User application that uses credential files to connect to ATP.
- name: db-app
image: <USER_APPLICATION_IMAGE>
image: USER_APPLICATION_IMAGE
env:
# Pass DB ADMIN user name that is part of the secret created by the binding request.
- name: DB_ADMIN_USER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ spec:
clusterServicePlanExternalName: standard
parameters:
name: osb-atp-existing-instance
ocid: "CHANGE_EXISTING_SERVICEINSTANCE_OCID_HERE"
compartmentId: "CHANGE_COMPARTMENT_OCID_HERE"
ocid: CHANGE_EXISTING_SERVICEINSTANCE_OCID_HERE
compartmentId: CHANGE_COMPARTMENT_OCID_HERE
provisioning: false
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
# Allow access to OCI Service Broker from "any" pods running in the namespace that
# contians label "app=service-catalog".
# contains label "app=service-catalog".
kind: NetworkPolicy
apiVersion: networking.k8s.io/v1
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ apiVersion: servicecatalog.k8s.io/v1beta1
kind: ServiceInstance
metadata:
name: testbucket
namespace: default
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bucket instance needs to define namespace

spec:
clusterServiceClassExternalName: object-store-service
clusterServicePlanExternalName: standard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
apiVersion: servicecatalog.k8s.io/v1beta1
kind: ServiceInstance
metadata:
name: "CHANGE_EXISTING_BUCKETNAME_HERE"
name: CHANGE_EXISTING_BUCKETNAME_HERE
spec:
clusterServiceClassExternalName: object-store-service
clusterServicePlanExternalName: standard
parameters:
name: "CHANGE_EXISTING_BUCKETNAME_HERE"
namespace: "CHANGE_NAMESPACE_HERE"
name: CHANGE_EXISTING_BUCKETNAME_HERE
namespace: CHANGE_NAMESPACE_HERE
provisioning: false
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ spec:
name: teststream
compartmentId: CHANGE_COMPARTMENT_OCID_HERE
partitions: CHANGE_PARTITION_COUNT_HERE
# Use streampoolId for creating stream associated with a streampool. Do not use compartmentId when using streampoolId
# Use streampoolId for creating stream associated with a streampool.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compartment Id is required even when streampool id is set

# streampoolId: CHANGE_STREAM_POOL_OCID_HERE