Merge branch 'chore/update_gitea' of kosmos/gitea.kosmos.org into master

https://blog.gitea.io/2020/02/gitea-1.11.0-is-released/

README.md

@@ -6,21 +6,4 @@ issues](https://gitea.kosmos.org/kosmos/gitea.kosmos.org/issues) for questions,
 suggestions, bugs, to-do items, and whatever else you want to discuss or
 resolve.
 
-## Building & deploying
+See `doc/` folder for some technical info.
-
-To create a new image containing the customizations:
-
-Edit `packer/custom.json` to increment the tag, then run this script (needs
-[Packer](https://www.packer.io/) in your path)
-
-
-    ./script/build_customizations_image
-
-
-Then edit `kubernetes/gitea-server.yaml` to use the new tag
-(`image: eu.gcr.io/fluted-magpie-218106/gitea_custom:$VERSION`) and apply the
-change:
-
-
-    cd kubernetes
-    kubectl apply -f gitea-server.yaml

doc/customizations-image.md

@@ -0,0 +1,20 @@
+## Customizations image
+
+### Build
+
+To create a new Docker image containing our Gitea customizations (label sets,
+styles, page content, etc.):
+
+Edit `packer/custom.json` to increment the tag, then run this script (needs
+[Packer](https://www.packer.io/) in your path)
+
+    ./script/build_customizations_image
+
+### Deploy
+
+Edit `kubernetes/gitea-server.yaml` to use the new tag
+(`image: eu.gcr.io/fluted-magpie-218106/gitea_custom:$VERSION`) and apply the
+change:
+
+    cd kubernetes
+    kubectl apply -f gitea-server.yaml

kubernetes/gitea-server.yaml

@@ -32,7 +32,7 @@ spec:
             name: config
       containers:
       - name: gitea-server
-        image: gitea/gitea:1.9.0
+        image: gitea/gitea:1.11.2
         ports:
         - containerPort: 3000
         - containerPort: 3001
@@ -42,10 +42,10 @@ spec:
           name: gitea-server-data
         resources:
           requests:
-            cpu: 250m
+            cpu: 150m
             memory: 256Mi
           limits:
-            cpu: 500m
+            cpu: 250m
             memory: 512Mi
       restartPolicy: Always
       volumes: