Reordenando el material

helloworld/helloworld.yaml → 1.helloworld/helloworld.yaml

@@ -7,6 +7,7 @@ metadata:
 spec:
   containers:
     - name: demo
-      image: eu.gcr.io/ramina/web:last
+      image: eu.gcr.io/decem-242714/apache-basic:v.0.1
       ports:
-        - containerPort: 80
+        - containerPort: 80
\ No newline at end of file
+        
\ No newline at end of file

app-final/app-config.yaml → 11.app-final/app-config.yaml

 apiVersion: v1
 data:
   RAILS_MAX_THREADS: "5"
-  MYSQL_DATABASE: railsapp_developemnt
-  MYSQL_HOST: mysql.poweredi.svc.cluster.local
+  MYSQL_DATABASE: appfinal_developemnt
+  MYSQL_HOST: mysql-rails.default.svc.cluster.local
   RAILS_ENV: development
 kind: ConfigMap
 metadata:

app-final/app-storage.yaml → 11.app-final/app-storage.yaml

@@ -3,7 +3,7 @@ kind: PersistentVolume
 metadata:
   name: rails-storage
   labels:
-    app: rails-app
+    app: app-final
     component: active-storage
 spec:
   capacity:
@@ -19,7 +19,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: rails-activestorage-claim
   labels:
-    app: rails-app
+    app: app-final
 spec:
   accessModes:
     - ReadWriteOnce
@@ -29,5 +29,5 @@ spec:
       storage: 10Gi
   selector:
     matchLabels:
-      app: rails-app
+      app: app-final
       component: active-storage
\ No newline at end of file

app-final/app.yaml → 11.app-final/app.yaml

 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: rails-app-deployment
+  name: app-final-deployment
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        app: rails-app
+        app: app-final
     spec:
       initContainers:
        - name: setup-database
-         image: eu.gcr.io/wdps-prj-terraform-e8b60c97/cool-app:v.0.4
+         image: eu.gcr.io/decem-242714/app-final:v.0.1
          command: ["rails","db:create"]
          envFrom:
             - configMapRef:
@@ -28,7 +28,7 @@ spec:
                   name: mysql-rails-secret
                   key: password
        - name: schema-migration
-         image: eu.gcr.io/wdps-prj-terraform-e8b60c97/cool-app:v.0.4
+         image: eu.gcr.io/decem-242714/app-final:v.0.1
          command: ["rails","db:migrate"]
          envFrom:
             - configMapRef:
@@ -46,7 +46,7 @@ spec:
                   key: password
       containers:
        - name: demo
-         image: eu.gcr.io/wdps-prj-terraform-e8b60c97/cool-app:v.0.4
+         image: eu.gcr.io/decem-242714/app-final:v.0.1
          command: ["foreman","start","-f","Procfile.dev"]
          envFrom:
             - configMapRef:
@@ -91,11 +91,11 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: rails-app-service
+  name: app-final-service
 spec:
   type: LoadBalancer
   selector:
-    app: rails-app
+    app: app-final
   ports:
   - protocol: TCP
     port: 80

app-final/mysql-storage.yaml → 11.app-final/mysql-storage.yaml

@@ -3,7 +3,7 @@ kind: PersistentVolume
 metadata:
   name: rails-database
   labels:
-    app: rails-app
+    app: app-final
     component: database
 spec:
   capacity:
@@ -19,7 +19,7 @@ kind: PersistentVolumeClaim
 metadata:
   name: rails-db-claim
   labels:
-    app: rails-app
+    app: app-final
 spec:
   accessModes:
     - ReadWriteOnce
@@ -29,5 +29,5 @@ spec:
       storage: 10Gi
   selector: 
     matchLabels: 
-      app: rails-app
+      app: app-final
       component: database
\ No newline at end of file

app-final/mysql.yaml → 11.app-final/mysql.yaml

@@ -61,7 +61,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: mysql
+  name: mysql-rails
   labels:
     app: database
 spec:

12.ingress/ingress.yaml

