From ca51c14ce55e9c12749a04303cced520bc12708e Mon Sep 17 00:00:00 2001 From: Jeff Warnica Date: Tue, 8 Sep 2020 13:51:13 -0300 Subject: [PATCH 1/4] Create postgres_pvc.yaml --- resources/etherpad/postgres_pvc.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/etherpad/postgres_pvc.yaml diff --git a/resources/etherpad/postgres_pvc.yaml b/resources/etherpad/postgres_pvc.yaml new file mode 100644 index 0000000..09f9828 --- /dev/null +++ b/resources/etherpad/postgres_pvc.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + template: postgresql-persistent-template + name: postgresql +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 2Gi From 8e57c6c8f5fdbb57ce60074a5014dccee144a7fe Mon Sep 17 00:00:00 2001 From: Jeff Warnica Date: Tue, 8 Sep 2020 13:52:53 -0300 Subject: [PATCH 2/4] Update postgres_deployment.yaml --- resources/etherpad/postgres_deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/etherpad/postgres_deployment.yaml b/resources/etherpad/postgres_deployment.yaml index 2004aff..df457ac 100644 --- a/resources/etherpad/postgres_deployment.yaml +++ b/resources/etherpad/postgres_deployment.yaml @@ -65,5 +65,5 @@ spec: restartPolicy: Always volumes: - name: postgresql-data - emptyDir: - medium: "" \ No newline at end of file + persistentVolumeClaim: + claimName: postgresql From 62e0f67799ea7c102f1f8059f503630898cef910 Mon Sep 17 00:00:00 2001 From: Jeff Warnica Date: Tue, 8 Sep 2020 14:09:45 -0300 Subject: [PATCH 3/4] Undo lab changes --- resources/etherpad/postgres_deployment.yaml | 4 ++-- resources/etherpad/postgres_pvc.yaml | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 resources/etherpad/postgres_pvc.yaml diff --git a/resources/etherpad/postgres_deployment.yaml b/resources/etherpad/postgres_deployment.yaml index df457ac..2004aff 100644 --- a/resources/etherpad/postgres_deployment.yaml +++ b/resources/etherpad/postgres_deployment.yaml @@ -65,5 +65,5 @@ spec: restartPolicy: Always volumes: - name: postgresql-data - persistentVolumeClaim: - claimName: postgresql + emptyDir: + medium: "" \ No newline at end of file diff --git a/resources/etherpad/postgres_pvc.yaml b/resources/etherpad/postgres_pvc.yaml deleted file mode 100644 index 09f9828..0000000 --- a/resources/etherpad/postgres_pvc.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - template: postgresql-persistent-template - name: postgresql -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi From 078e5d599c580d2413ca731779aaf4b25f28a41b Mon Sep 17 00:00:00 2001 From: Jeff Warnica Date: Tue, 8 Sep 2020 14:10:09 -0300 Subject: [PATCH 4/4] Actually add newline changes --- apps/etherpad/dev-placement-rule.yaml | 2 +- apps/etherpad/namespace.yaml | 2 +- resources/etherpad/etherpad_configmap.yaml | 2 +- resources/etherpad/etherpad_deployment.yaml | 2 +- resources/etherpad/etherpad_route.yaml | 2 +- resources/etherpad/etherpad_service.yaml | 2 +- resources/etherpad/postgres_secret.yaml | 2 +- resources/etherpad/postgres_service.yaml | 2 +- resources/policies/config_placement_rule.yaml | 2 +- resources/policies/iam.yaml | 2 +- resources/policies/namespace.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/etherpad/dev-placement-rule.yaml b/apps/etherpad/dev-placement-rule.yaml index 1d3df01..85158b7 100644 --- a/apps/etherpad/dev-placement-rule.yaml +++ b/apps/etherpad/dev-placement-rule.yaml @@ -9,4 +9,4 @@ spec: status: "True" clusterSelector: matchLabels: - environment: dev \ No newline at end of file + environment: dev diff --git a/apps/etherpad/namespace.yaml b/apps/etherpad/namespace.yaml index 6af254b..dff1937 100644 --- a/apps/etherpad/namespace.yaml +++ b/apps/etherpad/namespace.yaml @@ -2,4 +2,4 @@ apiVersion: v1 kind: Namespace metadata: - name: etherpad \ No newline at end of file + name: etherpad diff --git a/resources/etherpad/etherpad_configmap.yaml b/resources/etherpad/etherpad_configmap.yaml index 19d92c5..291da0a 100644 --- a/resources/etherpad/etherpad_configmap.yaml +++ b/resources/etherpad/etherpad_configmap.yaml @@ -582,4 +582,4 @@ data: ] } // logconfig - } \ No newline at end of file + } diff --git a/resources/etherpad/etherpad_deployment.yaml b/resources/etherpad/etherpad_deployment.yaml index 73b462c..ae3bc5f 100644 --- a/resources/etherpad/etherpad_deployment.yaml +++ b/resources/etherpad/etherpad_deployment.yaml @@ -76,4 +76,4 @@ spec: - configMap: defaultMode: 420 name: etherpad-settings - name: etherpad-settings \ No newline at end of file + name: etherpad-settings diff --git a/resources/etherpad/etherpad_route.yaml b/resources/etherpad/etherpad_route.yaml index 6b74fe4..f5aca00 100644 --- a/resources/etherpad/etherpad_route.yaml +++ b/resources/etherpad/etherpad_route.yaml @@ -11,4 +11,4 @@ spec: to: name: etherpad port: - targetPort: 9001 \ No newline at end of file + targetPort: 9001 diff --git a/resources/etherpad/etherpad_service.yaml b/resources/etherpad/etherpad_service.yaml index c841725..ce6a0bc 100644 --- a/resources/etherpad/etherpad_service.yaml +++ b/resources/etherpad/etherpad_service.yaml @@ -10,4 +10,4 @@ spec: port: 9001 protocol: TCP selector: - app: etherpad \ No newline at end of file + app: etherpad diff --git a/resources/etherpad/postgres_secret.yaml b/resources/etherpad/postgres_secret.yaml index e82065b..6e60753 100644 --- a/resources/etherpad/postgres_secret.yaml +++ b/resources/etherpad/postgres_secret.yaml @@ -11,4 +11,4 @@ metadata: stringData: database-name: etherpad database-password: ether - database-user: ether \ No newline at end of file + database-user: ether diff --git a/resources/etherpad/postgres_service.yaml b/resources/etherpad/postgres_service.yaml index 6d45fc1..5e58e98 100644 --- a/resources/etherpad/postgres_service.yaml +++ b/resources/etherpad/postgres_service.yaml @@ -14,4 +14,4 @@ spec: sessionAffinity: None type: ClusterIP status: - loadBalancer: {} \ No newline at end of file + loadBalancer: {} diff --git a/resources/policies/config_placement_rule.yaml b/resources/policies/config_placement_rule.yaml index c990e60..60fd06f 100644 --- a/resources/policies/config_placement_rule.yaml +++ b/resources/policies/config_placement_rule.yaml @@ -12,4 +12,4 @@ spec: - key: environment operator: In values: - - "dev" \ No newline at end of file + - "dev" diff --git a/resources/policies/iam.yaml b/resources/policies/iam.yaml index 8053cbc..cf80487 100644 --- a/resources/policies/iam.yaml +++ b/resources/policies/iam.yaml @@ -31,4 +31,4 @@ placementRef: subjects: - name: policy-iam kind: Policy - apiGroup: policy.open-cluster-management.io \ No newline at end of file + apiGroup: policy.open-cluster-management.io diff --git a/resources/policies/namespace.yaml b/resources/policies/namespace.yaml index 5ef1cd2..1d5baf0 100644 --- a/resources/policies/namespace.yaml +++ b/resources/policies/namespace.yaml @@ -2,4 +2,4 @@ apiVersion: v1 kind: Namespace metadata: - name: rhacm-policies \ No newline at end of file + name: rhacm-policies