release 4.6.0

manifest_templates/btrdb.statefulset.yaml

@@ -41,12 +41,8 @@ spec:
             # btrdb tries to use. That is tweaked by BLOCK_CACHE below
             memory: 32Gi
         env:
-          - name: ETCD_ENDPOINT_0
-            value: http://etcd-0000.etcd:2379
-          - name: ETCD_ENDPOINT_1
-            value: http://etcd-0001.etcd:2379
-          - name: ETCD_ENDPOINT_2
-            value: http://etcd-0002.etcd:2379
+          - name: ETCD_ENDPOINT
+            value: http://etcd:2379
           - name: CEPH_HOT_POOL
             value: {{.SiteInfo.Ceph.BTrDBHotPool}}
           - name: CEPH_DATA_POOL

manifest_templates/createdb.job.yaml

@@ -1,6 +1,7 @@
 # {{ .GenLine }}
 #this creates the database in ceph. If you run this when there is an
 #existing database, you will have a bad time.
+# DO NOT USE THIS FOR MIGRATING AN EXISTING DATABASE
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -14,16 +15,13 @@ spec:
       restartPolicy: Never
       containers:
       - name: btrdb-createdb
+        iKnowWhatIAmDoing: delete this line if you really want to use this file
         image: btrdb/{{.Pfx}}db:{{.TargetVersion}}
         imagePullPolicy: {{.Containers.ImagePullPolicy}}
         args: [ "makedb" ]
         env:
-          - name: ETCD_ENDPOINT_0
-            value: http://etcd-0000.etcd:2379
-          - name: ETCD_ENDPOINT_1
-            value: http://etcd-0001.etcd:2379
-          - name: ETCD_ENDPOINT_2
-            value: http://etcd-0002.etcd:2379
+          - name: ETCD_ENDPOINT
+            value: http://etcd:2379
           - name: CEPH_HOT_POOL
             value: {{.SiteInfo.Ceph.BTrDBHotPool}}
           - name: CEPH_DATA_POOL

manifest_templates/ensuredb.job.yaml

@@ -0,0 +1,38 @@
+# {{ .GenLine }}
+# this migrates from a single pool BTrDB to a tiered storage BTrDB
+# it does not move the old data, but new data will be properly tiered.
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: btrdb-ensuredb
+  namespace: {{.TargetNamespace}}
+spec:
+  template:
+    metadata:
+      name: btrdb-ensuredb
+    spec:
+      restartPolicy: Never
+      containers:
+      - name: btrdb-ensuredb
+        image: btrdb/{{.Pfx}}db:{{.TargetVersion}}
+        imagePullPolicy: {{.Containers.ImagePullPolicy}}
+        args: [ "ensuredb" ]
+        env:
+          - name: ETCD_ENDPOINT
+            value: http://etcd:2379
+          - name: CEPH_HOT_POOL
+            value: {{.SiteInfo.Ceph.BTrDBHotPool}}
+          - name: CEPH_DATA_POOL
+            value: {{.SiteInfo.Ceph.BTrDBDataPool}}
+          - name: MY_POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
+        volumeMounts:
+          - name: ceph-keyring
+            mountPath: /etc/ceph/
+            readOnly: true
+      volumes:
+        - name: ceph-keyring
+          secret:
+            secretName: ceph-keyring

manifest_templates/etcd-operator.deployment.yaml

@@ -14,7 +14,7 @@ spec:
       serviceAccountName: etcd-operator
       containers:
       - name: etcd-operator
-        image: quay.io/coreos/etcd-operator:v0.4.1
+        image: quay.io/coreos/etcd-operator:v0.5.0
         env:
         - name: MY_POD_NAMESPACE
           valueFrom:

manifest_templates/etcd.cluster.yaml

@@ -1,6 +1,6 @@
 # {{ .GenLine }}
-apiVersion: "etcd.coreos.com/v1beta1"
-kind: "Cluster"
+apiVersion: "etcd.database.coreos.com/v1beta2"
+kind: "EtcdCluster"
 metadata:
   name: "etcd"
   namespace: {{.TargetNamespace}}

manifest_templates/etcd.clusterrole.yaml

@@ -5,15 +5,15 @@ metadata:
   name: etcd-operator
 rules:
 - apiGroups:
-  - etcd.coreos.com
+  - etcd.database.coreos.com
   resources:
-  - clusters
+  - etcdclusters
   verbs:
   - "*"
 - apiGroups:
-  - extensions
+  - apiextensions.k8s.io
   resources:
-  - thirdpartyresources
+  - customresourcedefinitions
   verbs:
   - "*"
 - apiGroups:

mfgen/main.go

@@ -10,7 +10,7 @@ import (
 
 //go:generate go-bindata -o templates.go -prefix ../manifest_templates ../manifest_templates/
 
-const PackageVersion = "4.5.0"
+const PackageVersion = "4.6.0"
 
 func main() {
 	app := cli.NewApp()

mfgen/manifest.go

@@ -17,6 +17,7 @@ var Manifest []*ManifestEntry = []*ManifestEntry{
 	&ManifestEntry{Yep, "READMEFIRST.md", TemplateProcess("readme.md", "")},
 	&ManifestEntry{Yep, "adminconsole.deployment.yaml", TemplateProcess("adminconsole.deployment.yaml", "core")},
 	&ManifestEntry{Yep, "createdb.job.yaml", TemplateProcess("createdb.job.yaml", "core")},
+	&ManifestEntry{Yep, "ensuredb.job.yaml", TemplateProcess("ensuredb.job.yaml", "core")},
 	&ManifestEntry{Yep, "btrdb.statefulset.yaml", TemplateProcess("btrdb.statefulset.yaml", "core")},
 	&ManifestEntry{Yep, "create_admin_key.sh", TemplateProcess("create_admin_key.sh", "core")},
 	&ManifestEntry{Yep, "c37ingress.deployment.yaml", TemplateProcess("c37ingress.deployment.yaml", "ingress")},

tools/version.go

@@ -1,5 +1,5 @@
 package tools
 
 const VersionMajor = 4
-const VersionMinor = 5
+const VersionMinor = 6
 const VersionPatch = 0