+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: ingress-frontend
+  annotations:
+    nginx.ingress.kubernetes.io/auth-type: basic
+    nginx.ingress.kubernetes.io/auth-secret: basic-auth
+    nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - Service'
+    kubernetes.io/ingress.class: "nginx"
+spec:
+  tls:
+  - hosts:
+    - edu.wedoops.io
+    secretName: edu-wedoops-tls-cert
+  rules:
+  - host: coolapp.edu.wedoops.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: cool-app
+          servicePort: 80
+  - host: apache.edu.wedoops.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: first-app-service
+          servicePort: 80
+  - host: node.edu.wedoops.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: awesome-service
+          servicePort: 80
+  - host: sinatra.edu.wedoops.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: sinatra
+          servicePort: 80
+  - host: final.edu.wedoops.io
+    http:
+      paths:
+      - path: /
+        backend:
+          serviceName: app-final-service
+          servicePort: 80
\ No newline at end of file

12.ingress/secret.yaml

+apiVersion: v1
+data:
+  auth: RWwuY3Vyc28uZGUuRGVjZW0uaGEuZXN0YWRvLmdlbmlhbA==
+kind: Secret
+metadata:
+  name: basic-auth
+type: Opaque
\ No newline at end of file

first-app/first-app.yaml → 2.first-app/first-app.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
     - name: demo
-      image: eu.gcr.io/wdps-prj-terraform-e8b60c97/node:latest
+      image: eu.gcr.io/decem-242714/node:v.0.1
       ports:
         - containerPort: 3000
           name: nodejs-port
\ No newline at end of file

first-app/first-app-deployment.yaml → 3.deployemnts/first-app-deployment.yaml

@@ -7,11 +7,11 @@ spec:
   template:
     metadata:
       labels:
-        app: firstapp
+        app: firstdeploy
     spec:
       containers:
        - name: demo
-         image: eu.gcr.io/wdps-prj-terraform-e8b60c97/node:latest
+         image: eu.gcr.io/decem-242714/node-host:v.0.1
          ports:
            - containerPort: 3000
-             name: nodejs-port  
+             name: nodejs-port  
\ No newline at end of file

3.deployemnts/first-app-service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: first-deploy-service
+spec:
+  type: LoadBalancer
+  selector:
+    app: firstdeploy
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: nodejs-port
\ No newline at end of file

healthchecks/liveness-probe-app.yaml → 5.healthchecks/liveness-probe-app.yaml

@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
        - name: demo
-         image: eu.gcr.io/wdps-prj-terraform-e8b60c97/node:latest
+         image: eu.gcr.io/decem-242714/node-host:v.0.1
          ports:
            - containerPort: 3000
              name: nodejs-port  

healthchecks/readiness-probe-app.yaml → 5.healthchecks/readiness-probe-app.yaml

@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
        - name: demo
-         image: eu.gcr.io/wdps-prj-terraform-e8b60c97/node:latest
+         image: eu.gcr.io/decem-242714/node-host:v.0.1
          ports:
            - containerPort: 3000
              name: nodejs-port  
@@ -19,7 +19,7 @@ spec:
              httpGet:
                path: /
                port: 3000
-             initialDelaySeconds: 15
+             initialDelaySeconds: 35
              timeoutSeconds: 30
          readinessProbe:
              httpGet:

app-secrets/cool-app.yaml → 6.secrets/cool-app.yaml

@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
        - name: demo
-         image: eu.gcr.io/wdps-prj-terraform-e8b60c97/cool-app:latest
+         image: eu.gcr.io/decem-242714/cool-app:v.0.1
          ports:
            - containerPort: 3000
              name: rails-port  

volumes/webserver.yaml → 7.volumes/webserver.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
     - name: demo
-      image: eu.gcr.io/wdps-prj-terraform-e8b60c97/web-empty:v1
+      image: eu.gcr.io/decem-242714/apache-empty:v.0.1
       ports:
         - containerPort: 80
       volumeMounts:

volume-provisioning/webserver-claim.yaml → 8.volume-provisioning/webserver-claim.yaml

@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
     - name: demo
-      image: eu.gcr.io/wdps-prj-terraform-e8b60c97/web-empty:v1
+      image: eu.gcr.io/decem-242714/apache-empty:v.0.1
       ports:
         - containerPort: 80
       volumeMounts:

9.configmaps/app-configure.yaml

