Merge "[AAF] v1.16+ compatible templates"
authorKrzysztof Opasiak <k.opasiak@samsung.com>
Thu, 7 May 2020 10:08:24 +0000 (10:08 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 7 May 2020 10:08:24 +0000 (10:08 +0000)
1  2 
kubernetes/aaf/charts/aaf-cm/values.yaml
kubernetes/aaf/charts/aaf-gui/values.yaml
kubernetes/aaf/charts/aaf-locate/values.yaml
kubernetes/aaf/charts/aaf-oauth/values.yaml
kubernetes/aaf/charts/aaf-service/values.yaml
kubernetes/aaf/values.yaml

@@@ -19,6 -19,13 +19,13 @@@ flavor: smal
  # Application configuration defaults.
  #################################################################
  # application image
+ replicaCount: 1
+ binary: cm
+ sequence_order:
+   - service
+   - locate
  
  nodeSelector: {}
  
@@@ -26,24 -33,25 +33,25 @@@ affinity: {
  
  # probe configuration parameters
  liveness:
-   initialDelaySeconds: 120
+   initialDelaySeconds: 30
    periodSeconds: 10
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
    enabled: true
+   port: api
  
  readiness:
    initialDelaySeconds: 5
    periodSeconds: 10
+   port: api
  
  service:
    name: aaf-cm
    type: ClusterIP
-   portName: aaf-cm
-   #targetPort
-   internalPort: 8150
-   #port
-   externalPort: 8150
+   ports:
+     - name: api
+       protocol: http
+       port: 8150
  
  ingress:
    enabled: false
        name: "aaf-cm"
        port: 8150
    config:
 -    ssl: "none"
 +    ssl: "redirect"
  
  # Configure resource requests and limits
  resources:
-  small:
-    limits:
-      cpu: 400m
-      memory: 300Mi
-    requests:
-      cpu: 1m
-      memory: 200Mi
-  large:
-    limits:
-      cpu: 400m
-      memory: 1Gi
-    requests:
-      cpu: 40m
-      memory: 600Mi
-  unlimited: {}
+   small:
+     limits:
+       cpu: 400m
+       memory: 300Mi
+     requests:
+       cpu: 1m
+       memory: 200Mi
+   large:
+     limits:
+       cpu: 400m
+       memory: 1Gi
+     requests:
+       cpu: 40m
+       memory: 600Mi
+   unlimited: {}
@@@ -20,6 -20,13 +20,13 @@@ flavor: smal
  # application image
  pullPolicy: Always
  
+ replicaCount: 1
+ binary: gui
+ sequence_order:
+   - service
+   - locate
  
  nodeSelector: {}
  
@@@ -27,25 -34,26 +34,26 @@@ affinity: {
  
  # probe configuration parameters
  liveness:
-   initialDelaySeconds: 120
+   initialDelaySeconds: 30
    periodSeconds: 10
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
    enabled: true
+   port: gui
  
  readiness:
    initialDelaySeconds: 5
    periodSeconds: 10
+   port: gui
  
  service:
    name: aaf-gui
    type: NodePort
-   portName: aaf-gui
-   #targetPort
-   internalPort: 8200
-   #port
-   externalPort: 8200
-   nodePort: 51
+   ports:
+     - name: gui
+       protocol: http
+       port: 8200
+       nodePort: 51
  
  ingress:
    enabled: false
        name: "aaf-gui"
        port: 8200
    config:
 -    ssl: "none"
 +    ssl: "redirect"
  
  # Configure resource requests and limits
  resources:
-  small:
-    limits:
-      cpu: 200m
-      memory: 280Mi
-    requests:
-      cpu: 1m
-      memory: 170Mi
-  large:
-    limits:
-      cpu: 200m
-      memory: 1Gi
-    requests:
-      cpu: 100m
-      memory: 500Mi
-  unlimited: {}
+   small:
+     limits:
+       cpu: 200m
+       memory: 280Mi
+     requests:
+       cpu: 1m
+       memory: 170Mi
+   large:
+     limits:
+       cpu: 200m
+       memory: 1Gi
+     requests:
+       cpu: 100m
+       memory: 500Mi
+   unlimited: {}
@@@ -18,6 -18,12 +18,12 @@@ flavor: smal
  # Application configuration defaults.
  #################################################################
  # application image
+ replicaCount: 1
+ binary: locate
+ sequence_order:
+   - service
  
  nodeSelector: {}
  
@@@ -25,24 -31,25 +31,25 @@@ affinity: {
  
  # probe configuration parameters
  liveness:
-   initialDelaySeconds: 120
+   initialDelaySeconds: 30
    periodSeconds: 10
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
    enabled: true
+   port: api
  
  readiness:
    initialDelaySeconds: 5
    periodSeconds: 10
+   port: api
  
  service:
    name: aaf-locate
    type: ClusterIP
-   portName: aaf-locate
-   #targetPort
-   internalPort: 8095
-   #port
-   externalPort: 31111
+   ports:
+     - name: api
+       protocol: http
+       port: 8095
  
  ingress:
    enabled: false
        name: "aaf-locate"
        port: 8095
    config:
 -    ssl: "none"
 +    ssl: "redirect"
  
  # Configure resource requests and limits
  resources:
-  small:
-    limits:
-      cpu: 100m
-      memory: 320Mi
-    requests:
-      cpu: 1m
-      memory: 210Mi
-  large:
-    limits:
-      cpu: 400m
-      memory: 1Gi
-    requests:
-      cpu: 40m
-      memory: 500Mi
-  unlimited: {}
+   small:
+     limits:
+       cpu: 100m
+       memory: 320Mi
+     requests:
+       cpu: 1m
+       memory: 210Mi
+   large:
+     limits:
+       cpu: 400m
+       memory: 1Gi
+     requests:
+       cpu: 40m
+       memory: 500Mi
+   unlimited: {}
@@@ -19,30 -19,40 +19,40 @@@ flavor: smal
  # Application configuration defaults.
  #################################################################
  # application image
+ replicaCount: 1
+ binary: oauth
+ sequence_order:
+   - service
+   - locate
  nodeSelector: {}
  
  affinity: {}
  
  # probe configuration parameters
  liveness:
-   initialDelaySeconds: 120
+   initialDelaySeconds: 30
    periodSeconds: 10
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
    enabled: true
+   port: api
  
  readiness:
    initialDelaySeconds: 5
    periodSeconds: 10
+   port: api
  
  service:
    name: aaf-oauth
    type: ClusterIP
-   portName: aaf-oauth
-   #targetPort
-   internalPort: 8140
-   #port
-   externalPort: 8140
+   ports:
+     - name: api
+       protocol: http
+       port: 8140
  
  ingress:
    enabled: false
        name: "aaf-oauth"
        port: 8140
    config:
 -    ssl: "none"
 +    ssl: "redirect"
  
  # Configure resource requests and limits
  resources:
-  small:
-    limits:
-      cpu: 40m
-      memory: 320Mi
-    requests:
-      cpu: 1m
-      memory: 210Mi
-  large:
-    limits:
-      cpu: 400m
-      memory: 600Mi
-    requests:
-      cpu: 40m
-      memory: 200Mi
-  unlimited: {}
+   small:
+     limits:
+       cpu: 40m
+       memory: 320Mi
+     requests:
+       cpu: 1m
+       memory: 210Mi
+   large:
+     limits:
+       cpu: 400m
+       memory: 600Mi
+     requests:
+       cpu: 40m
+       memory: 200Mi
+   unlimited: {}
@@@ -20,30 -20,38 +20,38 @@@ flavor: smal
  #################################################################
  # application image
  
+ replicaCount: 1
+ binary: service
+ sequence_order:
+   - cass
  nodeSelector: {}
  
  affinity: {}
  
  # probe configuration parameters
  liveness:
-   initialDelaySeconds: 120
+   initialDelaySeconds: 30
    periodSeconds: 10
    # necessary to disable liveness probe when setting breakpoints
    # in debugger so K8s doesn't restart unresponsive container
    enabled: true
+   port: api
  
  readiness:
    initialDelaySeconds: 5
    periodSeconds: 10
+   port: api
  
  service:
    name: aaf-service
-   type: NodePort
-   portName: aaf-service
-   #targetPort
-   internalPort: 8100
-   #port
-   externalPort: 31110
+   type: ClusterIP
+   ports:
+     - name: api
+       port: 8100
+       protocol: http
  
  ingress:
    enabled: false
        name: "aaf-service"
        port: 8100
    config:
 -    ssl: "none"
 +    ssl: "redirect"
  
  # Configure resource requests and limits
  resources:
-  small:
-    limits:
-      cpu: 250m
-      memory: 360Mi
-    requests:
-      cpu: 10m
-      memory: 250Mi
-  large:
-    limits:
-      cpu: 400m
-      memory: 1Gi
-    requests:
-      cpu: 40m
-      memory: 300Mi
-  unlimited: {}
+   small:
+     limits:
+       cpu: 250m
+       memory: 360Mi
+     requests:
+       cpu: 10m
+       memory: 250Mi
+   large:
+     limits:
+       cpu: 400m
+       memory: 1Gi
+     requests:
+       cpu: 40m
+       memory: 300Mi
+   unlimited: {}
@@@ -29,7 -29,7 +29,7 @@@ global
    loggingImage: beats/filebeat:5.5.0
    # BusyBox image
    busyboxRepository: registry.hub.docker.com
-   busyboxImage: library/busybox:latest
+   busyboxImage: library/busybox:1.31
    persistence:
      enabled: true
    # Standard OOM
  
      config:
        image: onap/aaf/aaf_config:2.1.20
-     cass:
-       replicas: 1
-       image: onap/aaf/aaf_cass:2.1.20
-       fqdn: "aaf-cass"
-       cluster_name: "osaaf"
-       heap_new_size: "512M"
-       max_heap_size: "1024M"
-       storage_port: 7000
-       ssl_storage_port: 7001
-       native_trans_port: 9042
-       rpc_port: 9160
-       dc: "dc1"
      service:
-       replicas: 1
        fqdn: "aaf-service"
        internal_port: 8100
        public_port: 31110
      locate:
-       replicas: 1
        fqdn: "aaf-locate"
        internal_port: 8095
        public_port: 31111
      oauth:
-       replicas: 1
-       fqdn: "aaf0oauth"
+       fqdn: "aaf-oauth"
        internal_port: 8140
        public_port: 31112
-     gui:
-       replicas: 1
-       fqdn: "aaf-gui"
-       internal_port: 8200
-       public_port: 31113
-     cm:
-       replicas: 1
-       fqdn: "aaf-cm"
-       internal_port: 8150
-       public_port: 31114
-     fs:
-       replicas: 1
-       fqdn: "aaf-fs"
-       internal_port: 8096
-       public_port: 31115
-     hello:
-       replicas: 0
  #     Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml
  
  
@@@ -131,42 -100,7 +100,13 @@@ readiness
  
  ingress:
    enabled: false
 +  service:
 +    - baseaddr: "aaf.api"
 +      name: "aaf-service"
 +      port: 8100
 +  config:
 +    ssl: "none"
  
- ## Persist data to a persitent volume
- persistence:
-   enabled: true
-   config:
-     #existingClaim:
-     volumeReclaimPolicy: Delete
-     accessMode: ReadWriteMany
-     size: 2Gi
-     mountPath: /dockerdata-nfs
-     mountSubPath: "config"
-   logs:
-     #existingClaim:
-     volumeReclaimPolicy: Retain
-     accessMode: ReadWriteMany
-     size: 2Gi
-     mountPath: "/mnt/data/aaf/logs"
-   status:
-     volumeReclaimPolicy: Delete
-     accessMode: ReadWriteMany
-     size: 2M
-     mountPath: /dockerdata-nfs
-     mountSubPath: "status"
-   cass:
-     #existingClaim:
-     volumeReclaimPolicy: Retain
-     accessMode: ReadWriteOnce
-     size: 10Gi
-     mountPath: /dockerdata-nfs
-     mountSubPath: "cass"
+ persistence: {}
  
  resources: {}