imfreedom/k8s-cluster

fix the misnamed imfreedom.org and wiki.imfreedom.org files

2018-10-30, Gary Kramlich
3146951c5965
Parents ce06ad43488d
Children e3453d7c67bc
fix the misnamed imfreedom.org and wiki.imfreedom.org files
2 files changed, 97 insertions(+), 97 deletions(-)
  • +58 -39
    50-imfreedom.org.yaml
  • +39 -58
    50-wiki.imfreedom.org.yaml
    • --- a/50-imfreedom.org.yaml Tue Oct 30 22:39:23 2018 -0500
    +++ b/50-imfreedom.org.yaml Tue Oct 30 22:41:14 2018 -0500
    @@ -1,67 +1,86 @@
    +apiVersion: extensions/v1beta1
    +kind: Ingress
    +metadata:
    + namespace: imfreedom
    + name: www
    + annotations:
    + certmanager.k8s.io/issuer: letsencrypt
    + labels:
    + app: www
    +spec:
    + rules:
    + - host: imfreedom.org
    + http: &http_rules
    + paths:
    + - backend:
    + serviceName: www
    + servicePort: 80
    + path: /
    + - host: www.imfreedom.org
    + http: *http_rules
    + tls:
    + - hosts:
    + - imfreedom.org
    + - www.imfreedom.org
    + secretName: www-tls
    +---
    apiVersion: v1
    kind: Service
    metadata:
    namespace: imfreedom
    labels:
    - app: wiki
    - role: database
    - name: wiki-database
    + app: www
    + name: www
    spec:
    ports:
    - - port: 3306
    + - port: 80
    protocol: TCP
    selector:
    - app: wiki
    - role: wiki-database
    + app: www
    +---
    +apiVersion: certmanager.k8s.io/v1alpha1
    +kind: Certificate
    +metadata:
    + namespace: imfreedom
    + name: www
    +spec:
    + secretname: www-tls
    + issuerRef:
    + name: letsencrypt
    + commonName: imfreedom.org
    + dnsNames:
    + - imfreedom.org
    + - www.imfreedom.org
    + acme:
    + config:
    + - http01:
    + ingress: www
    + domains:
    + - imfreedom.org
    + - www.imfreedom.org
    ---
    apiVersion: apps/v1
    kind: Deployment
    metadata:
    namespace: imfreedom
    - name: wiki
    + name: www
    labels:
    - app: wiki
    - role: database
    + app: www
    spec:
    replicas: 1
    selector:
    matchLabels:
    - app: wiki
    - role: database
    + app: www
    template:
    metadata:
    labels:
    - app: wiki
    - role: database
    + app: www
    spec:
    containers:
    - - name: mariadb
    - image: mariadb:10
    + - name: www
    + image: imfreedom/www:latest
    imagePullPolicy: Always
    ports:
    - - containerPort: 3306
    - volumeMounts:
    - - mountPath: /var/lib/mysql/
    - name: data
    - readOnly: false
    - volumes:
    - - name: data
    - persistentVolumeClaim:
    - claimName: wiki-data
    ----
    -apiVersion: v1
    -kind: PersistentVolumeClaim
    -metadata:
    - namespace: imfreedom
    - name: wiki-database
    - labels:
    - app: wiki
    - role: database
    -spec:
    - accessModes:
    - - ReadWriteOnce
    - resources:
    - requests:
    - storage: 2Gi
    + - containerPort: 80
    ---
    --- a/50-wiki.imfreedom.org.yaml Tue Oct 30 22:39:23 2018 -0500
    +++ b/50-wiki.imfreedom.org.yaml Tue Oct 30 22:41:14 2018 -0500
    @@ -1,86 +1,67 @@
    -apiVersion: extensions/v1beta1
    -kind: Ingress
    -metadata:
    - namespace: imfreedom
    - name: www
    - annotations:
    - certmanager.k8s.io/issuer: letsencrypt
    - labels:
    - app: www
    -spec:
    - rules:
    - - host: imfreedom.org
    - http: &http_rules
    - paths:
    - - backend:
    - serviceName: www
    - servicePort: 80
    - path: /
    - - host: www.imfreedom.org
    - http: *http_rules
    - tls:
    - - hosts:
    - - imfreedom.org
    - - www.imfreedom.org
    - secretName: www-tls
    ----
    apiVersion: v1
    kind: Service
    metadata:
    namespace: imfreedom
    labels:
    - app: www
    - name: www
    + app: wiki
    + role: database
    + name: wiki-database
    spec:
    ports:
    - - port: 80
    + - port: 3306
    protocol: TCP
    selector:
    - app: www
    ----
    -apiVersion: certmanager.k8s.io/v1alpha1
    -kind: Certificate
    -metadata:
    - namespace: imfreedom
    - name: www
    -spec:
    - secretname: www-tls
    - issuerRef:
    - name: letsencrypt
    - commonName: imfreedom.org
    - dnsNames:
    - - imfreedom.org
    - - www.imfreedom.org
    - acme:
    - config:
    - - http01:
    - ingress: www
    - domains:
    - - imfreedom.org
    - - www.imfreedom.org
    + app: wiki
    + role: wiki-database
    ---
    apiVersion: apps/v1
    kind: Deployment
    metadata:
    namespace: imfreedom
    - name: www
    + name: wiki
    labels:
    - app: www
    + app: wiki
    + role: database
    spec:
    replicas: 1
    selector:
    matchLabels:
    - app: www
    + app: wiki
    + role: database
    template:
    metadata:
    labels:
    - app: www
    + app: wiki
    + role: database
    spec:
    containers:
    - - name: www
    - image: imfreedom/www:latest
    + - name: mariadb
    + image: mariadb:10
    imagePullPolicy: Always
    ports:
    - - containerPort: 80
    + - containerPort: 3306
    + volumeMounts:
    + - mountPath: /var/lib/mysql/
    + name: data
    + readOnly: false
    + volumes:
    + - name: data
    + persistentVolumeClaim:
    + claimName: wiki-data
    +---
    +apiVersion: v1
    +kind: PersistentVolumeClaim
    +metadata:
    + namespace: imfreedom
    + name: wiki-database
    + labels:
    + app: wiki
    + role: database
    +spec:
    + accessModes:
    + - ReadWriteOnce
    + resources:
    + requests:
    + storage: 2Gi
    ---