Browse Source

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

Use LOCI Heat Images.

Values not described in spec[1] or proposed values-template[2] were
placed at the end of values.yaml.

BREAKING CHANGES:

1. Removed `chown_on_start`
2. Removed `release_group`
3. Removed `storage`
4. Moved `volume.size` to `storage.requests.storage`
5. Moved `volume.class_name` to `storage.storage_class`

[1] https://docs.openstack.org/openstack-helm/latest/specs/values-ordering.html
[2] https://review.openstack.org/#/c/577234/4/doc/source/devref/values-template.yaml

Change-Id: Ibe2abeb48b67056c456154e5c270573533ca9a7e
Dustin Specker 6 months ago
parent
commit
466953998e
2 changed files with 58 additions and 68 deletions
  1. 2
    2
      artifactory/templates/statefulset.yaml
  2. 56
    66
      artifactory/values.yaml

+ 2
- 2
artifactory/templates/statefulset.yaml View File

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

+ 56
- 66
artifactory/values.yaml View File

@@ -12,27 +12,12 @@
12 12
 # See the License for the specific language governing permissions and
13 13
 # limitations under the License.
14 14
 
15
-# Default values for artifactory.
16
-# This is a YAML-formatted file.
17
-# Declare name/value pairs to be passed into your templates.
18
-# name: value
19
-
20
-labels:
21
-  server:
22
-    node_selector_key: openstack-control-plane
23
-    node_selector_value: enabled
24
-  job:
25
-    node_selector_key: openstack-control-plane
26
-    node_selector_value: enabled
27
-
28
-release_group: null
29
-
30 15
 images:
31 16
   tags:
32
-    db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
33
-    db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
34
-    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
35 17
     artifactory: quay.io/attcomdev/artifactory-pro-mysql:5.11.1
18
+    db_drop: docker.io/openstackhelm/heat:newton
19
+    db_init: docker.io/openstackhelm/heat:newton
20
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
36 21
     image_repo_sync: docker.io/docker:17.07.0
37 22
   pull_policy: "IfNotPresent"
38 23
   local_registry:
@@ -41,18 +26,13 @@ images:
41 26
       - dep_check
42 27
       - image_repo_sync
43 28
 
44
-network:
45
-  node_ports:
46
-    enabled: false
47
-  http:
48
-    port: 8081
49
-    node_port: 31672
50
-  docker:
51
-    port: 5050
52
-    node_port: 31777
53
-  secure:
54
-    port: 5052
55
-    node_port: 31776
29
+labels:
30
+  job:
31
+    node_selector_key: openstack-control-plane
32
+    node_selector_value: enabled
33
+  server:
34
+    node_selector_key: openstack-control-plane
35
+    node_selector_value: enabled
56 36
 
57 37
 dependencies:
58 38
   dynamic:
@@ -64,30 +44,30 @@ dependencies:
64 44
           - endpoint: node
65 45
             service: local_image_registry
66 46
   static:
67
-    server:
47
+    db_drop:
68 48
       services:
69
-        - endpoint: internal
70
-          service: oslo_cache
71 49
         - endpoint: internal
72 50
           service: oslo_db
73
-    db_drop:
51
+    db_init:
74 52
       services:
75 53
         - endpoint: internal
76 54
           service: oslo_db
77
-    db_init:
55
+    server:
78 56
       services:
57
+        - endpoint: internal
58
+          service: oslo_cache
79 59
         - endpoint: internal
80 60
           service: oslo_db
81 61
 
82
-storage: pvc
83
-
84
-volume:
85
-  size: 100Gi
86
-  class_name: general
87
-
88
-chown_on_start: true
89
-
90 62
 pod:
63
+  lifecycle:
64
+    upgrades:
65
+      deployments:
66
+        revision_history: 1
67
+        pod_replacement_strategy: RollingUpdate
68
+        rolling_update:
69
+          max_unavailable: 1
70
+          max_surge: 1
91 71
   resources:
92 72
     enabled: false
93 73
     artifactory:
@@ -119,14 +99,6 @@ pod:
119 99
         limits:
120 100
           memory: "1024Mi"
121 101
           cpu: "2000m"
122
-  lifecycle:
123
-    upgrades:
124
-      deployments:
125
-        pod_replacement_strategy: RollingUpdate
126
-        revision_history: 1
127
-        rolling_update:
128
-          max_surge: 1
129
-          max_unavailable: 1
130 102
 
131 103
 secrets:
132 104
   oslo_db:
@@ -137,6 +109,10 @@ secrets:
137 109
 # endpoints required by this chart
138 110
 endpoints:
139 111
   cluster_domain_suffix: cluster.local
112
+  cicd:
113
+    name: artifactory
114
+    hosts:
115
+      default: artifactory
140 116
   oslo_db:
141 117
     namespace: null
142 118
     auth:
@@ -155,28 +131,42 @@ endpoints:
155 131
     port:
156 132
       mysql:
157 133
         default: 3306
158
-  cicd:
159
-    name: artifactory
160
-    hosts:
161
-      default: artifactory
162 134
 
163
-conf:
164
-  artifactory:
165
-    env:
166
-      java_opts: "-Xms512m -Xmx2g"
135
+# bootstrap/seed artifactory configuration
136
+bootstrap:
137
+  master_key: null
138
+
139
+network:
140
+  docker:
141
+    node_port: 31777
142
+    port: 5050
143
+  http:
144
+    node_port: 31672
145
+    port: 8081
146
+  node_ports:
147
+    enabled: false
148
+  secure:
149
+    node_port: 31776
150
+    port: 5052
151
+
152
+storage:
153
+  requests:
154
+    storage: 100Gi
155
+  storage_class: general
167 156
 
168 157
 manifests:
169 158
   configmap_bin: true
170 159
   configmap_etc: true
171
-  statefulset: true
172
-  job_image_repo_sync: true
173
-  job_db_init: true
174 160
   job_db_drop: false
161
+  job_db_init: true
162
+  job_image_repo_sync: true
163
+  pvc_artifactory: true
175 164
   secret_db: true
176 165
   secret_db_creds: true
177
-  pvc_artifactory: true
178 166
   service: true
167
+  statefulset: true
179 168
 
180
-# bootstrap/seed artifactory configuration
181
-bootstrap:
182
-  master_key: null
169
+conf:
170
+  artifactory:
171
+    env:
172
+      java_opts: "-Xms512m -Xmx2g"

Loading…
Cancel
Save