Merge "Align Artifactory's values.yaml with proposed spec and patterns"

This commit is contained in:
Zuul 2018-12-06 20:44:13 +00:00 committed by Gerrit Code Review
commit 055e8d8895
2 changed files with 64 additions and 74 deletions

View File

@ -84,6 +84,6 @@ spec:
accessModes: [ "ReadWriteOnce" ] accessModes: [ "ReadWriteOnce" ]
resources: resources:
requests: requests:
storage: {{ .Values.volume.size }} storage: {{ .Values.storage.requests.storage }}
storageClassName: {{ .Values.volume.class_name }} storageClassName: {{ .Values.storage.storage_class }}
{{- end }} {{- end }}

View File

@ -12,27 +12,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# Default values for artifactory.
# This is a YAML-formatted file.
# Declare name/value pairs to be passed into your templates.
# name: value
labels:
server:
node_selector_key: openstack-control-plane
node_selector_value: enabled
job:
node_selector_key: openstack-control-plane
node_selector_value: enabled
release_group: null
images: images:
tags: tags:
db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
artifactory: quay.io/attcomdev/artifactory-pro-mysql:5.11.1 artifactory: quay.io/attcomdev/artifactory-pro-mysql:5.11.1
db_drop: docker.io/openstackhelm/heat:newton
db_init: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:
@ -41,18 +26,13 @@ images:
- dep_check - dep_check
- image_repo_sync - image_repo_sync
network: labels:
node_ports: job:
enabled: false node_selector_key: openstack-control-plane
http: node_selector_value: enabled
port: 8081 server:
node_port: 31672 node_selector_key: openstack-control-plane
docker: node_selector_value: enabled
port: 5050
node_port: 31777
secure:
port: 5052
node_port: 31776
dependencies: dependencies:
dynamic: dynamic:
@ -64,12 +44,6 @@ dependencies:
- endpoint: node - endpoint: node
service: local_image_registry service: local_image_registry
static: static:
server:
services:
- endpoint: internal
service: oslo_cache
- endpoint: internal
service: oslo_db
db_drop: db_drop:
services: services:
- endpoint: internal - endpoint: internal
@ -78,16 +52,22 @@ dependencies:
services: services:
- endpoint: internal - endpoint: internal
service: oslo_db service: oslo_db
server:
storage: pvc services:
- endpoint: internal
volume: service: oslo_cache
size: 100Gi - endpoint: internal
class_name: general service: oslo_db
chown_on_start: true
pod: pod:
lifecycle:
upgrades:
deployments:
revision_history: 1
pod_replacement_strategy: RollingUpdate
rolling_update:
max_unavailable: 1
max_surge: 1
resources: resources:
enabled: false enabled: false
artifactory: artifactory:
@ -119,14 +99,6 @@ pod:
limits: limits:
memory: "1024Mi" memory: "1024Mi"
cpu: "2000m" cpu: "2000m"
lifecycle:
upgrades:
deployments:
pod_replacement_strategy: RollingUpdate
revision_history: 1
rolling_update:
max_surge: 1
max_unavailable: 1
secrets: secrets:
oslo_db: oslo_db:
@ -137,6 +109,10 @@ secrets:
# endpoints required by this chart # endpoints required by this chart
endpoints: endpoints:
cluster_domain_suffix: cluster.local cluster_domain_suffix: cluster.local
cicd:
name: artifactory
hosts:
default: artifactory
oslo_db: oslo_db:
namespace: null namespace: null
auth: auth:
@ -155,28 +131,42 @@ endpoints:
port: port:
mysql: mysql:
default: 3306 default: 3306
cicd:
name: artifactory # bootstrap/seed artifactory configuration
hosts: bootstrap:
default: artifactory master_key: null
network:
docker:
node_port: 31777
port: 5050
http:
node_port: 31672
port: 8081
node_ports:
enabled: false
secure:
node_port: 31776
port: 5052
storage:
requests:
storage: 100Gi
storage_class: general
manifests:
configmap_bin: true
configmap_etc: true
job_db_drop: false
job_db_init: true
job_image_repo_sync: true
pvc_artifactory: true
secret_db: true
secret_db_creds: true
service: true
statefulset: true
conf: conf:
artifactory: artifactory:
env: env:
java_opts: "-Xms512m -Xmx2g" java_opts: "-Xms512m -Xmx2g"
manifests:
configmap_bin: true
configmap_etc: true
statefulset: true
job_image_repo_sync: true
job_db_init: true
job_db_drop: false
secret_db: true
secret_db_creds: true
pvc_artifactory: true
service: true
# bootstrap/seed artifactory configuration
bootstrap:
master_key: null