SYS-596 issue #107 libusb driver for nut-upsd, plus rename of registr…

…y.k8s.io
instantlinux · Mar 25, 2023 · cb7275f · cb7275f
1 parent 140c9c0
commit cb7275f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 29 deletions.
diff --git a/images/git-dump/Dockerfile b/images/git-dump/Dockerfile
@@ -18,7 +18,7 @@ ENV API_TOKEN_SECRET= \
     USERNAME=git-dump \
     TZ=UTC
 
-ARG GIT_VERSION=2.38.4-r0
+ARG GIT_VERSION=2.38.4-r1
 ARG GROUP=care
 ARG GID=505
 ARG UID=212

diff --git a/images/git-dump/helm/Chart.yaml b/images/git-dump/helm/Chart.yaml
@@ -5,8 +5,8 @@ home: https://github.com/instantlinux/docker-tools
 sources:
 - https://github.com/instantlinux/docker-tools
 type: application
-version: 0.1.9
-appVersion: "2.38.4-r0"
+version: 0.1.10
+appVersion: "2.38.4-r1"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/images/git-pull/Dockerfile b/images/git-pull/Dockerfile
@@ -8,7 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
-ARG GIT_VERSION=2.38.4-r0
+ARG GIT_VERSION=2.38.4-r1
 ENV DEST=. \
     GIT_COMMIT=master \
     GIT_HOST=github.com \

diff --git a/images/git-pull/helm/Chart.yaml b/images/git-pull/helm/Chart.yaml
@@ -5,8 +5,8 @@ home: https://github.com/instantlinux/docker-tools
 sources:
 - https://github.com/instantlinux/docker-tools
 type: application
-version: 0.1.7
-appVersion: "2.38.4-r0"
+version: 0.1.8
+appVersion: "2.38.4-r1"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/images/nut-upsd/Dockerfile b/images/nut-upsd/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.17
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -24,10 +24,8 @@ ENV API_USER=upsmon \
     VENDORID=
 HEALTHCHECK CMD upsc ups@localhost:3493 2>&1|grep -q stale && exit 1 || true
 
-RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' \
-      >>/etc/apk/repositories && \
-    apk add --update nut@edge=$NUT_VERSION \
-      libcrypto1.1 libssl1.1 musl net-snmp-libs
+RUN apk add --update nut=$NUT_VERSION \
+      libcrypto1.1 libssl1.1 libusb musl net-snmp-libs
 
 EXPOSE 3493
 COPY entrypoint.sh /usr/local/bin/

diff --git a/k8s/helm/nextcloud/values.yaml b/k8s/helm/nextcloud/values.yaml
@@ -59,26 +59,15 @@ volumeMounts:
 - mountPath: /var/www/html
   name: synced
   subPath: html
+- mountPath: /var/www/html/data/nextcloud.log
+  name: synced
+  subPath: html/data/nextcloud.log
 - name: config
   mountPath: /var/www/html/config/config.php.k8s
   subPath: config.php
-- mountPath: /pictures
-  name: pictures
-# TODO: figure out a better way to handle NextCloud's upside-
-#  down naming hierarchy. If your photo collection has the year
-#  at a high level of the hierarchy, there's a conflict.
-- mountPath: /var/www/html/data/admin/files/Photos/2021
-  name: pictures
-  subPath: DigitalPics/2021/admin-nextcloud
-- mountPath: /var/www/html/data/admin/files/Photos/2022
-  name: pictures
-  subPath: DigitalPics/2022/admin-nextcloud
-- mountPath: /var/www/html/data/user/files/Photos/2021
-  name: pictures
-  subPath: DigitalPics/2021/user-nextcloud
-- mountPath: /var/www/html/data/user/files/Photos/2022
+- mountPath: /var/www/html/data
   name: pictures
-  subPath: DigitalPics/2022/user-nextcloud
+  subPath: nextcloud
 volumes:
 - name: config
   configMap:

diff --git a/k8s/install/ingress-nginx.yaml b/k8s/install/ingress-nginx.yaml
@@ -55,7 +55,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
       # - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:$VERSION_INGRESS_NGINX
-      - image: k8s.gcr.io/ingress-nginx/controller:v$VERSION_INGRESS_NGINX
+      - image: registry.k8s.io/ingress-nginx/controller:v$VERSION_INGRESS_NGINX
         name: nginx-ingress-controller
         ports:
         - containerPort: 80

diff --git a/k8s/install/k8s-backup.yaml b/k8s/install/k8s-backup.yaml
@@ -14,7 +14,7 @@ spec:
           containers:
           - name: backup
             # Same image as in /etc/kubernetes/manifests/etcd.yaml
-            image: k8s.gcr.io/etcd:3.5.4-0
+            image: registry.k8s.io/etcd:3.5.4-0
             command: ["/bin/sh"]
             args: ["-c", "etcdctl --endpoints=https://127.0.0.1:2379 --cacert=/etc/kubernetes/pki/etcd/ca.crt --cert=/etc/kubernetes/pki/etcd/healthcheck-client.crt --key=/etc/kubernetes/pki/etcd/healthcheck-client.key snapshot save /backup/etcd-snapshot-$(printf '%(%y-%m-%d_%T)T').db"]
             env: