Verify a GPG signature on the release image digest from a root of trust within the payload

Gopkg.toml

@@ -16,8 +16,9 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types" ]
   unused-packages = false
 
 [[constraint]]
-  branch = "master"
   name = "github.com/golang/glog"
+  revision = "3c92600d7533018d216b534fe894ad60a1e6d5bf"
+  source = "https://github.com/openshift/golang-glog.git"
 
 [[constraint]]
   name = "github.com/google/uuid"
@@ -64,8 +65,7 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types" ]
 
 [[constraint]]
   name = "github.com/openshift/api"
-  # this revision has both Failing and Degraded. The next bump will remove the depracted Failing
-  revision = "8e476cb7322e59919cbb6482fd076ec5a214df25"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/openshift/client-go"

bootstrap/bootstrap-pod.yaml

@@ -18,6 +18,7 @@ spec:
       - "--kubeconfig=/etc/kubernetes/kubeconfig"
     securityContext:
       privileged: true
+    terminationMessagePolicy: FallbackToLogsOnError
     volumeMounts:
       - mountPath: /etc/ssl/certs
         name: etc-ssl-certs

cmd/image.go

@@ -1,11 +1,10 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"k8s.io/klog"
 
 	"github.com/openshift/cluster-version-operator/pkg/payload"
 )
@@ -25,15 +24,12 @@ func init() {
 }
 
 func runImageCmd(cmd *cobra.Command, args []string) {
-	flag.Set("logtostderr", "true")
-	flag.Parse()
-
 	if len(args) == 0 {
-		glog.Fatalf("missing command line argument short-name")
+		klog.Fatalf("missing command line argument short-name")
 	}
 	image, err := payload.ImageForShortName(args[0])
 	if err != nil {
-		glog.Fatalf("error: %v", err)
+		klog.Fatalf("error: %v", err)
 	}
 	fmt.Printf(image)
 }

cmd/main.go

@@ -3,8 +3,8 @@ package main
 import (
 	"flag"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"k8s.io/klog"
 )
 
 const (
@@ -21,11 +21,14 @@ var (
 )
 
 func init() {
+	klog.InitFlags(flag.CommandLine)
+	flag.CommandLine.Set("alsologtostderr", "true")
 	rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
 }
 
 func main() {
+	defer klog.Flush()
 	if err := rootCmd.Execute(); err != nil {
-		glog.Exitf("Error executing mcc: %v", err)
+		klog.Exitf("Error executing mcc: %v", err)
 	}
 }

cmd/render.go

@@ -3,8 +3,8 @@ package main
 import (
 	"flag"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"k8s.io/klog"
 
 	"github.com/openshift/cluster-version-operator/pkg/payload"
 )
@@ -34,12 +34,12 @@ func runRenderCmd(cmd *cobra.Command, args []string) {
 	flag.Parse()
 
 	if renderOpts.outputDir == "" {
-		glog.Fatalf("missing --output-dir flag, it is required")
+		klog.Fatalf("missing --output-dir flag, it is required")
 	}
 	if renderOpts.releaseImage == "" {
-		glog.Fatalf("missing --release-image flag, it is required")
+		klog.Fatalf("missing --release-image flag, it is required")
 	}
 	if err := payload.Render(renderOpts.outputDir, renderOpts.releaseImage); err != nil {
-		glog.Fatalf("Render command failed: %v", err)
+		klog.Fatalf("Render command failed: %v", err)
 	}
 }