Bug 2091218: Update helm to 3.9.0

This also brings forward devfile/registry-support/registry-library
so the new oras v1.1.0 works for both helm and devfile

Signed-off-by: David Peraza <[email protected]>

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
  name: release
  namespace: openshift
- tag: tectonic-console-builder-v23
+ tag: tectonic-console-builder-v24

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/coreos/tectonic-console-builder:v23 AS build
+FROM quay.io/coreos/tectonic-console-builder:v24 AS build
 
 RUN mkdir -p /go/src/github.com/openshift/console/
 ADD . /go/src/github.com/openshift/console/

Dockerfile.builder

@@ -8,13 +8,12 @@
 # You can test the image using `./builder-run.sh`. For instance:
 # $ ./builder-run.sh ./build-backend.sh
 
-FROM golang:1.16-stretch
+FROM golang:1.18-stretch
 
 MAINTAINER Ed Rooth - CoreOS
 
 ### For golang testing stuff
-RUN go get -u golang.org/x/lint/golint
-RUN go get github.com/jstemmer/go-junit-report
+RUN go install github.com/jstemmer/go-junit-report@latest
 
 ### Install NodeJS and yarn
 ENV NODE_VERSION="v14.16.0"

Dockerfile.dev

@@ -1,6 +1,6 @@
 # Dockerfile to build console image from pre-built front end.
 
-FROM quay.io/coreos/tectonic-console-builder:v23 AS build
+FROM quay.io/coreos/tectonic-console-builder:v24 AS build
 RUN mkdir -p /go/src/github.com/openshift/console/
 ADD . /go/src/github.com/openshift/console/
 WORKDIR /go/src/github.com/openshift/console/

Dockerfile.plugins.demo

@@ -3,7 +3,7 @@
 # See dynamic-demo-plugin/README.md for details.
 
 # Stage 0: build the demo plugin
-FROM quay.io/coreos/tectonic-console-builder:v23 AS build
+FROM quay.io/coreos/tectonic-console-builder:v24 AS build
 
 RUN mkdir -p /src/console
 COPY . /src/console

README.md

@@ -16,7 +16,7 @@ The console is a more friendly `kubectl` in the form of a single page webapp. It
 ### Dependencies:
 
 1. [node.js](https://nodejs.org/) >= 14 & [yarn](https://yarnpkg.com/en/docs/install) >= 1.20
-2. [go](https://golang.org/) >= 1.16+
+2. [go](https://golang.org/) >= 1.18+
 3. [oc](https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.4/) or [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) and an OpenShift or Kubernetes cluster
 4. [jq](https://stedolan.github.io/jq/download/) (for `contrib/environment.sh`)
 5. Google Chrome/Chromium or Firefox for integration tests
@@ -154,7 +154,7 @@ See [STYLEGUIDE](STYLEGUIDE.md) for file format and coding style guide.
 
 ### Dev Dependencies
 
-go 1.16+, nodejs/yarn, kubectl
+go 1.18+, nodejs/yarn, kubectl
 
 ### Frontend Development
 

builder-run.sh

@@ -11,7 +11,7 @@ set -e
 # Without env vars:
 # ./builder-run.sh ./my-script --my-script-arg1 --my-script-arg2
 
-BUILDER_IMAGE="quay.io/coreos/tectonic-console-builder:v23"
+BUILDER_IMAGE="quay.io/coreos/tectonic-console-builder:v24"
 
 # forward whitelisted env variables to docker
 ENV_STR=()

go.mod

@@ -1,36 +1,172 @@
 module github.com/openshift/console
 
-go 1.16
+go 1.18
 
 require (
  github.com/coreos/go-oidc v2.1.0+incompatible
  github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
  github.com/devfile/api/v2 v2.0.0-20220105201057-dd1d65d4d91f
  github.com/devfile/library v1.2.1-0.20211104222135-49d635cb492f
- github.com/devfile/registry-support/index/generator v0.0.0-20220110165901-db88e581adf8
- github.com/devfile/registry-support/registry-library v0.0.0-20220110165901-db88e581adf8
- github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
+ github.com/devfile/registry-support/index/generator v0.0.0-20220222194908-7a90a4214f3e
+ github.com/devfile/registry-support/registry-library v0.0.0-20220527155645-8328a8a883be
  github.com/gorilla/websocket v1.4.2
  github.com/graph-gophers/graphql-go v0.0.0-20200309224638-dae41bde9ef9
  github.com/openshift/api v0.0.0-20211103080632-8981c8822dfa
  github.com/openshift/library-go v0.0.0-20200424095618-2aeb4725dadf
  github.com/operator-framework/kubectl-operator v0.3.0
- github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
- github.com/prometheus/client_golang v1.11.1
+ github.com/prometheus/client_golang v1.12.1
  github.com/rawagner/graphql-transport-ws v0.0.0-20200817140314-dcfbf0388067
- golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
- golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
+ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
+ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
  gopkg.in/yaml.v2 v2.4.0
- helm.sh/helm/v3 v3.7.1
- k8s.io/api v0.22.1
- k8s.io/apiextensions-apiserver v0.22.1
- k8s.io/apimachinery v0.22.1
- k8s.io/cli-runtime v0.22.1
- k8s.io/client-go v0.22.1
+ helm.sh/helm/v3 v3.9.0
+ k8s.io/api v0.24.0
+ k8s.io/apiextensions-apiserver v0.24.0
+ k8s.io/apimachinery v0.24.0
+ k8s.io/cli-runtime v0.24.0
+ k8s.io/client-go v0.24.0
  k8s.io/klog v1.0.0
- k8s.io/klog/v2 v2.9.0
- sigs.k8s.io/controller-runtime v0.9.5
- sigs.k8s.io/yaml v1.2.0
+ k8s.io/klog/v2 v2.60.1
+ sigs.k8s.io/controller-runtime v0.12.1
+ sigs.k8s.io/yaml v1.3.0
+)
+
+require (
+ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+ github.com/BurntSushi/toml v1.0.0 // indirect
+ github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
+ github.com/Masterminds/goutils v1.1.1 // indirect
+ github.com/Masterminds/semver/v3 v3.1.1 // indirect
+ github.com/Masterminds/sprig/v3 v3.2.2 // indirect
+ github.com/Masterminds/squirrel v1.5.2 // indirect
+ github.com/Microsoft/go-winio v0.5.1 // indirect
+ github.com/Microsoft/hcsshim v0.9.2 // indirect
+ github.com/PuerkitoBio/purell v1.1.1 // indirect
+ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+ github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
+ github.com/beorn7/perks v1.0.1 // indirect
+ github.com/blang/semver v3.5.1+incompatible // indirect
+ github.com/blang/semver/v4 v4.0.0 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
+ github.com/containerd/containerd v1.6.3 // indirect
+ github.com/containerd/continuity v0.2.2 // indirect
+ github.com/cyphar/filepath-securejoin v0.2.3 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/docker/cli v20.10.11+incompatible // indirect
+ github.com/docker/distribution v2.8.1+incompatible // indirect
+ github.com/docker/docker v20.10.14+incompatible // indirect
+ github.com/docker/docker-credential-helpers v0.6.4 // indirect
+ github.com/docker/go-connections v0.4.0 // indirect
+ github.com/docker/go-metrics v0.0.1 // indirect
+ github.com/docker/go-units v0.4.0 // indirect
+ github.com/emicklei/go-restful v2.9.5+incompatible // indirect
+ github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
+ github.com/fatih/color v1.13.0 // indirect
+ github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
+ github.com/go-errors/errors v1.0.1 // indirect
+ github.com/go-gorp/gorp/v3 v3.0.2 // indirect
+ github.com/go-logr/logr v1.2.2 // indirect
+ github.com/go-openapi/jsonpointer v0.19.5 // indirect
+ github.com/go-openapi/jsonreference v0.19.5 // indirect
+ github.com/go-openapi/swag v0.19.14 // indirect
+ github.com/gobwas/glob v0.2.3 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+ github.com/golang/mock v1.6.0 // indirect
+ github.com/golang/protobuf v1.5.2 // indirect
+ github.com/google/btree v1.0.1 // indirect
+ github.com/google/gnostic v0.5.7-v3refs // indirect
+ github.com/google/go-cmp v0.5.6 // indirect
+ github.com/google/gofuzz v1.2.0 // indirect
+ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+ github.com/google/uuid v1.2.0 // indirect
+ github.com/gorilla/mux v1.8.0 // indirect
+ github.com/gosuri/uitable v0.0.4 // indirect
+ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
+ github.com/hashicorp/errwrap v1.1.0 // indirect
+ github.com/hashicorp/go-multierror v1.1.1 // indirect
+ github.com/hashicorp/go-version v1.4.0 // indirect
+ github.com/huandu/xstrings v1.3.2 // indirect
+ github.com/imdario/mergo v0.3.12 // indirect
+ github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ github.com/jmoiron/sqlx v1.3.4 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
+ github.com/json-iterator/go v1.1.12 // indirect
+ github.com/klauspost/compress v1.13.6 // indirect
+ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
+ github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
+ github.com/lib/pq v1.10.4 // indirect
+ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
+ github.com/mailru/easyjson v0.7.6 // indirect
+ github.com/mattn/go-colorable v0.1.12 // indirect
+ github.com/mattn/go-isatty v0.0.14 // indirect
+ github.com/mattn/go-runewidth v0.0.9 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+ github.com/mitchellh/copystructure v1.2.0 // indirect
+ github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+ github.com/mitchellh/reflectwalk v1.0.2 // indirect
+ github.com/moby/locker v1.0.1 // indirect
+ github.com/moby/spdystream v0.2.0 // indirect
+ github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
+ github.com/morikuni/aec v1.0.0 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ github.com/onsi/gomega v1.18.1 // indirect
+ github.com/opencontainers/go-digest v1.0.0 // indirect
+ github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
+ github.com/opencontainers/runc v1.1.1 // indirect
+ github.com/opentracing/opentracing-go v1.1.0 // indirect
+ github.com/operator-framework/api v0.7.1 // indirect
+ github.com/operator-framework/operator-lifecycle-manager v0.0.0-20200521062108-408ca95d458f // indirect
+ github.com/operator-framework/operator-registry v1.12.5 // indirect
+ github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+ github.com/pkg/errors v0.9.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect
+ github.com/prometheus/client_model v0.2.0 // indirect
+ github.com/prometheus/common v0.32.1 // indirect
+ github.com/prometheus/procfs v0.7.3 // indirect
+ github.com/rubenv/sql-migrate v1.1.1 // indirect
+ github.com/russross/blackfriday v1.5.2 // indirect
+ github.com/shopspring/decimal v1.2.0 // indirect
+ github.com/sirupsen/logrus v1.8.1 // indirect
+ github.com/spf13/afero v1.6.0 // indirect
+ github.com/spf13/cast v1.4.1 // indirect
+ github.com/spf13/cobra v1.4.0 // indirect
+ github.com/spf13/pflag v1.0.5 // indirect
+ github.com/stretchr/testify v1.7.1 // indirect
+ github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
+ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+ github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+ github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
+ go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
+ golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
+ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+ golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
+ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+ golang.org/x/text v0.3.7 // indirect
+ golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
+ google.golang.org/grpc v1.43.0 // indirect
+ google.golang.org/protobuf v1.27.1 // indirect
+ gopkg.in/inf.v0 v0.9.1 // indirect
+ gopkg.in/square/go-jose.v2 v2.5.1 // indirect
+ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+ k8s.io/apiserver v0.24.0 // indirect
+ k8s.io/component-base v0.24.0 // indirect
+ k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
+ k8s.io/kubectl v0.24.0 // indirect
+ k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
+ oras.land/oras-go v1.1.0 // indirect
+ sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
+ sigs.k8s.io/kustomize/api v0.11.4 // indirect
+ sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 )
 
 replace (