+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: sinatra-app
+  labels:
+    app: sinatra
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: sinatra
+    spec:
+      containers:
+       - name: demo
+         image: eu.gcr.io/decem-242714/sinatra:v.0.2
+         ports:
+            - containerPort: 4567
+         envFrom:
+            - configMapRef:
+                name: backend-config
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: sinatra
+spec:
+  type: LoadBalancer
+  selector:
+    app: sinatra
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: 4567
\ No newline at end of file

configmaps/configmap.yaml → 9.configmaps/configmap.yaml

 apiVersion: v1
 kind: ConfigMap
+metadata:
+  name: backend-config
 data:
   REDIS_URL: "redis://redis:6379/0"
   CELERY_BROKER_URL: "redis://redis:6379/0"
@@ -25,5 +27,4 @@ data:
   DJANGO_AWS_ACCESS_KEY_ID: "AOURHFEO3OINAFO34FF"
   DJANGO_AWS_SECRET_ACCESS_KEY: "W/0+3sdndfbceERDNSasdaeDADAa00sae"
   DJANGO_AWS_STORAGE_BUCKET_NAME: "django-static-bucket"
-metadata:
-  name: backend-config
+

9.configmaps/sinatra/Dockerfile

+FROM ruby:2.5.3
+
+WORKDIR /app
+ADD Gemfile /app/Gemfile
+ADD Gemfile.lock /app/Gemfile.lock
+RUN bundle install --system
+
+ADD . /app
+RUN bundle install --system
+
+EXPOSE 4567
+
+CMD ["ruby", "main.rb"]
\ No newline at end of file

9.configmaps/sinatra/Gemfile

+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+
+gem 'sinatra', '~> 2.0.5'
\ No newline at end of file

9.configmaps/sinatra/Gemfile.lock

+GEM
+  remote: https://rubygems.org/
+  specs:
+    mustermann (1.0.3)
+    rack (2.0.7)
+    rack-protection (2.0.5)
+      rack
+    sinatra (2.0.5)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.5)
+      tilt (~> 2.0)
+    tilt (2.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sinatra (~> 2.0.5)
+
+BUNDLED WITH
+   1.15.4

9.configmaps/sinatra/main.rb

+require 'sinatra/base'
+
+require 'pp'
+
+class MiApp < Sinatra::Base
+
+		get '/' do
+			body get_vars
+		end
+
+private 
+	
+		def get_vars
+			[ "USER",
+        "REDIS_URL",
+  			"CELERY_BROKER_URL",
+  			"CELERY_FLOWER_USER",
+  			"CELERY_FLOWER_PASSWORD",
+  			"FLOWER_PORT",
+  			"DATABASE_URL",
+  			"DJANGO_SETTINGS_MODULE",
+  			"DJANGO_SECRET_KEY",
+  			"DJANGO_ADMIN_URL",
+  			"DJANGO_ALLOWED_HOSTS",
+  			"DJANGO_DEFAULT_FROM_EMAIL",
+  			"DJANGO_SECURE_SSL_REDIRECT",
+  			"DJANGO_SESSION_COOKIE_SECURE",
+  			"DJANGO_CSRF_COOKIE_SECURE",
+  			"RECAPTCHA_SECRET_KEY",
+  			"RECAPTCHA_VERIFY_ENDPOINT",
+  			"POSTGRES_HOST",
+  			"POSTGRES_PORT",
+  			"POSTGRES_DB",
+  			"POSTGRES_USER",
+  			"POSTGRES_PASSWORD",
+  			"DJANGO_AWS_ACCESS_KEY_ID",
+  			"DJANGO_AWS_SECRET_ACCESS_KEY",
+  			"DJANGO_AWS_STORAGE_BUCKET_NAME"].map{|var| "#{var}:#{ENV[var]}"}.join("<br />")
+		end
+end
+MiApp.set :logging, true
+MiApp.set :bind, '0.0.0.0'
+MiApp.run!
\ No newline at end of file

configmaps/app-configure.yaml

-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: myapp
-  labels:
-    app: cool-app
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: cool-app
-    spec:
-      containers:
-        - name: cool-app
-          image: eu.gcr.io/project/container:v.0.1
-          command: ["/start-app"]
-          ports:
-            - containerPort: 3453
-          envFrom:
-            - configMapRef:
-                name: backend-config