Updated template for aws and transcode/transcoder

minds/templates/configMap.yaml

@@ -595,61 +595,60 @@ data:
  $CONFIG->set('aws', [
  'key' => '{{ .Values.aws.key }}',
  'secret' => '{{ .Values.aws.secret }}',
- 'useRoles' => false,
- 'bucket' => 'cinemr',
- 'staticStorage' => 'cinemr_dev',
- 'region' => 'us-east-1',
- 'account_id' => '324044571751',
+ 'useRoles' =>  '{{ .Values.aws.useRoles }}',
+ 'bucket' => '{{ .Values.aws.bucket }}',
+ 'staticStorage' => '{{ .Values.aws.staticStorage }}',
+ 'region' => '{{ .Values.aws.region }}',
+ 'account_id' => '{{ .Values.aws.account_id }}',
  'elastic_transcoder' => [
- 'pipeline_id' => '1401290942976-efm3xj',
+ 'pipeline_id' => '{{ .Values.aws.elastic_transcoder.pipeline_id }}'
  'presets' => [
- "360.mp4" => "1351620000001-000040",
- "720.mp4" => "1351620000001-000010",
- "360.webm" => "1404848610623-0blc5v",
- "720.webm" => "1404852762051-zzvwfq"
+ '360.mp4' => '{{ .Values.aws.elastic_transcoder.presets.360mp4 }}',
+ '720.mp4' => '{{ .Values.aws.elastic_transcoder.presets.720mp4 }}',
+ '360.webm' => '{{ .Values.aws.elastic_transcoder.presets.360webm }}',
+ '720.webm' => '{{ .Values.aws.elastic_transcoder.presets.720webm }}',
  ],
- 'dir' => 'cinemr_dev'
+ 'dir' => '{{ .Values.aws.elastic_transcoder.dir}}'
  ],
  'queue' => [
- 'namespace' => 'EmiDev',
- 'wait_seconds' => 3,
+ 'namespace' => '{{ .Values.aws.queue.namespace }}',
+ 'wait_seconds' => '{{ .Values.aws.queue.wait_seconds }}',
  ]
  ]);
 
  $CONFIG->set('transcode', [
- //'free_threshold' => 900, // 15 minutes
- 'free_threshold' => 2,
- 'hd_price' => 1, // tokens
- 'fhd_price' => 1.5, // tokens
+ 'free_threshold' => ,'{{ .Values.transcode.free_threshold }}'
+ 'hd_price' => '{{ .Values.transcode.hd_price }}', // tokens
+ 'fhd_price' => '{{ .Values.transcode.fhd_price }}', // tokens
  ]);
 
  $CONFIG->set('transcoder', [
- 'threads' => 4,
- 'dir' => 'cinemr_dev',
+ 'threads' => '{{ .Values.transcoder.threads }}',
+ 'dir' => '{{ .Values.transcoder.dir }}',
  'presets' => [
  [
- 'width' => 640,
- 'height' => 360,
- 'bitrate' => 500,
- 'audio_bitrate' => 80,
- 'formats' => [ 'mp4', 'webm' ],
- 'charge' => false,
+ 'width' => '{{ .Values.transcoder.presets.width }}',
+ 'height' => '{{ .Values.transcoder.presets.height }}',
+ 'bitrate' => '{{ .Values.transcoder.presets.bitrate }}',
+ 'audio_bitrate' => '{{ .Values.transcoder.presets.audio_bitrate }}',
+ 'formats' => '{{ .Values.transcoder.presets.formats }}'
+ 'charge' => '{{ .Values.transcoder.presets.charge }}'
  ],
  [
- 'width' => 1280,
- 'height' => 720,
- 'bitrate' => 2000,
- 'audio_bitrate' => 128,
- 'formats' => [ 'mp4', 'webm' ],
- 'charge' => false,
+ 'width' => '{{ .Values.transcoder.presets.width2 }}'
+ 'height' => '{{ .Values.transcoder.presets.height2 }}'
+ 'bitrate' => '{{ .Values.transcoder.presets.bitrate2 }}'
+ 'audio_bitrate' => '{{ .Values.transcoder.presets.audio_bitrate2 }}'
+ 'formats' => '{{ .Values.transcoder.presets.formats2 }}'
+ 'charge' => '{{ .Values.transcoder.presets.charge2 }}'
  ],
  [
- 'width' => 1920,
- 'height' => 1080,
- 'bitrate' => 2000,
- 'audio_bitrate' => 128,
- 'formats' => [ 'mp4', 'webm' ],
- 'charge' => true,
+ 'width' => '{{ .Values.transcoder.presets.width3 }}'
+ 'height' => '{{ .Values.transcoder.presets.height3 }}'
+ 'bitrate' => '{{ .Values.transcoder.presets.bitrate3 }}'
+ 'audio_bitrate' => '{{ .Values.transcoder.presets.audio_bitrate3 }}'
+ 'formats' => '{{ .Values.transcoder.presets.formats3 }}'
+ 'charge' => '{{ .Values.transcoder.presets.charge3 }}'
  ],
  ]
  ]);

minds/values.yaml

@@ -207,6 +207,55 @@ aws:
  snsSecret:
  key:
  secret:
+ useRoles: false
+ bucket: 'cinemr'
+ staticStorage: 'cinemr_dev'
+ region: 'us-east-1'
+ account_id: '324044571751'
+ elastic_transcoder:
+ pipeline_id: '1401290942976-efm3xj'
+ presets:
+ 360mp4: '1351620000001-000040'
+ 720mp4: '1351620000001-000040'
+ 360webm: '1404848610623-0blc5v'
+ 720webm: '1404852762051-zzvwfq'
+ dir: 'cinemr_dev'
+ queue:
+ namespace: 'EmiDev' 
+ wait_seconds: 3
+
+transcode:
+ free_threshold: 2
+ hd_price: 1
+ fhd_price: 1.5
+
+transcoder:
+ threads: 4
+ dir: 'cinemr_dev'
+ presets:
+ width: 640
+ height: 360
+ bitrate: 500
+ audio_bitrate: 80
+ formats: |
+ ['mp4', 'webm']
+ charge: false
+
+ width2: 640
+ height2: 360
+ bitrate2: 500
+ audio_bitrate2: 80
+ formats2: |
+ ['mp4', 'webm']
+ charge2: false
+
+ width3: 640
+ height3: 360
+ bitrate3: 500
+ audio_bitrate3: 80
+ formats3: |
+ ['mp4', 'webm']
+ charge3: false
 
 blockchain:
  testNet: 'true'
@@ -221,6 +270,7 @@ blockchain:
  withdrawWalletKey:
  bonusWallet: '0x00B687931b2cb8aEca65A8C9D125158CA506e7Ba'
  bonusWalletKey:
+
  boostAddress: '0xad6c30d7995484aef9465b3c41cfae1994be7124'
  boostWallet: '0xfD7acB9Dd58c2296105ef859D7078b7C51c7e834'
  boostWalletKey: