updating api versions, fixing kustomize

16 files changed, 46 insertions, 71 deletions

diff --git a/grumpy/cgit/Kube-descriptor.yaml b/grumpy/cgit/Kube-descriptor.yaml
deleted file mode 100644
index b3b91d6..0000000
--- a/grumpy/cgit/Kube-descriptor.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: cgit
-version: 0.1.0
diff --git a/grumpy/cgit/cgit-ing.yaml b/grumpy/cgit/cgit-ing.yaml
index 4e72c1b..e331bfc 100644
--- a/grumpy/cgit/cgit-ing.yaml
+++ b/grumpy/cgit/cgit-ing.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
@@ -15,8 +15,11 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: cgit
-          servicePort: 8080
+          service:
+            name: cgit
+            port:
+              number: 8080
+        pathType: Prefix
         path: /
   tls:
   - hosts:
diff --git a/grumpy/cgit/kustomization.yaml b/grumpy/cgit/kustomization.yaml
index affede7..68446b5 100644
--- a/grumpy/cgit/kustomization.yaml
+++ b/grumpy/cgit/kustomization.yaml
@@ -9,9 +9,8 @@ commonLabels:
 # Images modify the tags for images without
 # creating patches.
 images:
-- name: busybox
 - name: registry.gitlab.com/grumps/grumpy-containers/cgit
-  newTag: v0.0.5
+  newTag: latest
 
 # Value of this field is prepended to the
 # names of all resources
@@ -24,4 +23,4 @@ resources:
 - cgit-ing.yaml
 - cgit-sa.yaml
 - cgit-svc.yaml
-- cgit-test-connection-pod.yaml
\ No newline at end of file
+- cgit-test-connection-pod.yaml
diff --git a/grumpy/gitolite/Kube-descriptor.yaml b/grumpy/gitolite/Kube-descriptor.yaml
deleted file mode 100644
index 7db65ca..0000000
--- a/grumpy/gitolite/Kube-descriptor.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-appVersion: 3.6.11
-description: Hosting git repositories -- Gitolite allows you to setup git hosting
-  on a central server, with very fine-grained access control and many (many!) more
-  powerful features.
-home: http://gitolite.com
-maintainers:
-- email: amiga@scheller.es
-  name: amiga23
-name: gitolite
-sources:
-- https://github.com/sitaramc/gitolite
-- https://github.com/jgiannuzzi/docker-gitolite
-version: 0.0.1
diff --git a/grumpy/gitolite/gitolite-gitolite-deploy.yaml b/grumpy/gitolite/gitolite-gitolite-deploy.yaml
index 825f863..ec93c75 100644
--- a/grumpy/gitolite/gitolite-gitolite-deploy.yaml
+++ b/grumpy/gitolite/gitolite-gitolite-deploy.yaml
@@ -25,7 +25,7 @@ spec:
           value: admin
         - name: UMASK
           value: "0027"
-        image: registry.gitlab.com/grumps/grumpy-containers/gitolite:v0.0.4
+        image: registry.gitlab.com/grumps/grumpy-containers/gitolite:latest
         imagePullPolicy: Always
         name: gitolite-gitolite
         ports:
@@ -49,7 +49,8 @@ spec:
         - chmod
         - "755"
         - /var/lib/git
-        image: registry.gitlab.com/grumps/grumpy-containers/gitolite:v0.0.4
+        image: registry.gitlab.com/grumps/grumpy-containers/gitolite:latest
+        imagePullPolicy: Always
         name: setup
         volumeMounts:
         - mountPath: /var/lib/git
diff --git a/grumpy/gitsnapshot/Kube-descriptor.yaml b/grumpy/gitsnapshot/Kube-descriptor.yaml
deleted file mode 100644
index 4b429df..0000000
--- a/grumpy/gitsnapshot/Kube-descriptor.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: 0.0.1
-description: A Helm chart for Kubernetes
-name: gitsnapshot
-version: 0.2.0
diff --git a/grumpy/gitsnapshot/gitsnapshot-cronjob.yaml b/grumpy/gitsnapshot/gitsnapshot-cronjob.yaml
index 2554f8a..5dbe5ee 100644
--- a/grumpy/gitsnapshot/gitsnapshot-cronjob.yaml
+++ b/grumpy/gitsnapshot/gitsnapshot-cronjob.yaml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: gitsnapshot
@@ -48,7 +48,3 @@ spec:
             persistentVolumeClaim:
               claimName: gitolite-storage
   schedule: '*/60 * * * *'
-  selector:
-    matchLabels:
-      app.kubernetes.io/instance: gitsnapshot
-      app.kubernetes.io/name: gitsnapshot
diff --git a/grumpy/gitsnapshot/kustomization.yaml b/grumpy/gitsnapshot/kustomization.yaml
index 83cfe40..8ed81eb 100644
--- a/grumpy/gitsnapshot/kustomization.yaml
+++ b/grumpy/gitsnapshot/kustomization.yaml
@@ -1,17 +1,15 @@
 # Labels to add to all resources and selectors.
 commonLabels:
   app.kubernetes.io/instance: gitsnapshot
-  app.kubernetes.io/managed-by: Tiller
   app.kubernetes.io/name: gitsnapshot
   app.kubernetes.io/version: 0.0.1
-  helm.sh/chart: gitsnapshot-0.2.0
 
 # Images modify the tags for images without
 # creating patches.
 images:
 - name: busybox
 - name: registry.gitlab.com/grumps/grumpy-containers/git-snapshot
-  newTag: v0.0.4
+  newTag: latest
 
 # Value of this field is prepended to the
 # names of all resources
@@ -21,10 +19,9 @@ namePrefix: gitsnapshot
 # and emits as a YAML string
 resources:
 - gitsnapshot-cronjob.yaml
-- gitsnapshot-test-connection-pod.yaml
 
 # Each entry in this list results in the creation of
 # one Secret resource (it's a generator of n secrets).
 secretGenerator:
 - name: aws-s3-secret
-  type: Opaque
\ No newline at end of file
+  type: Opaque
diff --git a/grumpy/sally/deploy.yaml b/grumpy/sally/deploy.yaml
index 33428e6..8368603 100644
--- a/grumpy/sally/deploy.yaml
+++ b/grumpy/sally/deploy.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
       - name: sally
-        image: registry.gitlab.com/grumps/grumpy-containers/sally:v0.2.0
+        image: registry.gitlab.com/grumps/grumpy-containers/sally:latest
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
diff --git a/grumpy/sally/ingress.yaml b/grumpy/sally/ingress.yaml
index 14dbd92..a487f12 100644
--- a/grumpy/sally/ingress.yaml
+++ b/grumpy/sally/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1  
 kind: Ingress
 metadata:
   annotations:
@@ -16,8 +16,11 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: sally-service
-          servicePort: 8080
+          service:
+            name: sally-service
+            port:
+              number: 8080
+        pathType: Prefix
         path: /
   tls:
   - hosts:
diff --git a/grumpy/static-files/Kube-descriptor.yaml b/grumpy/static-files/Kube-descriptor.yaml
deleted file mode 100644
index 9813f55..0000000
--- a/grumpy/static-files/Kube-descriptor.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-appVersion: "1.0"
-description: A Helm chart for Kubernetes
-name: static-files
-version: 0.1.0
diff --git a/grumpy/static-files/kustomization.yaml b/grumpy/static-files/base/kustomization.yaml
index 10f862e..6d1eee5 100644
--- a/grumpy/static-files/kustomization.yaml
+++ b/grumpy/static-files/base/kustomization.yaml
@@ -1,16 +1,15 @@
 # Labels to add to all resources and selectors.
 commonLabels:
   app.kubernetes.io/instance: static-files
-  app.kubernetes.io/managed-by: Tiller
   app.kubernetes.io/name: static-files
   app.kubernetes.io/version: "1.0"
-  helm.sh/chart: static-files-0.1.0
 
 # Images modify the tags for images without
 # creating patches.
 images:
-- {}
-- name: busybox
+- name: static-files
+  newName: registry.gitlab.com/grumps/ofmax/prod
+  newTag: latest
 
 # Value of this field is prepended to the
 # names of all resources
@@ -22,4 +21,5 @@ resources:
 - static-files-deploy.yaml
 - static-files-ing.yaml
 - static-files-svc.yaml
-- static-files-test-connection-pod.yaml
\ No newline at end of file
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
diff --git a/grumpy/static-files/static-files-deploy.yaml b/grumpy/static-files/base/static-files-deploy.yaml
index f4d4170..f89e7d7 100644
--- a/grumpy/static-files/static-files-deploy.yaml
+++ b/grumpy/static-files/base/static-files-deploy.yaml
@@ -15,7 +15,7 @@ spec:
         app.kubernetes.io/name: static-files
     spec:
       containers:
-      - image: ':'
+      - image: static-files
         livenessProbe:
           httpGet:
             path: /
diff --git a/grumpy/static-files/static-files-ing.yaml b/grumpy/static-files/base/static-files-ing.yaml
index 7d36d00..f0f05eb 100644
--- a/grumpy/static-files/static-files-ing.yaml
+++ b/grumpy/static-files/base/static-files-ing.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
@@ -8,4 +8,21 @@ metadata:
     traefik.ingress.kubernetes.io/frontend-entry-points: http,https
     traefik.ingress.kubernetes.io/redirect-entry-point: https
     traefik.ingress.kubernetes.io/redirect-permanent: "true"
-  name: static-files
+  name: blog
+spec:
+  rules:
+  - host: ofmax.li
+    http:
+      paths:
+      - backend:
+          service:
+            name: blog
+            port:
+              number: 8080
+        pathType: Prefix
+        path: /
+  tls:
+  - hosts:
+    - www.ofmax.li
+    - ofmax.li
+    secretName: ofmax-li-sec
diff --git a/grumpy/static-files/static-files-svc.yaml b/grumpy/static-files/base/static-files-svc.yaml
index 8096a60..8096a60 100644
--- a/grumpy/static-files/static-files-svc.yaml
+++ b/grumpy/static-files/base/static-files-svc.yaml
diff --git a/grumpy/static-files/static-files-test-connection-pod.yaml b/grumpy/static-files/static-files-test-connection-pod.yaml
deleted file mode 100644
index e4dc688..0000000
--- a/grumpy/static-files/static-files-test-connection-pod.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: static-files-test-connection
-spec:
-  containers:
-  - args:
-    - static-files:8080
-    command:
-    - wget
-    image: busybox
-    name: wget
-  restartPolicy: Never