Merge branch 'master' into config-and-manifest-params

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Compose, Zalando SE
+Copyright (c) 2019 Zalando SE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

manifests/postgres-operator.yaml

@@ -1,9 +1,12 @@
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: postgres-operator
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: postgres-operator
   template:
     metadata:
       labels: