Hello community, here is the log from the commit of package hello-kubic for openSUSE:Factory checked in at 2019-09-20 14:38:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hello-kubic (Old) and /work/SRC/openSUSE:Factory/.hello-kubic.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hello-kubic" Fri Sep 20 14:38:53 2019 rev:2 rq:729420 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/hello-kubic/hello-kubic.changes 2019-08-22 10:56:19.557668051 +0200 +++ /work/SRC/openSUSE:Factory/.hello-kubic.new.7948/hello-kubic.changes 2019-09-20 14:38:55.303051569 +0200 @@ -1,0 +2,6 @@ +Mon Sep 9 13:05:41 CEST 2019 - [email protected] + +- Update to version 1.1 + - print additional architecture information + +------------------------------------------------------------------- Old: ---- hello-kubic-1.0.tar.xz New: ---- hello-kubic-1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hello-kubic.spec ++++++ --- /var/tmp/diff_new_pack.MHpLQL/_old 2019-09-20 14:38:55.971051446 +0200 +++ /var/tmp/diff_new_pack.MHpLQL/_new 2019-09-20 14:38:55.971051446 +0200 @@ -1,7 +1,7 @@ # # spec file for package hello-kubic # -# Copyright (c) 2017, 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,11 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: hello-kubic -Version: 1.0 +Version: 1.1 Release: 0 Summary: A mini webserver showing a hello kubic page License: Apache-2.0 ++++++ hello-kubic-1.0.tar.xz -> hello-kubic-1.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hello-kubic-1.0/README.md new/hello-kubic-1.1/README.md --- old/hello-kubic-1.0/README.md 2019-08-21 17:21:26.064975468 +0200 +++ new/hello-kubic-1.1/README.md 2019-09-09 13:04:06.288068136 +0200 @@ -2,3 +2,5 @@ Hello World POD for openSUSE Kubic  + +To deploy: ``https://raw.githubusercontent.com/thkukuk/hello-kubic/master/yaml/hello-kubic.yaml`` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hello-kubic-1.0/VERSION new/hello-kubic-1.1/VERSION --- old/hello-kubic-1.0/VERSION 2019-08-21 17:21:26.064975468 +0200 +++ new/hello-kubic-1.1/VERSION 2019-09-09 13:04:06.288068136 +0200 @@ -1 +1 @@ -1.0 +1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hello-kubic-1.0/cmd/hello-kubic/main.go new/hello-kubic-1.1/cmd/hello-kubic/main.go --- old/hello-kubic-1.0/cmd/hello-kubic/main.go 2019-08-21 17:21:26.064975468 +0200 +++ new/hello-kubic-1.1/cmd/hello-kubic/main.go 2019-09-09 13:04:06.288068136 +0200 @@ -23,6 +23,7 @@ "os/exec" "text/template" "time" + "strings" ) var ( @@ -62,10 +63,11 @@ type TemplateArgs struct { Message string - Hostname string + Hostname string Platform string + Arch string Release string - Time string + Time string NodeName string PodName string PodNamespace string @@ -79,7 +81,7 @@ cmd.Stdout = &out err := cmd.Run() if err == nil { - return out.String() + return strings.TrimSpace(out.String()) } return "" } @@ -90,15 +92,16 @@ http.Error(w, "Can't get hostname", 500) } indexTemplate.Execute(w, TemplateArgs{ - Message: message, - Hostname: hostname, - Platform: getUname("-s"), - Release: getUname("-r"), - Time: time.Now().Format("15:04:05"), - NodeName: os.Getenv("NODE_NAME"), - PodName: os.Getenv("POD_NAME"), - PodNamespace: os.Getenv("POD_NAMESPACE"), - PodIP: os.Getenv("POD_IP"), + Message: message, + Hostname: hostname, + Platform: getUname("-s"), + Arch: getUname("-m"), + Release: getUname("-r"), + Time: time.Now().Format("15:04:05"), + NodeName: os.Getenv("NODE_NAME"), + PodName: os.Getenv("POD_NAME"), + PodNamespace: os.Getenv("POD_NAMESPACE"), + PodIP: os.Getenv("POD_IP"), PodServiceAccount: os.Getenv("POD_SERVICE_ACCOUNT"), }) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hello-kubic-1.0/webpage/index.template new/hello-kubic-1.1/webpage/index.template --- old/hello-kubic-1.0/webpage/index.template 2019-08-21 17:21:26.064975468 +0200 +++ new/hello-kubic-1.1/webpage/index.template 2019-09-09 13:04:06.288068136 +0200 @@ -32,6 +32,12 @@ <th>Node:</th> <td>{{.Platform}} ({{.Release}})</td> </tr> + {{if .Arch}} + <tr> + <th>Architecture:</th> + <td>{{.Arch}}</td> + </tr> + {{end}} <tr> <th>Time:</th> <td>{{.Time}}</td> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hello-kubic-1.0/yaml/hello-kubic.yaml new/hello-kubic-1.1/yaml/hello-kubic.yaml --- old/hello-kubic-1.0/yaml/hello-kubic.yaml 2019-08-21 17:21:26.064975468 +0200 +++ new/hello-kubic-1.1/yaml/hello-kubic.yaml 2019-09-09 13:04:06.288068136 +0200 @@ -30,6 +30,7 @@ image: registry.opensuse.org/home/kukuk/container/container/kubic/hello-kubic:latest ports: - containerPort: 8080 + imagePullPolicy: Always env: # - name: MESSAGE # value: I haven't specified a message yet
