You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2017/04/12 20:52:42 UTC
[2/6] beam git commit: Move jdbc's postgres k8s scripts into shared
k8s dir
Move jdbc's postgres k8s scripts into shared k8s dir
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/57588990
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/57588990
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/57588990
Branch: refs/heads/master
Commit: 57588990ae37024c1fa21c547b4626b4447107cf
Parents: 66b20af
Author: Stephen Sisk <si...@google.com>
Authored: Fri Apr 7 16:06:15 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Wed Apr 12 13:52:28 2017 -0700
----------------------------------------------------------------------
.../postgres/postgres-service-for-local-dev.yml | 28 ++++++++++
.test-infra/kubernetes/postgres/postgres.yml | 56 ++++++++++++++++++++
.../postgres-service-for-local-dev.yml | 28 ----------
.../src/test/resources/kubernetes/postgres.yml | 56 --------------------
.../jdbc/src/test/resources/kubernetes/setup.sh | 19 -------
.../src/test/resources/kubernetes/teardown.sh | 19 -------
6 files changed, 84 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/57588990/.test-infra/kubernetes/postgres/postgres-service-for-local-dev.yml
----------------------------------------------------------------------
diff --git a/.test-infra/kubernetes/postgres/postgres-service-for-local-dev.yml b/.test-infra/kubernetes/postgres/postgres-service-for-local-dev.yml
new file mode 100644
index 0000000..5d2c664
--- /dev/null
+++ b/.test-infra/kubernetes/postgres/postgres-service-for-local-dev.yml
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: postgres-for-dev
+ labels:
+ name: postgres
+spec:
+ ports:
+ - port: 5432
+ selector:
+ name: postgres
+ type: LoadBalancer
http://git-wip-us.apache.org/repos/asf/beam/blob/57588990/.test-infra/kubernetes/postgres/postgres.yml
----------------------------------------------------------------------
diff --git a/.test-infra/kubernetes/postgres/postgres.yml b/.test-infra/kubernetes/postgres/postgres.yml
new file mode 100644
index 0000000..6244968
--- /dev/null
+++ b/.test-infra/kubernetes/postgres/postgres.yml
@@ -0,0 +1,56 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: postgres
+ labels:
+ name: postgres
+spec:
+ ports:
+ - port: 5432
+ nodePort: 31234
+ selector:
+ name: postgres
+ type: NodePort
+
+---
+
+apiVersion: v1
+kind: ReplicationController
+metadata:
+ name: postgres
+spec:
+ replicas: 1
+ selector:
+ name: postgres
+ template:
+ metadata:
+ name: postgres
+ labels:
+ name: postgres
+ spec:
+ containers:
+ - name: postgres
+ image: postgres
+ env:
+ - name: POSTGRES_PASSWORD
+ value: uuinkks
+ - name: PGDATA
+ value: /var/lib/postgresql/data/pgdata
+ ports:
+ - containerPort: 5432
http://git-wip-us.apache.org/repos/asf/beam/blob/57588990/sdks/java/io/jdbc/src/test/resources/kubernetes/postgres-service-for-local-dev.yml
----------------------------------------------------------------------
diff --git a/sdks/java/io/jdbc/src/test/resources/kubernetes/postgres-service-for-local-dev.yml b/sdks/java/io/jdbc/src/test/resources/kubernetes/postgres-service-for-local-dev.yml
deleted file mode 100644
index 5d2c664..0000000
--- a/sdks/java/io/jdbc/src/test/resources/kubernetes/postgres-service-for-local-dev.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-apiVersion: v1
-kind: Service
-metadata:
- name: postgres-for-dev
- labels:
- name: postgres
-spec:
- ports:
- - port: 5432
- selector:
- name: postgres
- type: LoadBalancer
http://git-wip-us.apache.org/repos/asf/beam/blob/57588990/sdks/java/io/jdbc/src/test/resources/kubernetes/postgres.yml
----------------------------------------------------------------------
diff --git a/sdks/java/io/jdbc/src/test/resources/kubernetes/postgres.yml b/sdks/java/io/jdbc/src/test/resources/kubernetes/postgres.yml
deleted file mode 100644
index 6244968..0000000
--- a/sdks/java/io/jdbc/src/test/resources/kubernetes/postgres.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-apiVersion: v1
-kind: Service
-metadata:
- name: postgres
- labels:
- name: postgres
-spec:
- ports:
- - port: 5432
- nodePort: 31234
- selector:
- name: postgres
- type: NodePort
-
----
-
-apiVersion: v1
-kind: ReplicationController
-metadata:
- name: postgres
-spec:
- replicas: 1
- selector:
- name: postgres
- template:
- metadata:
- name: postgres
- labels:
- name: postgres
- spec:
- containers:
- - name: postgres
- image: postgres
- env:
- - name: POSTGRES_PASSWORD
- value: uuinkks
- - name: PGDATA
- value: /var/lib/postgresql/data/pgdata
- ports:
- - containerPort: 5432
http://git-wip-us.apache.org/repos/asf/beam/blob/57588990/sdks/java/io/jdbc/src/test/resources/kubernetes/setup.sh
----------------------------------------------------------------------
diff --git a/sdks/java/io/jdbc/src/test/resources/kubernetes/setup.sh b/sdks/java/io/jdbc/src/test/resources/kubernetes/setup.sh
deleted file mode 100644
index 76e4e34..0000000
--- a/sdks/java/io/jdbc/src/test/resources/kubernetes/setup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-kubectl create -f ./sdks/java/io/jdbc/src/test/resources/kubernetes/postgres.yml
http://git-wip-us.apache.org/repos/asf/beam/blob/57588990/sdks/java/io/jdbc/src/test/resources/kubernetes/teardown.sh
----------------------------------------------------------------------
diff --git a/sdks/java/io/jdbc/src/test/resources/kubernetes/teardown.sh b/sdks/java/io/jdbc/src/test/resources/kubernetes/teardown.sh
deleted file mode 100644
index 4fca74a..0000000
--- a/sdks/java/io/jdbc/src/test/resources/kubernetes/teardown.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-kubectl delete -f ./sdks/java/io/jdbc/src/test/resources/kubernetes/postgres.yml