From 15bad7bb21115248d8efecd2fa90a9a6ea87677f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 09:09:43 +0200 Subject: [PATCH 01/46] Bump github.com/argoproj/argo-workflows/v3 from 3.4.9 to 3.4.10 (#952) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 25 +++++++++++----------- go.sum | 67 ++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 42 deletions(-) diff --git a/go.mod b/go.mod index 89ef4c04a..a799802e6 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( cloud.google.com/go/bigquery v1.53.0 cloud.google.com/go/storage v1.31.0 - github.com/argoproj/argo-workflows/v3 v3.4.9 + github.com/argoproj/argo-workflows/v3 v3.4.10 github.com/buger/jsonparser v1.1.1 github.com/coreos/go-oidc/v3 v3.6.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible @@ -38,11 +38,17 @@ require ( github.com/andybalholm/brotli v1.0.4 // indirect github.com/apache/arrow/go/v12 v12.0.0 // indirect github.com/apache/thrift v0.16.0 // indirect + github.com/colinmarc/hdfs/v2 v2.4.0 // indirect github.com/goccy/go-json v0.9.11 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/flatbuffers v2.0.8+incompatible // indirect + github.com/jcmturner/aescts/v2 v2.0.0 // indirect + github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect + github.com/jcmturner/goidentity/v6 v6.0.1 // indirect + github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect + github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/klauspost/asmfmt v1.3.2 // indirect - github.com/klauspost/cpuid/v2 v2.2.4 // indirect + github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/pierrec/lz4/v4 v4.1.15 // indirect @@ -69,10 +75,9 @@ require ( github.com/argoproj/pkg v0.13.6 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/colinmarc/hdfs v1.1.4-0.20180805212432-9746310a4d31 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/doublerebel/bellows v0.0.0-20160303004610-f177d92a03d3 // indirect - github.com/emicklei/go-restful/v3 v3.9.0 // indirect + github.com/emicklei/go-restful/v3 v3.10.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-jose/go-jose/v3 v3.0.0 // indirect github.com/go-logr/logr v1.2.3 // indirect @@ -89,14 +94,14 @@ require ( github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect - github.com/hashicorp/go-uuid v1.0.2 // indirect + github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/huandu/xstrings v1.3.3 // indirect github.com/imdario/mergo v0.3.13 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/jcmturner/gofork v1.0.0 // indirect + github.com/jcmturner/gofork v1.7.6 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/compress v1.16.7 // indirect github.com/klauspost/pgzip v1.2.6 // indirect github.com/lib/pq v1.10.4 // indirect github.com/mailru/easyjson v0.7.7 // indirect @@ -115,7 +120,7 @@ require ( github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sethvargo/go-limiter v0.7.2 // indirect github.com/shopspring/decimal v1.2.0 // indirect - github.com/sirupsen/logrus v1.9.2 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect @@ -130,10 +135,6 @@ require ( golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect - gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect - gopkg.in/jcmturner/gokrb5.v5 v5.3.0 // indirect - gopkg.in/jcmturner/rpc.v0 v0.0.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.90.1 // indirect diff --git a/go.sum b/go.sum index 70312ca80..e9177fce3 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/argoproj/argo-events v1.7.3 h1:XiGnKCzRRQCI7sFCKw3RoeFUOR6IupfAJI9uUK7pnG8= github.com/argoproj/argo-events v1.7.3/go.mod h1:YxDOXrveW52SDAeeTI93Wagkr4jt5DK0dA0juIdWDRw= -github.com/argoproj/argo-workflows/v3 v3.4.9 h1:fBzDDUWLodFCF7W+F08cfRYqBiSxSDU6oiE9rYrxEXE= -github.com/argoproj/argo-workflows/v3 v3.4.9/go.mod h1:paG2VYOrjHGZvtuKGpCPTtLiUV1N9WIZun1yt2dQN8w= +github.com/argoproj/argo-workflows/v3 v3.4.10 h1:kdv2VLWpE7qeL6lnL99dLA6wNav53XrrNAA9OIawkxs= +github.com/argoproj/argo-workflows/v3 v3.4.10/go.mod h1:qUfxOxQfgpB074EeoTT1nd3iX2G05PEx+ct1NNvAR0U= github.com/argoproj/pkg v0.13.6 h1:36WPD9MNYECHcO1/R1pj6teYspiK7uMQLCgLGft2abM= github.com/argoproj/pkg v0.13.6/go.mod h1:I698DoJBKuvNFaixh4vFl2C88cNIT1WS7KCbz5ewyF8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= @@ -67,8 +67,8 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/colinmarc/hdfs v1.1.4-0.20180805212432-9746310a4d31 h1:ow7T77012NSZVW0uOWoQxz3yj9fHKYeZ4QmNrMtWMbM= -github.com/colinmarc/hdfs v1.1.4-0.20180805212432-9746310a4d31/go.mod h1:vSBumefK4HA5uiRSwNP+3ofgrEoScpCS2MMWcWXEuQ4= +github.com/colinmarc/hdfs/v2 v2.4.0 h1:v6R8oBx/Wu9fHpdPoJJjpGSUxo8NhHIwrwsfhFvU9W0= +github.com/colinmarc/hdfs/v2 v2.4.0/go.mod h1:0NAO+/3knbMx6+5pCv+Hcbaz4xn/Zzbn9+WIib2rKVI= github.com/coreos/go-oidc/v3 v3.6.0 h1:AKVxfYw1Gmkn/w96z0DbT/B/xFnzTd3MkZvWLjF4n/o= github.com/coreos/go-oidc/v3 v3.6.0/go.mod h1:ZpHUsHBucTUj6WOkrP4E20UPynbLZzhTQ1XKCXkxyPc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -85,8 +85,8 @@ github.com/doublerebel/bellows v0.0.0-20160303004610-f177d92a03d3/go.mod h1:v/MT github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= -github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.10.0 h1:X4gma4HM7hFm6WMeAsTfqA0GOfdNoCzBIkHGoRLGXuM= +github.com/emicklei/go-restful/v3 v3.10.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -143,7 +143,6 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -201,6 +200,10 @@ github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qK github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= +github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= +github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI= +github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -211,9 +214,9 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92Bcuy github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/go-uuid v0.0.0-20180228145832-27454136f036/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -226,9 +229,18 @@ github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jcmturner/gofork v0.0.0-20180107083740-2aebee971930/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= -github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= -github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= +github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= +github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= +github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= +github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= +github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg= +github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= +github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o= +github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= +github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8= +github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs= +github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= +github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jeremywohl/flatten/v2 v2.0.0-20211013061545-07e4a09fb8e4 h1:eA9wi6ZzpIRobvXkn/S2Lyw1hr2pc71zxzOPl7Xjs4w= github.com/jeremywohl/flatten/v2 v2.0.0-20211013061545-07e4a09fb8e4/go.mod h1:s9g9Dfls+aEgucKXKW+i8MRZuLXT2MrD/WjYpMnWfOw= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -247,12 +259,12 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.13.5/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= +github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= -github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= -github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= +github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -309,7 +321,6 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/pborman/getopt v0.0.0-20180729010549-6fdd0a2c7117/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= @@ -339,8 +350,8 @@ github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXY github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y= -github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ= github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -396,7 +407,6 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -golang.org/x/crypto v0.0.0-20180723164146-c126467f60eb/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -407,6 +417,7 @@ golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -433,6 +444,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -443,6 +455,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -479,16 +493,17 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -500,6 +515,7 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -585,15 +601,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/jcmturner/aescts.v1 v1.0.1 h1:cVVZBK2b1zY26haWB4vbBiZrfFQnfbTVrE3xZq6hrEw= -gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= -gopkg.in/jcmturner/dnsutils.v1 v1.0.1 h1:cIuC1OLRGZrld+16ZJvvZxVJeKPsvd5eUIvxfoN5hSM= -gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= -gopkg.in/jcmturner/goidentity.v2 v2.0.0 h1:6Bmcdaxb0dD3HyHbo/MtJ2Q1wXLDuZJFwXZmuZvM+zw= -gopkg.in/jcmturner/gokrb5.v5 v5.3.0 h1:RS1MYApX27Hx1Xw7NECs7XxGxxrm69/4OmaRuX9kwec= -gopkg.in/jcmturner/gokrb5.v5 v5.3.0/go.mod h1:oQz8Wc5GsctOTgCVyKad1Vw4TCWz5G6gfIQr88RPv4k= -gopkg.in/jcmturner/rpc.v0 v0.0.2 h1:wBTgrbL1qmLBUPsYVCqdJiI5aJgQhexmK+JkTHPUNJI= -gopkg.in/jcmturner/rpc.v0 v0.0.2/go.mod h1:NzMq6cRzR9lipgw7WxRBHNx5N8SifBuaCQsOT1kWY/E= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI= gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= From 703dde54143c9ba1a202538e5a8cea24d2a368fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 10:32:02 +0200 Subject: [PATCH 02/46] Bump k8s.io/client-go from 0.27.4 to 0.28.1 (#966) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom Martensen --- go.mod | 16 +++++------ go.sum | 47 ++++++++++++++------------------- test/e2e/cluster/status_test.go | 11 ++++---- 3 files changed, 34 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index a799802e6..98c0c7e89 100644 --- a/go.mod +++ b/go.mod @@ -29,9 +29,9 @@ require ( google.golang.org/grpc v1.57.0 google.golang.org/protobuf v1.31.0 gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api v0.27.4 - k8s.io/apimachinery v0.27.4 - k8s.io/client-go v0.27.4 + k8s.io/api v0.28.1 + k8s.io/apimachinery v0.28.1 + k8s.io/client-go v0.28.1 ) require ( @@ -42,6 +42,7 @@ require ( github.com/goccy/go-json v0.9.11 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/flatbuffers v2.0.8+incompatible // indirect + github.com/google/gnostic-models v0.6.8 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect github.com/jcmturner/goidentity/v6 v6.0.1 // indirect @@ -80,13 +81,12 @@ require ( github.com/emicklei/go-restful/v3 v3.10.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-jose/go-jose/v3 v3.0.0 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/logr v1.2.4 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/s2a-go v0.1.4 // indirect @@ -137,9 +137,9 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect - k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect + k8s.io/klog/v2 v2.100.1 // indirect + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/go.sum b/go.sum index e9177fce3..8994b2398 100644 --- a/go.sum +++ b/go.sum @@ -79,7 +79,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/doublerebel/bellows v0.0.0-20160303004610-f177d92a03d3 h1:7nllYTGLnq4CqBL27lV6oNfXzM2tJ2mrKF8E+aBXOV0= github.com/doublerebel/bellows v0.0.0-20160303004610-f177d92a03d3/go.mod h1:v/MTKot4he5oRHGirOYGN4/hEOONNnWtDBLAzllSGMw= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -110,8 +109,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= @@ -125,7 +124,7 @@ github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+ github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-test/deep v1.0.4 h1:u2CU3YKy9I2pmu9pX0eq50wCgjfGIt539SqR7FbHiho= github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= @@ -166,8 +165,8 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/flatbuffers v2.0.8+incompatible h1:ivUb1cGomAB101ZM1T0nOiWz9pSrTMoa9+EiY7igmkM= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= -github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= -github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -269,7 +268,6 @@ github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -316,10 +314,10 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= +github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= +github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0= @@ -341,7 +339,7 @@ github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPH github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sethvargo/go-limiter v0.7.2 h1:FgC4N7RMpV5gMrUdda15FaFTkQ/L4fEqM7seXMs4oO8= @@ -366,7 +364,6 @@ github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRM github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -560,7 +557,6 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= @@ -586,7 +582,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= @@ -594,7 +589,6 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= @@ -613,7 +607,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= @@ -622,27 +615,27 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.17.8/go.mod h1:N++Llhs8kCixMUoCaXXAyMMPbo8dDVnh+IQ36xZV2/0= -k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= -k8s.io/api v0.27.4/go.mod h1:O3smaaX15NfxjzILfiln1D8Z3+gEYpjEpiNA/1EVK1Y= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= +k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= k8s.io/apimachinery v0.17.8/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= -k8s.io/apimachinery v0.27.4/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= +k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= k8s.io/client-go v0.17.8/go.mod h1:SJsDS64AAtt9VZyeaQMb4Ck5etCitZ/FwajWdzua5eY= -k8s.io/client-go v0.27.4 h1:vj2YTtSJ6J4KxaC88P4pMPEQECWMY8gqPqsTgUKzvjk= -k8s.io/client-go v0.27.4/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= +k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= -k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= +k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= -k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= +k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v2 v2.0.1/go.mod h1:Wb7vfKAodbKgf6tn1Kl0VvGj7mRH6DGaRcixXEJXTsE= diff --git a/test/e2e/cluster/status_test.go b/test/e2e/cluster/status_test.go index afcab6064..872c2fa6a 100644 --- a/test/e2e/cluster/status_test.go +++ b/test/e2e/cluster/status_test.go @@ -33,6 +33,9 @@ type statusTest struct { func TestStatusCommand(t *testing.T) { utils.CheckContext() + maintainer, err := infractlWhoami() + assert.NoError(t, err) + tests := []statusTest{ { title: "First infractl status get initializes inactive maintenance", @@ -43,7 +46,7 @@ func TestStatusCommand(t *testing.T) { assert.Equal(t, tc.response.Status.Maintainer, "") }, assertLogContents: func(podLogs string) { - assert.Contains(t, podLogs, "\"msg\":\"initialized infra status lazily\",\"actor\":\"roxbot+infra-gha@redhat.com\",\"maintenance-active\":false") + assert.Contains(t, podLogs, fmt.Sprintf("\"msg\":\"initialized infra status lazily\",\"actor\":\"%s\",\"maintenance-active\":false", maintainer)) }, }, { @@ -57,9 +60,7 @@ func TestStatusCommand(t *testing.T) { assert.Equal(t, tc.response.Status.Maintainer, maintainer) }, assertLogContents: func(podLogs string) { - maintainer, err := infractlWhoami() - assert.NoError(t, err) - assert.Contains(t, podLogs, fmt.Sprintf("\"msg\":\"new status set\",\"actor\":\"roxbot+infra-gha@redhat.com\",\"maintainer\":\"%s\",\"maintenance-active\":true", maintainer)) + assert.Contains(t, podLogs, fmt.Sprintf("\"msg\":\"new status set\",\"actor\":\"%s\",\"maintainer\":\"%s\",\"maintenance-active\":true", maintainer, maintainer)) }, }, { @@ -71,7 +72,7 @@ func TestStatusCommand(t *testing.T) { assert.Equal(t, tc.response.Status.Maintainer, "") }, assertLogContents: func(podLogs string) { - assert.Contains(t, podLogs, "\"msg\":\"status was reset\",\"actor\":\"roxbot+infra-gha@redhat.com\",\"maintenance-active\":false") + assert.Contains(t, podLogs, fmt.Sprintf("\"msg\":\"status was reset\",\"actor\":\"%s\",\"maintenance-active\":false", maintainer)) }, }, } From 7ac93ecb305a54393619e6ff44a4e806fad7cb08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:10:12 +0200 Subject: [PATCH 03/46] Bump @adobe/css-tools from 4.2.0 to 4.3.1 in /ui (#968) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- ui/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/yarn.lock b/ui/yarn.lock index 14b549bfc..256bd8aed 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -3,9 +3,9 @@ "@adobe/css-tools@^4.0.1": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.2.0.tgz#e1a84fca468f4b337816fcb7f0964beb620ba855" - integrity sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA== + version "4.3.1" + resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.3.1.tgz#abfccb8ca78075a2b6187345c26243c1a0842f28" + integrity sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg== "@babel/code-frame@7.10.4": version "7.10.4" From 9077c9e1b994c8afc790032e0f857159062a62ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:11:22 +0200 Subject: [PATCH 04/46] Bump @types/node from 20.4.2 to 20.5.4 in /ui (#961) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- ui/package.json | 2 +- ui/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/package.json b/ui/package.json index cdb4ff332..a76dd6e91 100644 --- a/ui/package.json +++ b/ui/package.json @@ -48,7 +48,7 @@ "@testing-library/user-event": "^13.2.1", "@types/jest": "^27.0.2", "@types/lodash": "^4.14.195", - "@types/node": "^20.4.2", + "@types/node": "^20.5.4", "@types/react": "^17.0.20", "@types/react-dom": "^17.0.9", "@types/react-modal": "^3.16.0", diff --git a/ui/yarn.lock b/ui/yarn.lock index 256bd8aed..5e01eac00 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2114,10 +2114,10 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== -"@types/node@*", "@types/node@^20.4.2": - version "20.4.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.2.tgz#129cc9ae69f93824f92fac653eebfb4812ab4af9" - integrity sha512-Dd0BYtWgnWJKwO1jkmTrzofjK2QXXcai0dmtzvIBhcA+RsG5h8R3xlyta0kGOZRNfL9GuRtb1knmPEhQrePCEw== +"@types/node@*", "@types/node@^20.5.4": + version "20.5.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.4.tgz#4666fb40f9974d60c53c4ff554315860ba4feab8" + integrity sha512-Y9vbIAoM31djQZrPYjpTLo0XlaSwOIsrlfE3LpulZeRblttsLQRFRlBAppW0LOxyT3ALj2M5vU1ucQQayQH3jA== "@types/normalize-package-data@^2.4.0": version "2.4.0" From 06ab41c915386d7c954b13d19a2dfe450cd3920d Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Wed, 30 Aug 2023 12:14:34 -0700 Subject: [PATCH 05/46] Make demo DNS configurable (#965) --- CHANGELOG.md | 2 ++ chart/infra-server/static/workflow-demo.yaml | 8 ++++++-- chart/infra-server/static/workflow-qa-demo.yaml | 8 ++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6043229e..32d438362 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ Please avoid adding duplicate information across this changelog and JIRA/doc inp ## [NEXT RELEASE] +- Make the domain for GKE based demos configurable. + ## [0.7.10] - Fix for openshift-4-demo 4.2+ installs - Reduce the master node count of openshift-4 and openshift-4-demo flavors from diff --git a/chart/infra-server/static/workflow-demo.yaml b/chart/infra-server/static/workflow-demo.yaml index 1d31e93c7..476f81c65 100644 --- a/chart/infra-server/static/workflow-demo.yaml +++ b/chart/infra-server/static/workflow-demo.yaml @@ -112,7 +112,7 @@ spec: none: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-demo-0.6.14 + image: quay.io/stackrox-io/ci:automation-flavors-demo-0.7.11 imagePullPolicy: Always command: - /usr/bin/entrypoint @@ -169,6 +169,10 @@ spec: secretKeyRef: name: demo-secrets key: SLACK_WEBHOOK + - name: GCP_CLOUD_DNS_ZONE_NAME + value: "demo-stackrox-com" + - name: DOMAIN_NAME + value: "demo.stackrox.com" - name: wait suspend: {} @@ -184,7 +188,7 @@ spec: path: /data/tfvars optional: true container: - image: quay.io/stackrox-io/ci:automation-flavors-demo-0.6.14 + image: quay.io/stackrox-io/ci:automation-flavors-demo-0.7.11 imagePullPolicy: Always command: - /usr/bin/entrypoint diff --git a/chart/infra-server/static/workflow-qa-demo.yaml b/chart/infra-server/static/workflow-qa-demo.yaml index f0f343867..d31b870db 100644 --- a/chart/infra-server/static/workflow-qa-demo.yaml +++ b/chart/infra-server/static/workflow-qa-demo.yaml @@ -116,7 +116,7 @@ spec: none: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-demo-0.6.14 + image: quay.io/stackrox-io/ci:automation-flavors-demo-0.7.11 imagePullPolicy: Always command: - /usr/bin/entrypoint @@ -175,6 +175,10 @@ spec: secretKeyRef: name: demo-secrets key: SLACK_WEBHOOK + - name: GCP_CLOUD_DNS_ZONE_NAME + value: "demo-stackrox-com" + - name: DOMAIN_NAME + value: "demo.stackrox.com" - name: wait suspend: {} @@ -190,7 +194,7 @@ spec: path: /data/tfvars optional: true container: - image: quay.io/stackrox-io/ci:automation-flavors-demo-0.6.14 + image: quay.io/stackrox-io/ci:automation-flavors-demo-0.7.11 imagePullPolicy: Always command: - /usr/bin/entrypoint From 905e00a7c66b02d19905180df17c64d049281e91 Mon Sep 17 00:00:00 2001 From: Brad Lugo Date: Fri, 1 Sep 2023 13:17:34 -0700 Subject: [PATCH 06/46] Change the OpenShift-4 master node count from 1 to 3 (#973) --- CHANGELOG.md | 2 ++ chart/infra-server/static/flavors.yaml | 2 +- chart/infra-server/static/workflow-openshift-4-demo.yaml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32d438362..27dc4b0bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ Please avoid adding duplicate information across this changelog and JIRA/doc inp ## [NEXT RELEASE] - Make the domain for GKE based demos configurable. +- Revert the change that reduced the master node count of openshift-4 and openshift-4-demo flavors from + 3 to 1 (default is now 3 again). ## [0.7.10] - Fix for openshift-4-demo 4.2+ installs diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index b260fde3c..48eb76155 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -279,7 +279,7 @@ - name: master-node-count description: number of master nodes - value: 1 + value: 3 kind: optional - name: worker-node-type diff --git a/chart/infra-server/static/workflow-openshift-4-demo.yaml b/chart/infra-server/static/workflow-openshift-4-demo.yaml index 916a6365b..12aa5da64 100644 --- a/chart/infra-server/static/workflow-openshift-4-demo.yaml +++ b/chart/infra-server/static/workflow-openshift-4-demo.yaml @@ -101,7 +101,7 @@ spec: - name: OPENSHIFT_VERSION value: "{{workflow.parameters.openshift-version}}" - name: MASTER_NODE_COUNT - value: "1" + value: "3" - name: WORKER_NODE_COUNT value: "3" - name: MASTER_NODE_TYPE From 9d944bcbbb1483317005f32598c0b81269a5d917 Mon Sep 17 00:00:00 2001 From: Brad Lugo Date: Fri, 1 Sep 2023 13:49:42 -0700 Subject: [PATCH 07/46] prepare CHANGELOG for next release (#974) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27dc4b0bb..13f1af97f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Please avoid adding duplicate information across this changelog and JIRA/doc inp ## [NEXT RELEASE] +## [0.7.11] - Make the domain for GKE based demos configurable. - Revert the change that reduced the master node count of openshift-4 and openshift-4-demo flavors from 3 to 1 (default is now 3 again). From 3aa06d40f7a38b07feee57e5cf72cf1eb60a08f3 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Fri, 1 Sep 2023 13:56:01 -0700 Subject: [PATCH 08/46] Create a certifier for demos.rox.systems (#972) --- .../templates/demo-certifier.yaml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/chart/infra-server/templates/demo-certifier.yaml b/chart/infra-server/templates/demo-certifier.yaml index d3025e296..03aec7574 100644 --- a/chart/infra-server/templates/demo-certifier.yaml +++ b/chart/infra-server/templates/demo-certifier.yaml @@ -46,4 +46,39 @@ spec: - name: configuration secret: secretName: demo-certifier-credentials + +--- + +apiVersion: batch/v1 +kind: CronJob +metadata: + name: demo-certifier-demos-rox-systems + namespace: infra +spec: + schedule: "@weekly" + jobTemplate: + spec: + template: + spec: + containers: + - name: certifier + image: us.gcr.io/stackrox-infra/certifier:0.0.0-5 + imagePullPolicy: IfNotPresent + args: + - --common-name=*.demos.rox.systems + - --cert-name=demos.rox.systems + - --gcs-bucket=sr-demo-files + - --gcs-prefix=certs + env: + - name: GOOGLE_APPLICATION_CREDENTIALS + value: /configuration/google-credentials.json + volumeMounts: + - mountPath: /configuration + name: configuration + readOnly: true + restartPolicy: Never + volumes: + - name: configuration + secret: + secretName: demo-certifier-credentials {{ end }} From e0498b2b85dfa5f95f1b5a419911ac8123db4365 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 06:31:23 +0000 Subject: [PATCH 09/46] Bump cloud.google.com/go/bigquery from 1.53.0 to 1.54.0 (#976) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 98c0c7e89..aeff2de83 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/stackrox/infra go 1.20 require ( - cloud.google.com/go/bigquery v1.53.0 + cloud.google.com/go/bigquery v1.54.0 cloud.google.com/go/storage v1.31.0 github.com/argoproj/argo-workflows/v3 v3.4.10 github.com/buger/jsonparser v1.1.1 diff --git a/go.sum b/go.sum index 8994b2398..d8c25ad78 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= -cloud.google.com/go/bigquery v1.53.0 h1:K3wLbjbnSlxhuG5q4pntHv5AEbQM1QqHKGYgwFIqOTg= -cloud.google.com/go/bigquery v1.53.0/go.mod h1:3b/iXjRQGU4nKa87cXeg6/gogLjO8C6PmuM8i5Bi/u4= +cloud.google.com/go/bigquery v1.54.0 h1:ify6s7sy+kQuAimRnVTrPUzaeY0+X5GEsKt2C5CiA8w= +cloud.google.com/go/bigquery v1.54.0/go.mod h1:9Y5I3PN9kQWuid6183JFhOGOW3GcirA5LpsKCUn+2ec= cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= From 7074596b548cd9a77ee12f359e6f06c51a9e113a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 06:39:05 +0000 Subject: [PATCH 10/46] Bump golang.org/x/net from 0.14.0 to 0.15.0 (#978) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index aeff2de83..5622da9b4 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - golang.org/x/net v0.14.0 + golang.org/x/net v0.15.0 golang.org/x/oauth2 v0.11.0 google.golang.org/api v0.136.0 google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 @@ -126,11 +126,11 @@ require ( github.com/valyala/fasttemplate v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect go.uber.org/zap v1.24.0 - golang.org/x/crypto v0.12.0 // indirect + golang.org/x/crypto v0.13.0 // indirect golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/term v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index d8c25ad78..44b926cfd 100644 --- a/go.sum +++ b/go.sum @@ -415,8 +415,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= @@ -454,8 +454,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -494,15 +494,15 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= -golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= +golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -513,8 +513,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= From 0ddda7814a6eb48b9b4de665527420c0d0b82f74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 06:53:29 +0000 Subject: [PATCH 11/46] Bump cloud.google.com/go/storage from 1.31.0 to 1.32.0 (#977) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5622da9b4..924289d90 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( cloud.google.com/go/bigquery v1.54.0 - cloud.google.com/go/storage v1.31.0 + cloud.google.com/go/storage v1.32.0 github.com/argoproj/argo-workflows/v3 v3.4.10 github.com/buger/jsonparser v1.1.1 github.com/coreos/go-oidc/v3 v3.6.0 diff --git a/go.sum b/go.sum index 44b926cfd..ba045d803 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ cloud.google.com/go/datacatalog v1.16.0 h1:qVeQcw1Cz93/cGu2E7TYUPh8Lz5dn5Ws2siIu cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= -cloud.google.com/go/storage v1.31.0 h1:+S3LjjEN2zZ+L5hOwj4+1OkGCsLVe0NzpXKQ1pSdTCI= -cloud.google.com/go/storage v1.31.0/go.mod h1:81ams1PrhW16L4kF7qg+4mTq7SRs5HsbDTM0bWvrwJ0= +cloud.google.com/go/storage v1.32.0 h1:5w6DxEGOnktmJHarxAOUywxVW9lbNWIzlzzUltG/3+o= +cloud.google.com/go/storage v1.32.0/go.mod h1:Hhh/dogNRGca7IWv1RC2YqEn0c0G77ctA/OxflYkiD8= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= From 2a6c61d4e5a0c553631c83e714c0cf5bbdcda298 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Wed, 6 Sep 2023 19:05:09 +0200 Subject: [PATCH 12/46] ROX-17443: add hint to find stored logs (#975) --- DEPLOYMENT.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index 335e1b036..3e9b70333 100644 --- a/DEPLOYMENT.md +++ b/DEPLOYMENT.md @@ -161,3 +161,12 @@ Download a copy of `infractl` and export your token. Verify API connectivity: | --- | --- | | Staging | `infractl -e dev.infra.rox.systems:443 whoami` | | Production | `infractl whoami` | + +## Logging + +The infra server logs are captured automatically by GCP. + +- [Logs Explorer: Staging](https://cloudlogging.app.goo.gl/uSmEsjAmYR8Uyvyx9) +- [Logs Explorer: Production](https://cloudlogging.app.goo.gl/KqgSyE2mSq83M5Xs9) + +Adding `jsonPayload."log-type"="audit"` to the query will filter for audit logs. From 5128fa5b35755f96f782a6629851e5dd1e37c3cb Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Tue, 12 Sep 2023 08:28:44 +0200 Subject: [PATCH 13/46] ROX-19609: add cluster name validation to infractl (#980) --- cmd/infractl/cluster/create/command.go | 26 ++++++++++++++++++++++++- cmd/infractl/cluster/create/create.bats | 18 +++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/cmd/infractl/cluster/create/command.go b/cmd/infractl/cluster/create/command.go index 6d3959d8f..17821c0af 100644 --- a/cmd/infractl/cluster/create/command.go +++ b/cmd/infractl/cluster/create/command.go @@ -118,7 +118,12 @@ func run(ctx context.Context, conn *grpc.ClientConn, cmd *cobra.Command, args [] displayUserNotes(cmd, args, &req) if len(args) > 1 { - req.Parameters["name"] = args[1] + name := args[1] + err := validateName(name) + if err != nil { + return nil, err + } + req.Parameters["name"] = name } else { name, err := determineName(ctx, conn, args[0]) if err != nil { @@ -146,6 +151,25 @@ func run(ctx context.Context, conn *grpc.ClientConn, cmd *cobra.Command, args [] return prettyResourceByID(*clusterID), nil } +func validateName(name string) error { + if len(name) < 3 { + return errors.New("cluster name too short") + } + if len(name) > 28 { + return errors.New("cluster name too long") + } + + match, err := regexp.MatchString(`^(?:[a-z](?:[-a-z0-9]{0,28}[a-z0-9])?)$`, name) + if err != nil { + return err + } + if !match { + return errors.New("The name does not match the requirements. Only lowercase letters, numbers, and '-' allowed, must start with a letter and end with a letter or number.") + } + + return nil +} + func determineWorkingEnvironment() { workingEnvironment.gitTopLevel = "" workingEnvironment.tag = "" diff --git a/cmd/infractl/cluster/create/create.bats b/cmd/infractl/cluster/create/create.bats index d432329df..6baf35142 100644 --- a/cmd/infractl/cluster/create/create.bats +++ b/cmd/infractl/cluster/create/create.bats @@ -123,6 +123,24 @@ setup() { assert_output --partial "parameter \"main-image\" was not provided" } +@test "provided name failed validation because too short" { + run infractl create test-qa-demo ab + assert_failure + assert_output --partial "Error: cluster name too short" +} + +@test "provided name failed validation because too long" { + run infractl create test-qa-demo this-name-will-be-too-loooooooooooooooooooong + assert_failure + assert_output --partial "Error: cluster name too long" +} + +@test "provided name failed validation because does not match regex" { + run infractl create test-qa-demo THIS-IN-INVALID + assert_failure + assert_output --partial "Error: The name does not match the requirements." +} + infractl() { "$ROOT"/bin/infractl -e localhost:8443 -k "$@" } From fe8c23a73c24073fafb733d440f029b88683d5ae Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Tue, 12 Sep 2023 08:29:05 +0200 Subject: [PATCH 14/46] add LICENSE; remove auth0.pem (#979) --- CODE_OF_CONDUCT.md | 3 + LICENSE | 201 ++++++++++++++++++++++++++++ chart/infra-server/static/auth0.pem | 18 --- 3 files changed, 204 insertions(+), 18 deletions(-) create mode 100644 CODE_OF_CONDUCT.md create mode 100644 LICENSE delete mode 100644 chart/infra-server/static/auth0.pem diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..a26685e4a --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,3 @@ +# Code of Conduct + +The Stackrox code of conduct can be found [here](https://stackrox.io/code-conduct). diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/chart/infra-server/static/auth0.pem b/chart/infra-server/static/auth0.pem deleted file mode 100644 index 94a201bbc..000000000 --- a/chart/infra-server/static/auth0.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC+zCCAeOgAwIBAgIJLDnPnG7gWejaMA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNV -BAMTEHNyLWRldi5hdXRoMC5jb20wHhcNMTgwMzA4MDA1NjE5WhcNMzExMTE1MDA1 -NjE5WjAbMRkwFwYDVQQDExBzci1kZXYuYXV0aDAuY29tMIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEAsd6KpRqc8U5Ng43nmq0OhEYeF3GrjGTvFje4xhED -Jkxc9OfSxKQNw9YAXH/jYOqwX2/1RA8W/xkMAykBcFhWiR+pmhPh19jknnhqwhSi -W5R9ea4TyoSzbVA0NZnsLv0f7AYURZc1mzZb+FHYdmn6koyRqqQi+TwSZstARGcu -mFhTPYJjhbQZgY3IjQ1nVWFi52vSOKZghnn5eMCd/p1nMO7M68xE8RGcq29i48hF -tau04rW6djktuO7uLwgF5sFgIdCA8iiqwH4hRekbXMBlo3RjfZRNgnOXNf3qTKCH -rDFcNyHB/uS+JnAc4l6d0xzV1c/aZM7r1w1ErUG9ggfEswIDAQABo0IwQDAPBgNV -HRMBAf8EBTADAQH/MB0GA1UdDgQWBBS8s3CReYOvoJ2gtYLUF2wXFbDvAzAOBgNV -HQ8BAf8EBAMCAoQwDQYJKoZIhvcNAQELBQADggEBAA52bacV704SpodEtiSTgDuj -Io1/1PfK42NHRVy/aVbATtiSrXiSuhN6SfodQ9Ctno9Nflcx9m7MCGPmMwU+vJWk -7t6/XYdAPVKu5uaJ/qF2fPVhR7vRkHsHkjslhoLP5M/IYVyEsQzMfCXUycm7ky/K -X7UZHfGP8H+p1tQFfB3etkPfuiFz9Zb6BSB+yry3/y/jMrafeYthDHjFYBwv2uyV -3ihRL9dxWFj/srnanXnU92yA9KsKtNQhpg7+AstG84/TYh/PVmxBQEXpmoTErEQc -nv2NAeqpxnYgKgnzcDVY3E8Ikj47mBn8VpviVl5zIpnnYChKLVdwF4AyKq7W7GU= ------END CERTIFICATE----- From f6aceca9e8278008a7c99de128c03af1d0e98ee8 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Wed, 13 Sep 2023 09:02:21 +0200 Subject: [PATCH 15/46] ROX-19655: build infra with multi-stage image (#981) --- .../actions/cache-go-dependencies/action.yaml | 24 ------------------- .../actions/cache-ui-dependencies/action.yaml | 20 ---------------- .../action.yaml | 17 ------------- .github/workflows/build-and-push.yaml | 21 ++++------------ Makefile | 16 ++----------- image/Dockerfile | 22 ++++++++++++++--- 6 files changed, 26 insertions(+), 94 deletions(-) delete mode 100644 .github/actions/cache-go-dependencies/action.yaml delete mode 100644 .github/actions/cache-ui-dependencies/action.yaml delete mode 100644 .github/actions/create-concatenated-ui-monorepo-lock/action.yaml diff --git a/.github/actions/cache-go-dependencies/action.yaml b/.github/actions/cache-go-dependencies/action.yaml deleted file mode 100644 index 444530db7..000000000 --- a/.github/actions/cache-go-dependencies/action.yaml +++ /dev/null @@ -1,24 +0,0 @@ -name: Cache Go Dependencies -description: Cache Go Dependencies -runs: - using: composite - steps: - - name: Determine Go cache paths - id: cache-paths - run: | - echo "GOCACHE=$(go env GOCACHE)" >> $GITHUB_OUTPUT - echo "GOMODCACHE=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT - shell: bash - - - name: Cache Go Dependencies - uses: actions/cache@v3 - with: - path: | - ${{ steps.cache-paths.outputs.GOCACHE }} - ${{ steps.cache-paths.outputs.GOMODCACHE }} - /github/home/.cache/go-build - /github/home/.cache/golangci-lint - /github/home/.cache/staticcheck - key: go-v2-${{ hashFiles('**/go.sum') }} - restore-keys: | - go-v2- diff --git a/.github/actions/cache-ui-dependencies/action.yaml b/.github/actions/cache-ui-dependencies/action.yaml deleted file mode 100644 index 122a55826..000000000 --- a/.github/actions/cache-ui-dependencies/action.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: Cache UI Dependencies -description: Cache UI Dependencies -inputs: - lockFile: - description: Where the monorepo lock is written - required: true - default: "go/src/github.com/stackrox/infra/ui/monorepo.lock" -runs: - using: composite - steps: - - name: Cache UI Dependencies - uses: actions/cache@v3 - with: - path: | - /github/home/.cache/Cypress - /usr/local/share/.cache - go/src/github.com/stackrox/infra/ui/node_modules - key: npm-v2-${{ hashFiles(inputs.lockFile) }} - restore-keys: | - npm-v2- diff --git a/.github/actions/create-concatenated-ui-monorepo-lock/action.yaml b/.github/actions/create-concatenated-ui-monorepo-lock/action.yaml deleted file mode 100644 index dac862ce7..000000000 --- a/.github/actions/create-concatenated-ui-monorepo-lock/action.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: Create combined mono repo lock file -description: Create combined mono repo lock file -inputs: - lockFile: - description: Where the lockfile is written - required: true - default: "ui/monorepo.lock" -runs: - using: composite - steps: - - name: Create combined mono repo lock file - run: | - echo "Creating combined lock in: ${{ inputs.lockFile }}" - find ui/ -type d \( -name node_modules \) -prune -false -o -name package.json -print0 | sort -z | xargs -r0 cat > ${{ inputs.lockFile }} - cat ui/yarn.lock >> ${{ inputs.lockFile }} - shell: bash - working-directory: go/src/github.com/stackrox/infra \ No newline at end of file diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml index 73bc9123e..250978e57 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.github/workflows/build-and-push.yaml @@ -33,15 +33,6 @@ jobs: PATH="${PATH}:${GOPATH}/bin" echo PATH="${PATH}" >> "$GITHUB_ENV" - - name: Cache Go dependencies - uses: ./go/src/github.com/stackrox/infra/.github/actions/cache-go-dependencies - - - name: Create UI cache lock - uses: ./go/src/github.com/stackrox/infra/.github/actions/create-concatenated-ui-monorepo-lock - - - name: Cache UI dependencies - uses: ./go/src/github.com/stackrox/infra/.github/actions/cache-ui-dependencies - - name: Generate src # This is committed at generated/ but building here ensure the make # targets do not go stale and that any updates are committed. @@ -58,14 +49,12 @@ jobs: make image - name: Login for image push - env: - INFRA_IMAGE_PUSH: ${{ secrets.INFRA_IMAGE_PUSH }} - run: docker login -u _json_key --password-stdin <<<"$INFRA_IMAGE_PUSH" https://us.gcr.io + uses: docker/login-action@v2 + with: + registry: us.gcr.io + username: _json_key + password: ${{ secrets.INFRA_IMAGE_PUSH }} - name: Push run: | make push - - - name: Logout - run: | - docker logout https://us.gcr.io diff --git a/Makefile b/Makefile index 62f4f6a1d..3010b627a 100644 --- a/Makefile +++ b/Makefile @@ -69,25 +69,13 @@ ui: @make -C ui all .PHONY: image -image: server cli ui clean-image - @echo "+ $@" - @cp -f bin/infra-server-linux-amd64 image/infra-server - @mkdir -p image/static/downloads - @cp -R ui/build/* image/static/ - @cp bin/infractl-darwin-amd64 image/static/downloads - @cp bin/infractl-darwin-arm64 image/static/downloads - @cp bin/infractl-linux-amd64 image/static/downloads - docker build -t $(IMAGE) image +image: + docker build . -t $(IMAGE) -f image/Dockerfile --secret id=npmrc,src=${HOME}/.npmrc .PHONY: push push: docker push $(IMAGE) | cat -.PHONY: clean-image -clean-image: - @echo "+ $@" - @rm -rf image/infra-server image/static - ############# ## Testing ## ############# diff --git a/image/Dockerfile b/image/Dockerfile index ba5d2d183..6f76b10b7 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,7 +1,23 @@ -FROM alpine:3.14 +FROM golang:1.20.8 as golang-builder -COPY infra-server /infra-server +WORKDIR /go/src/github.com/stackrox/infra -COPY static /etc/infra/static +COPY . . + +RUN make server cli + +FROM node:16.20.2 as ui-builder + +COPY ui ui + +RUN --mount=type=secret,id=npmrc,target=/root/.npmrc make -C ui all + +FROM alpine:3.18.3 as app + +COPY --from=golang-builder /go/src/github.com/stackrox/infra/bin/infra-server-linux-amd64 /infra-server + +COPY --from=ui-builder /ui/build /etc/infra/static + +COPY --from=golang-builder /go/src/github.com/stackrox/infra/bin/infractl-* /etc/infra/static/downloads/ ENTRYPOINT ["/infra-server"] From 2282d9115e2e442ea998f6a91415b212430f086a Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Wed, 13 Sep 2023 09:04:11 +0200 Subject: [PATCH 16/46] fix: move localhost TLS secret to configuration (#982) --- DEPLOYMENT.md | 5 ++++ TROUBLESHOOTING.md | 12 +++------ chart/infra-server/static/tls-cert.pem | 21 --------------- chart/infra-server/static/tls-key.pem | 27 ------------------- chart/infra-server/templates/secrets.yaml | 4 +-- scripts/cert/renew.sh | 12 +++++++++ .../static/tls.conf => scripts/cert/tls.cnf | 11 ++++---- 7 files changed, 28 insertions(+), 64 deletions(-) delete mode 100644 chart/infra-server/static/tls-cert.pem delete mode 100644 chart/infra-server/static/tls-key.pem create mode 100755 scripts/cert/renew.sh rename chart/infra-server/static/tls.conf => scripts/cert/tls.cnf (77%) diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md index 3e9b70333..f6a0ac718 100644 --- a/DEPLOYMENT.md +++ b/DEPLOYMENT.md @@ -71,6 +71,11 @@ To upload the local configuration which includes the consolidated values back to `make configuration-upload` +## Regenerating the localhost certificates for the gRPC gateway + +The connection for the gRPC gateway is secured by a self-generated "localhost" certificate. +To regenerate the certificate, run: `./scripts/cert/renew.sh `. + ## Creating a Tag for Release To create a full GitHub release, draft a new release from the console. diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md index 028b16d12..16c804632 100644 --- a/TROUBLESHOOTING.md +++ b/TROUBLESHOOTING.md @@ -10,10 +10,6 @@ GCP infra.rox.systems Zone https://console.cloud.google.com/net-services/dns/zones/infra-rox-systems?project=stackrox-infra&organizationId=847401270788 -Auth0 Application - -https://manage.auth0.com/dashboard/us/sr-dev/applications/AsyLUYxwV2GX2oG0PjwTXhMlxHuI7qmE/settings - Argo Releases and CLI https://github.com/argoproj/argo/releases @@ -64,16 +60,16 @@ Status: Running Created: Mon Jun 01 13:43:12 -0700 (42 seconds ago) Started: Mon Jun 01 13:43:12 -0700 (42 seconds ago) Duration: 42 seconds -Parameters: +Parameters: name: june1demo1 main-image: stackrox.io/main:3.0.43.1 scanner-image: stackrox.io/scanner:2.2.6 scanner-db-image: stackrox.io/scanner-db:2.2.6 STEP PODNAME DURATION ARTIFACTS MESSAGE - ● demo-mxgf9 (start) - ├---✔ roxctl (roxctl) demo-mxgf9-522422286 9s roxctl - └---● create (create) demo-mxgf9-3875809567 32s + ● demo-mxgf9 (start) + ├---✔ roxctl (roxctl) demo-mxgf9-522422286 9s roxctl + └---● create (create) demo-mxgf9-3875809567 32s ``` To get logs from a step, run: diff --git a/chart/infra-server/static/tls-cert.pem b/chart/infra-server/static/tls-cert.pem deleted file mode 100644 index 349e06ccd..000000000 --- a/chart/infra-server/static/tls-cert.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDaDCCAlCgAwIBAgIUHNR2H++vx1ox3n6i1rvtV6B5wIQwDQYJKoZIhvcNAQEL -BQAwYTELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcM -DU1vdW50YWluIFZpZXcxETAPBgNVBAoMCFN0YWNrUm94MRIwEAYDVQQDDAlsb2Nh -bGhvc3QwHhcNMjAxMjE3MDEwNDQ4WhcNMzAxMjE1MDEwNDQ4WjBhMQswCQYDVQQG -EwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmll -dzERMA8GA1UECgwIU3RhY2tSb3gxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJlHDmh4itw/qFuB5fgFWaTr+wwbvjuo -pImv+q2RAom3vbmFq5+qhPcp2pP6eXYgHgsBNHtBoUH6zAT4hjhg/vUbtiWRHrKT -LZp6UjK0a2dhO2ch/cY6ulkLVp/Gyh4RlptfFWVaCcSZRM8qk2gsPFHCScnTKLPA -a82KY3SscrblJFhlgJzYnVEBe3bCxc2E0UjglRNlZAso6m3EuPTDRaYj7AOefeqP -9w3LBg7xeBxVVqwcunxfLlvPCel77xOPYJaHR/tA6bY+D6dbFrpGRbbuLIyOOpE6 -malS9JHS29nGsfvcYcdPe5U6v/U1zfj4BOyPcDTyxToC4MKtEMLkmZMCAwEAAaMY -MBYwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQBVAXWD -337rC1+8xIgmGQlWh6/rJYteHfIKMxMdhaZG1B17IzmUfOzLCH5Ruk24jGgcsqDY -CIlPK4VWBJIDOJVySGI9Gswqszjs/RjBy0DCniJKDczBj1FGADbgICzkATyoUM3I -w1eNSxzTuNbjfeVbz65iVIrXoiXbqxCbEi2BrsGdECvu7gzfEr2XU9v3s2l14mmF -WWPg30dj7an96cFnc5xjiaIs/tAJp/uZRaaoTXILbprCpRtowhx1ej4xRgImPpfY -PpHfjfVSue+G5TpEDdIT49sQBhUBL/BgE+4oIzKaZmcKneUFdHWDoWD3h11PukAa -GidtNWc8OPYZMC9D ------END CERTIFICATE----- diff --git a/chart/infra-server/static/tls-key.pem b/chart/infra-server/static/tls-key.pem deleted file mode 100644 index 31fccc4e6..000000000 --- a/chart/infra-server/static/tls-key.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAmUcOaHiK3D+oW4Hl+AVZpOv7DBu+O6ikia/6rZECibe9uYWr -n6qE9ynak/p5diAeCwE0e0GhQfrMBPiGOGD+9Ru2JZEespMtmnpSMrRrZ2E7ZyH9 -xjq6WQtWn8bKHhGWm18VZVoJxJlEzyqTaCw8UcJJydMos8BrzYpjdKxytuUkWGWA -nNidUQF7dsLFzYTRSOCVE2VkCyjqbcS49MNFpiPsA5596o/3DcsGDvF4HFVWrBy6 -fF8uW88J6XvvE49glodH+0Dptj4Pp1sWukZFtu4sjI46kTqZqVL0kdLb2cax+9xh -x097lTq/9TXN+PgE7I9wNPLFOgLgwq0QwuSZkwIDAQABAoIBAQCWg1sXpX8eJniJ -WzZa5c4QkBXW3wtgBAuGlUNA2wu19rMckbFlOYoWN4hHFYfeQk2eGtHRUzIp20Aq -hW0vwbe7MzobC7UsQDBg6Er9NYPeYXF2pb9Qv+yrceHfRdLF0hmleqpE+zRqVONn -13QmsIGO+41/3ZWzZXm2vXVKZejDxRxmv7W1ol1COyHgi7blIoTPJNLmZqEynRTN -xjDn+M6hF1XogyicIToyBnWBED3gK0QNWVb4AG+FjuMXYJjNFopPx+dGjIUWepG2 -dIFi76erc0foVxYMxOng5RpZi9nykwsjtsgVNEAQBkQXfrAGfOkAa2OxTFMz3E7U -sOt7lgpBAoGBAMjyl3fC5OZj8q+qlxZMkzVA7xsJWJt4HTMkvbmR5nP1DKtwJemD -vStUVMQiH5TZ1tVjW6ZQpQxJz9EH+TBJQzn7gIjfEtqpGr4fYEqJ0RFuv6C5wdGx -DpPA21+B7FceeNqSrkqZmf5QSCnJMcyOiOZCQsgxH2OKNwaopQUVVRNhAoGBAMNF -Izhg3QZb6MtgjZ/iCBbKm+QqapGiWQeJZPIdegJANYhEWoWdUVtCYDnBnNB6cHQ9 -+PKXec3HI3h0iE9IMZq9d2nRP5VCRs4MY2r9nJhl8OH+tf8WSLGGYBNf97BzkevE -VKxgAjPnNtbs+29bcw5VoasWT6Rviuvd/U3zzAVzAoGATk3KHE8D54tXDIELMxNP -4daV1hFESAD8T+unSuLBzLnW4A9plp9RXcsU5QDvEY/5mVmIYzzVs/4nTysuPVSv -L68DnVJgBHkVBLUxTpp5r7NaVQVNs6qtJYJnecYlFKW5LmMuK7/DNEiQdkgCcdWx -Hxj+8QfDVYSMgLnC5EI1zsECgYEAjvwwVxcuoXppk4rnCZ0kmTPRRRj+IhgEIy2r -WlLVRZKo4FhVBKP2r+GBvqkUX+BYOfYrNdBPY6wfQBPswEk38XwtVbHgYjY+zKBr -qCt/IGT9Jy8xK1Gw9zVTYrySDYYC4uZHrlU7J7B2CplLX/ZR4Lw5fqL+vITk7+QE -mLEdwxsCgYA5jA7e6F90EbkH7eTpQfpUoUT0O+uw4E8m3EiV8+fHBzeaqn5MO3o/ -zQLYbGtiA4ZcZ1IzXsv8h8lmcNo68UeLExFaZlLR2RCx48WnGry9lDYiGvN4o9i+ -mFubz5csKMmptiLSSNEUJG9ZutpOS0LiIwDxVD9W2DDiRQt293ElyA== ------END RSA PRIVATE KEY----- diff --git a/chart/infra-server/templates/secrets.yaml b/chart/infra-server/templates/secrets.yaml index f54826a5f..5f6b38194 100644 --- a/chart/infra-server/templates/secrets.yaml +++ b/chart/infra-server/templates/secrets.yaml @@ -20,10 +20,10 @@ data: {{- tpl (required ".Values.oidc_yaml | b64dec) . | b64enc | nindent 4 is undefined" .Values.oidc_yaml | b64dec) . | b64enc | nindent 4 }} cert.pem: |- - {{- .Files.Get "static/tls-cert.pem" | b64enc | nindent 4 }} + {{ required ".Values.tls__cert_pem is undefined" .Values.tls__cert_pem | nindent 4 }} key.pem: |- - {{- .Files.Get "static/tls-key.pem" | b64enc | nindent 4 }} + {{ required ".Values.tls__key_pem is undefined" .Values.tls__key_pem | nindent 4 }} infra.yaml: |- {{ required ".Values.infra_yaml is undefined" .Values.infra_yaml }} diff --git a/scripts/cert/renew.sh b/scripts/cert/renew.sh new file mode 100755 index 000000000..3a09dc837 --- /dev/null +++ b/scripts/cert/renew.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +ENVIRONMENT="$1" +if [ -z "${ENVIRONMENT:-}" ]; then + echo "Usage: renew.sh " + exit 1 +fi + +path="chart/infra-server/configuration/$ENVIRONMENT/tls" +mkdir -p "$path" +openssl genrsa -out "$path/key.pem" 4096 +openssl req -nodes -new -x509 -sha256 -days 3650 -config scripts/cert/tls.cnf -extensions 'req_ext' -key "$path/key.pem" -out "$path/cert.pem" diff --git a/chart/infra-server/static/tls.conf b/scripts/cert/tls.cnf similarity index 77% rename from chart/infra-server/static/tls.conf rename to scripts/cert/tls.cnf index 04a708572..f9bf23d9f 100644 --- a/chart/infra-server/static/tls.conf +++ b/scripts/cert/tls.cnf @@ -1,9 +1,8 @@ # This is the configuration required to build the self signed cert used for SSL -# between the load balancer and infra server. i.e. to create tls-key.pem and -# tls-cert.pem. +# for gRPC gateway. # To renew: -# openssl genrsa -out tls-key.pem 2048 +# openssl genrsa -out tls-key.pem 4096 # openssl req -nodes -new -x509 -sha256 -days 3650 -config tls.conf -extensions 'req_ext' -key tls-key.pem -out tls-cert.pem [ req ] @@ -12,16 +11,16 @@ prompt = no default_md = sha256 req_extensions = req_ext distinguished_name = dn - + [ dn ] C = US ST = California L = Mountain View O = StackRox CN = localhost - + [ req_ext ] subjectAltName = @alt_names - + [ alt_names ] DNS.1 = localhost From c37b9c1609484a40284cf7a7d4f05fe27d6a1271 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 09:05:56 +0200 Subject: [PATCH 17/46] Bump golang.org/x/oauth2 from 0.11.0 to 0.12.0 (#985) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 924289d90..e9927de58 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 golang.org/x/net v0.15.0 - golang.org/x/oauth2 v0.11.0 + golang.org/x/oauth2 v0.12.0 google.golang.org/api v0.136.0 google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 google.golang.org/grpc v1.57.0 diff --git a/go.sum b/go.sum index ba045d803..d8201ed42 100644 --- a/go.sum +++ b/go.sum @@ -460,8 +460,8 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= -golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk= +golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= +golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= From 77caa6f140206a2403ef5da7af8da46468008875 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 09:06:16 +0200 Subject: [PATCH 18/46] Bump cloud.google.com/go/storage from 1.32.0 to 1.33.0 (#984) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e9927de58..1e8960ac9 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( cloud.google.com/go/bigquery v1.54.0 - cloud.google.com/go/storage v1.32.0 + cloud.google.com/go/storage v1.33.0 github.com/argoproj/argo-workflows/v3 v3.4.10 github.com/buger/jsonparser v1.1.1 github.com/coreos/go-oidc/v3 v3.6.0 diff --git a/go.sum b/go.sum index d8201ed42..beb3b1fe1 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ cloud.google.com/go/datacatalog v1.16.0 h1:qVeQcw1Cz93/cGu2E7TYUPh8Lz5dn5Ws2siIu cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU= cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI= -cloud.google.com/go/storage v1.32.0 h1:5w6DxEGOnktmJHarxAOUywxVW9lbNWIzlzzUltG/3+o= -cloud.google.com/go/storage v1.32.0/go.mod h1:Hhh/dogNRGca7IWv1RC2YqEn0c0G77ctA/OxflYkiD8= +cloud.google.com/go/storage v1.33.0 h1:PVrDOkIC8qQVa1P3SXGpQvfuJhN2LHOoyZvWs8D2X5M= +cloud.google.com/go/storage v1.33.0/go.mod h1:Hhh/dogNRGca7IWv1RC2YqEn0c0G77ctA/OxflYkiD8= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= From d026b80191e0f98c343fd72fda5d80d75edbd7cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Sep 2023 09:06:35 +0200 Subject: [PATCH 19/46] Bump github.com/slack-go/slack from 0.12.2 to 0.12.3 (#983) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 1e8960ac9..5bbd3a3f5 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/jeremywohl/flatten/v2 v2.0.0-20211013061545-07e4a09fb8e4 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 - github.com/slack-go/slack v0.12.2 + github.com/slack-go/slack v0.12.3 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index beb3b1fe1..f868c7826 100644 --- a/go.sum +++ b/go.sum @@ -350,8 +350,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ= -github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= +github.com/slack-go/slack v0.12.3 h1:92/dfFU8Q5XP6Wp5rr5/T5JHLM5c5Smtn53fhToAP88= +github.com/slack-go/slack v0.12.3/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= From 5fc8458872b8663d5cc08bc680ee455c0d651e26 Mon Sep 17 00:00:00 2001 From: Robot Rox <42458750+roxbot@users.noreply.github.com> Date: Mon, 18 Sep 2023 02:34:22 -0700 Subject: [PATCH 20/46] Bump demo versions to 4.2.0 (#991) Co-authored-by: alwayshooin --- chart/infra-server/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/infra-server/Chart.yaml b/chart/infra-server/Chart.yaml index 6e337b626..c18a6cc43 100644 --- a/chart/infra-server/Chart.yaml +++ b/chart/infra-server/Chart.yaml @@ -7,4 +7,4 @@ home: https://github.com/stackrox/infra sources: - https://github.com/stackrox/infra annotations: - acsDemoVersion: 4.1.3 + acsDemoVersion: 4.2.0 From f6dd5e94a11712667d9a5c648fb513400aa63797 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Mon, 18 Sep 2023 15:54:00 +0200 Subject: [PATCH 21/46] fix(cost report): sort flavors alphabetically for more consistent output (#992) --- scripts/cost-estimation/render_costs.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/cost-estimation/render_costs.py b/scripts/cost-estimation/render_costs.py index 4ee2bb0d7..a230dd490 100644 --- a/scripts/cost-estimation/render_costs.py +++ b/scripts/cost-estimation/render_costs.py @@ -48,6 +48,8 @@ def main(): usage = read_usage_from_stdin() cost_per_flavor_env = calculate_costs(usage) + cost_per_flavor_env.sort(key=lambda x: x["flavor"]) + print("```") print(tabulate( cost_per_flavor_env, From e7ce554c106b52fa099808aa8fda12165a3da5d8 Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Thu, 21 Sep 2023 17:16:01 +0200 Subject: [PATCH 22/46] chore: prepare release 0.7.12 (#993) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13f1af97f..18bc73691 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,19 @@ Please avoid adding duplicate information across this changelog and JIRA/doc inp ## [NEXT RELEASE] +## [0.7.12] + +- CLI: Add client-side cluster name validation +- Bump demo flavors to 4.2.0 + ## [0.7.11] + - Make the domain for GKE based demos configurable. - Revert the change that reduced the master node count of openshift-4 and openshift-4-demo flavors from 3 to 1 (default is now 3 again). ## [0.7.10] + - Fix for openshift-4-demo 4.2+ installs - Reduce the master node count of openshift-4 and openshift-4-demo flavors from 3 to 1 From 24d14dff51e502e531e5a9007ed027a536598044 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 21 Sep 2023 09:03:45 -0700 Subject: [PATCH 23/46] ROX-17123, ROX-19217: Move GKEs to a RH project (#963) --- CHANGELOG.md | 3 +- chart/infra-server/static/flavors.yaml | 2 +- chart/infra-server/static/workflow-demo.yaml | 36 ++++++++---------- .../static/workflow-gke-default.yaml | 4 +- .../infra-server/static/workflow-qa-demo.yaml | 38 +++++++++---------- .../infra-server/templates/demo/secrets.yaml | 17 ++++----- chart/infra-server/templates/gke/secrets.yaml | 2 +- .../templates/qa-demo/secrets.yaml | 18 --------- .../missing-parameter-descriptions.yaml | 4 +- flavor/testdata/test-gke-lite.yaml | 4 +- scripts/add-PR-comment-for-deploy-to-dev.sh | 10 ++--- workflows/gke-lite.yaml | 4 +- 12 files changed, 58 insertions(+), 84 deletions(-) delete mode 100644 chart/infra-server/templates/qa-demo/secrets.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 18bc73691..b11a96ddd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,9 @@ Please avoid adding duplicate information across this changelog and JIRA/doc inp ## [NEXT RELEASE] -## [0.7.12] +## [0.8.0] +- Switch GKE based flavors (gke-default, demo, qa-demo) to use a RH project (ROX-17123,ROX-19217) - CLI: Add client-side cluster name validation - Bump demo flavors to 4.2.0 diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index 48eb76155..d38fe4a55 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -139,7 +139,7 @@ value: "" kind: optional help: | - e.g. 1.19.12-gke.2100. Use 'gcloud container get-server-config --zone=us-central1 --project srox-temp-dev-test' to see all versions. + e.g. 1.19.12-gke.2100. Use 'gcloud container get-server-config --zone=us-central1 --project acs-team-temp-dev' to see all versions. - name: pod-security-policy description: Enable pod security policy diff --git a/chart/infra-server/static/workflow-demo.yaml b/chart/infra-server/static/workflow-demo.yaml index 476f81c65..d4af60acb 100644 --- a/chart/infra-server/static/workflow-demo.yaml +++ b/chart/infra-server/static/workflow-demo.yaml @@ -78,10 +78,10 @@ spec: path: /certs/cert.pem gcs: bucket: sr-demo-files - key: certs/demo.stackrox.com/privkey-plus-fullchain.pem + key: certs/demos.rox.systems/privkey-plus-fullchain.pem serviceAccountKeySecret: name: google-credentials-demo - key: google-credentials.json + key: read-certs-google-credentials.json outputs: artifacts: - name: kubeconfig @@ -106,13 +106,19 @@ spec: archive: none: {} + - name: admin-password + path: /data/central/password + optional: true + archive: + none: {} + - name: SSH_ACCESS path: /data/SSH_ACCESS.md archive: none: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-demo-0.7.11 + image: quay.io/stackrox-io/ci:automation-flavors-demo-0.8.0 imagePullPolicy: Always command: - /usr/bin/entrypoint @@ -121,8 +127,8 @@ spec: - "--name={{workflow.parameters.name}}" - "--main-image={{workflow.parameters.main-image}}" - "--central-db-image={{workflow.parameters.central-db-image}}" - - --gcp-project=srox-temp-sales-demos - - --dns-gcp-project=ultra-current-825 + - --gcp-project=acs-team-temp-dev + - --dns-gcp-project=acs-team-temp-dev - --creation-source=infra - --k8s-version={{workflow.parameters.k8s-version}} - --enable-psps={{workflow.parameters.enable-psps}} @@ -131,8 +137,8 @@ spec: mountPath: /tmp/google-credentials.json subPath: google-credentials.json - name: credentials - mountPath: /tmp/google-scanner-credentials.json - subPath: google-scanner-credentials.json + mountPath: /tmp/image-read-google-credentials.json + subPath: image-read-google-credentials.json env: - name: QUAY_RHACS_ENG_RO_USERNAME valueFrom: @@ -154,25 +160,15 @@ spec: secretKeyRef: name: demo-secrets key: STACKROX_IO_PASSWORD - - name: AUTH_CLIENT_ID - valueFrom: - secretKeyRef: - name: demo-secrets - key: AUTH_CLIENT_ID - - name: AUTH_DOMAIN - valueFrom: - secretKeyRef: - name: demo-secrets - key: AUTH_DOMAIN - name: SLACK_WEBHOOK valueFrom: secretKeyRef: name: demo-secrets key: SLACK_WEBHOOK - name: GCP_CLOUD_DNS_ZONE_NAME - value: "demo-stackrox-com" + value: "demos-rox-systems" - name: DOMAIN_NAME - value: "demo.stackrox.com" + value: "demos.rox.systems" - name: wait suspend: {} @@ -188,7 +184,7 @@ spec: path: /data/tfvars optional: true container: - image: quay.io/stackrox-io/ci:automation-flavors-demo-0.7.11 + image: quay.io/stackrox-io/ci:automation-flavors-demo-0.8.0 imagePullPolicy: Always command: - /usr/bin/entrypoint diff --git a/chart/infra-server/static/workflow-gke-default.yaml b/chart/infra-server/static/workflow-gke-default.yaml index e656408c2..367ec62a5 100644 --- a/chart/infra-server/static/workflow-gke-default.yaml +++ b/chart/infra-server/static/workflow-gke-default.yaml @@ -69,7 +69,7 @@ spec: - "--name={{workflow.parameters.name}}" - "--nodes={{workflow.parameters.nodes}}" - "--machine-type={{workflow.parameters.machine-type}}" - - --gcp-project=srox-temp-dev-test + - --gcp-project=acs-team-temp-dev - --creation-source=infra - --k8s-version={{workflow.parameters.k8s-version}} - --pod-security-policy={{workflow.parameters.pod-security-policy}} @@ -92,7 +92,7 @@ spec: args: - destroy - "--name={{workflow.parameters.name}}" - - --gcp-project=srox-temp-dev-test + - --gcp-project=acs-team-temp-dev - --gcp-zone={{workflow.parameters.gcp-zone}} volumeMounts: - name: credentials diff --git a/chart/infra-server/static/workflow-qa-demo.yaml b/chart/infra-server/static/workflow-qa-demo.yaml index d31b870db..a40f29771 100644 --- a/chart/infra-server/static/workflow-qa-demo.yaml +++ b/chart/infra-server/static/workflow-qa-demo.yaml @@ -29,7 +29,7 @@ spec: volumes: - name: credentials secret: - secretName: google-credentials-qa-demo + secretName: google-credentials-demo templates: - name: start @@ -85,10 +85,10 @@ spec: path: /certs/cert.pem gcs: bucket: sr-demo-files - key: certs/demo.stackrox.com/privkey-plus-fullchain.pem + key: certs/demos.rox.systems/privkey-plus-fullchain.pem serviceAccountKeySecret: name: google-credentials-demo - key: google-credentials.json + key: read-certs-google-credentials.json outputs: artifacts: @@ -110,13 +110,19 @@ spec: path: /data/url optional: true + - name: admin-password + path: /data/central/password + optional: true + archive: + none: {} + - name: SSH_ACCESS path: /data/SSH_ACCESS.md archive: none: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-demo-0.7.11 + image: quay.io/stackrox-io/ci:automation-flavors-demo-0.8.0 imagePullPolicy: Always command: - /usr/bin/entrypoint @@ -127,8 +133,8 @@ spec: - "--scanner-image={{workflow.parameters.scanner-image}}" - "--scanner-db-image={{workflow.parameters.scanner-db-image}}" - "--central-db-image={{workflow.parameters.central-db-image}}" - - --gcp-project=srox-temp-dev-test - - --dns-gcp-project=ultra-current-825 + - --gcp-project=acs-team-temp-dev + - --dns-gcp-project=acs-team-temp-dev - --creation-source=infra - --k8s-version={{workflow.parameters.k8s-version}} - --enable-psps={{workflow.parameters.enable-psps}} @@ -137,8 +143,8 @@ spec: mountPath: /tmp/google-credentials.json subPath: google-credentials.json - name: credentials - mountPath: /tmp/google-scanner-credentials.json - subPath: google-scanner-credentials.json + mountPath: /tmp/image-read-google-credentials.json + subPath: image-read-google-credentials.json env: - name: QUAY_RHACS_ENG_RO_USERNAME valueFrom: @@ -160,25 +166,15 @@ spec: secretKeyRef: name: demo-secrets key: STACKROX_IO_PASSWORD - - name: AUTH_CLIENT_ID - valueFrom: - secretKeyRef: - name: demo-secrets - key: AUTH_CLIENT_ID - - name: AUTH_DOMAIN - valueFrom: - secretKeyRef: - name: demo-secrets - key: AUTH_DOMAIN - name: SLACK_WEBHOOK valueFrom: secretKeyRef: name: demo-secrets key: SLACK_WEBHOOK - name: GCP_CLOUD_DNS_ZONE_NAME - value: "demo-stackrox-com" + value: "demos-rox-systems" - name: DOMAIN_NAME - value: "demo.stackrox.com" + value: "demos.rox.systems" - name: wait suspend: {} @@ -194,7 +190,7 @@ spec: path: /data/tfvars optional: true container: - image: quay.io/stackrox-io/ci:automation-flavors-demo-0.7.11 + image: quay.io/stackrox-io/ci:automation-flavors-demo-0.8.0 imagePullPolicy: Always command: - /usr/bin/entrypoint diff --git a/chart/infra-server/templates/demo/secrets.yaml b/chart/infra-server/templates/demo/secrets.yaml index 9c0e30042..db96794ec 100644 --- a/chart/infra-server/templates/demo/secrets.yaml +++ b/chart/infra-server/templates/demo/secrets.yaml @@ -11,11 +11,15 @@ metadata: data: # Service account used for provisioning demo infrastructure. google-credentials.json: |- - {{ required ".Values.demo__demo_provisioner_json is undefined" .Values.demo__demo_provisioner_json }} + {{ required ".Values.demo__gke_demo_provisioner_json is undefined" .Values.demo__gke_demo_provisioner_json }} + + # Service account used for demo Artifact Registry access. + image-read-google-credentials.json: |- + {{ required ".Values.demo__gke_demo_scanner_json is undefined" .Values.demo__gke_demo_scanner_json }} - # Service account used for demo GCR integration. - google-scanner-credentials.json: |- - {{ required ".Values.demo__google_scanner_credentials_json is undefined" .Values.demo__google_scanner_credentials_json }} + # Service account used for providing certs from the certifier sr-demo-files bucket. + read-certs-google-credentials.json: |- + {{ required ".Values.demo__demo_provisioner_json is undefined" .Values.demo__demo_provisioner_json }} --- @@ -43,11 +47,6 @@ data: STACKROX_IO_PASSWORD: |- {{ .Values.pullSecrets.stackrox.password | b64enc }} - AUTH_CLIENT_ID: |- - {{ .Values.auth0.clientID | b64enc }} - AUTH_DOMAIN: |- - {{ .Values.auth0.tenant | b64enc }} - SLACK_WEBHOOK: |- {{ .Values.slackWebhook | b64enc }} diff --git a/chart/infra-server/templates/gke/secrets.yaml b/chart/infra-server/templates/gke/secrets.yaml index 5b97699db..0cf1dda7b 100644 --- a/chart/infra-server/templates/gke/secrets.yaml +++ b/chart/infra-server/templates/gke/secrets.yaml @@ -10,6 +10,6 @@ metadata: data: google-credentials.json: |- - {{ required ".Values.gke__gke_credentials_json is undefined" .Values.gke__gke_credentials_json }} + {{ required ".Values.gke__gke_provisioner_json is undefined" .Values.gke__gke_provisioner_json }} --- diff --git a/chart/infra-server/templates/qa-demo/secrets.yaml b/chart/infra-server/templates/qa-demo/secrets.yaml deleted file mode 100644 index f70d5edef..000000000 --- a/chart/infra-server/templates/qa-demo/secrets.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- - -apiVersion: v1 -kind: Secret -type: Opaque - -metadata: - name: google-credentials-qa-demo - namespace: default - -data: - # Service account used for provisioning demo infrastructure. - google-credentials.json: |- - {{ required ".Values.qa_demo__qa_demo_provisioner_json is undefined" .Values.qa_demo__qa_demo_provisioner_json }} - - # Service account used for demo GCR integration. - google-scanner-credentials.json: |- - {{ required ".Values.demo__google_scanner_credentials_json is undefined" .Values.demo__google_scanner_credentials_json }} diff --git a/flavor/testdata/missing-parameter-descriptions.yaml b/flavor/testdata/missing-parameter-descriptions.yaml index d97d06a68..fb1fa3588 100644 --- a/flavor/testdata/missing-parameter-descriptions.yaml +++ b/flavor/testdata/missing-parameter-descriptions.yaml @@ -75,7 +75,7 @@ spec: - "--name={{workflow.parameters.name}}" - "--nodes={{workflow.parameters.nodes}}" - "--machine-type={{workflow.parameters.machine-type}}" - - --gcp-project=srox-temp-dev-test + - --gcp-project=acs-team-temp-dev - --creation-source=infra - --k8s-version={{workflow.parameters.k8s-version}} - --pod-security-policy={{workflow.parameters.pod-security-policy}} @@ -98,7 +98,7 @@ spec: args: - destroy - "--name={{workflow.parameters.name}}" - - --gcp-project=srox-temp-dev-test + - --gcp-project=acs-team-temp-dev - --gcp-zone={{workflow.parameters.gcp-zone}} volumeMounts: - name: credentials diff --git a/flavor/testdata/test-gke-lite.yaml b/flavor/testdata/test-gke-lite.yaml index 86beb20c2..593b64a43 100644 --- a/flavor/testdata/test-gke-lite.yaml +++ b/flavor/testdata/test-gke-lite.yaml @@ -78,7 +78,7 @@ spec: - "--name={{workflow.parameters.name}}" - "--nodes={{workflow.parameters.nodes}}" - "--machine-type={{workflow.parameters.machine-type}}" - - --gcp-project=srox-temp-dev-test + - --gcp-project=acs-team-temp-dev - --creation-source=infra - --k8s-version={{workflow.parameters.k8s-version}} - --pod-security-policy={{workflow.parameters.pod-security-policy}} @@ -101,7 +101,7 @@ spec: args: - destroy - "--name={{workflow.parameters.name}}" - - --gcp-project=srox-temp-dev-test + - --gcp-project=acs-team-temp-dev - --gcp-zone={{workflow.parameters.gcp-zone}} volumeMounts: - name: credentials diff --git a/scripts/add-PR-comment-for-deploy-to-dev.sh b/scripts/add-PR-comment-for-deploy-to-dev.sh index f72020b38..ffcfa23d2 100755 --- a/scripts/add-PR-comment-for-deploy-to-dev.sh +++ b/scripts/add-PR-comment-for-deploy-to-dev.sh @@ -28,7 +28,7 @@ CI will attempt to deploy {{.Env.IMAGE_NAME}} to it. :electric_plug: You can **connect** to this cluster with: \`\`\` -gcloud container clusters get-credentials {{.Env.DEV_CLUSTER_NAME}} --zone us-central1-a --project srox-temp-dev-test +gcloud container clusters get-credentials {{.Env.DEV_CLUSTER_NAME}} --zone us-central1-a --project acs-team-temp-dev \`\`\` :hammer_and_wrench: And pull **infractl** from the deployed dev infra-server with: @@ -56,10 +56,10 @@ make install-local ### Logs -Logs for the development infra depending on your @stackrox.com authuser: -- [authuser=0](https://console.cloud.google.com/logs/query;query=resource.labels.cluster_name%3D%22{{.Env.DEV_CLUSTER_NAME}}%22%0Aresource.labels.container_name%3D%22infra-server%22?project=srox-temp-dev-test&authuser=0) -- [authuser=1](https://console.cloud.google.com/logs/query;query=resource.labels.cluster_name%3D%22{{.Env.DEV_CLUSTER_NAME}}%22%0Aresource.labels.container_name%3D%22infra-server%22?project=srox-temp-dev-test&authuser=1) -- [authuser=2](https://console.cloud.google.com/logs/query;query=resource.labels.cluster_name%3D%22{{.Env.DEV_CLUSTER_NAME}}%22%0Aresource.labels.container_name%3D%22infra-server%22?project=srox-temp-dev-test&authuser=2) +Logs for the development infra depending on your @redhat.com authuser: +- [authuser=0](https://console.cloud.google.com/logs/query;query=resource.labels.cluster_name%3D%22{{.Env.DEV_CLUSTER_NAME}}%22%0Aresource.labels.container_name%3D%22infra-server%22?project=acs-team-temp-dev&authuser=0) +- [authuser=1](https://console.cloud.google.com/logs/query;query=resource.labels.cluster_name%3D%22{{.Env.DEV_CLUSTER_NAME}}%22%0Aresource.labels.container_name%3D%22infra-server%22?project=acs-team-temp-dev&authuser=1) +- [authuser=2](https://console.cloud.google.com/logs/query;query=resource.labels.cluster_name%3D%22{{.Env.DEV_CLUSTER_NAME}}%22%0Aresource.labels.container_name%3D%22infra-server%22?project=acs-team-temp-dev&authuser=2) Or: \`\`\` diff --git a/workflows/gke-lite.yaml b/workflows/gke-lite.yaml index b432368be..099878d59 100644 --- a/workflows/gke-lite.yaml +++ b/workflows/gke-lite.yaml @@ -86,7 +86,7 @@ spec: - "--name={{workflow.parameters.name}}" - "--nodes={{workflow.parameters.nodes}}" - "--machine-type={{workflow.parameters.machine-type}}" - - --gcp-project=srox-temp-dev-test + - --gcp-project=acs-team-temp-dev - --creation-source=infra - --k8s-version={{workflow.parameters.k8s-version}} - --pod-security-policy={{workflow.parameters.pod-security-policy}} @@ -109,7 +109,7 @@ spec: args: - destroy - "--name={{workflow.parameters.name}}" - - --gcp-project=srox-temp-dev-test + - --gcp-project=acs-team-temp-dev - --gcp-zone={{workflow.parameters.gcp-zone}} volumeMounts: - name: credentials From b72b20a01ba985b2bdd049bd6613dbcb612c1dc3 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Fri, 22 Sep 2023 09:39:49 -0700 Subject: [PATCH 24/46] Allow PRs to pull images (#999) --- chart/infra-server/templates/deployment.yaml | 6 ++++++ chart/infra-server/templates/secrets.yaml | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/chart/infra-server/templates/deployment.yaml b/chart/infra-server/templates/deployment.yaml index 088e7e546..70da8484b 100644 --- a/chart/infra-server/templates/deployment.yaml +++ b/chart/infra-server/templates/deployment.yaml @@ -55,3 +55,9 @@ spec: - name: configuration secret: secretName: infra-server-secrets + +{{ if eq .Values.deployment "local" }} + + imagePullSecrets: + - name: infra-image-registry-pull-secret +{{ end }} diff --git a/chart/infra-server/templates/secrets.yaml b/chart/infra-server/templates/secrets.yaml index 5f6b38194..1252d070b 100644 --- a/chart/infra-server/templates/secrets.yaml +++ b/chart/infra-server/templates/secrets.yaml @@ -79,3 +79,19 @@ data: {{- .Files.Get "static/test-connect-artifact.yaml" | b64enc | nindent 4 }} {{ end }} + +{{ if eq .Values.deployment "local" }} +--- + +apiVersion: v1 +kind: Secret +type: kubernetes.io/dockerconfigjson + +metadata: + name: infra-image-registry-pull-secret + namespace: infra + +data: + .dockerconfigjson: {{ .Values.pullSecrets.stackroxInfraGCR }} + +{{ end }} From 3867de6e3854bb627177eecee83bbe83f78e3e78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 09:41:03 -0700 Subject: [PATCH 25/46] Bump k8s.io/api from 0.28.1 to 0.28.2 (#996) --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 5bbd3a3f5..ef60b12b3 100644 --- a/go.mod +++ b/go.mod @@ -29,8 +29,8 @@ require ( google.golang.org/grpc v1.57.0 google.golang.org/protobuf v1.31.0 gopkg.in/square/go-jose.v2 v2.6.0 - k8s.io/api v0.28.1 - k8s.io/apimachinery v0.28.1 + k8s.io/api v0.28.2 + k8s.io/apimachinery v0.28.2 k8s.io/client-go v0.28.1 ) diff --git a/go.sum b/go.sum index f868c7826..80724c6d5 100644 --- a/go.sum +++ b/go.sum @@ -615,11 +615,11 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.17.8/go.mod h1:N++Llhs8kCixMUoCaXXAyMMPbo8dDVnh+IQ36xZV2/0= -k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= -k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg= +k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= +k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= k8s.io/apimachinery v0.17.8/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbbA= -k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= -k8s.io/apimachinery v0.28.1/go.mod h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw= +k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= +k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= k8s.io/client-go v0.17.8/go.mod h1:SJsDS64AAtt9VZyeaQMb4Ck5etCitZ/FwajWdzua5eY= k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= From 0793527bdd63c95bb678705dcde969b3e25c3543 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 09:41:54 -0700 Subject: [PATCH 26/46] Bump cloud.google.com/go/bigquery from 1.54.0 to 1.55.0 (#995) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ef60b12b3..5c49e266e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/stackrox/infra go 1.20 require ( - cloud.google.com/go/bigquery v1.54.0 + cloud.google.com/go/bigquery v1.55.0 cloud.google.com/go/storage v1.33.0 github.com/argoproj/argo-workflows/v3 v3.4.10 github.com/buger/jsonparser v1.1.1 diff --git a/go.sum b/go.sum index 80724c6d5..60fb4bb83 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= -cloud.google.com/go/bigquery v1.54.0 h1:ify6s7sy+kQuAimRnVTrPUzaeY0+X5GEsKt2C5CiA8w= -cloud.google.com/go/bigquery v1.54.0/go.mod h1:9Y5I3PN9kQWuid6183JFhOGOW3GcirA5LpsKCUn+2ec= +cloud.google.com/go/bigquery v1.55.0 h1:hs44Xxov3XLWQiCx2J8lK5U/ihLqnpm4RVVl5fdtLLI= +cloud.google.com/go/bigquery v1.55.0/go.mod h1:9Y5I3PN9kQWuid6183JFhOGOW3GcirA5LpsKCUn+2ec= cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= cloud.google.com/go/compute v1.23.0/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= From e8bb1c719079e47502c01eb8d3782491dc653b9f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 09:43:44 -0700 Subject: [PATCH 27/46] Bump google.golang.org/api from 0.136.0 to 0.142.0 (#994) --- go.mod | 8 ++++---- go.sum | 34 ++++++++-------------------------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/go.mod b/go.mod index 5c49e266e..67cd45616 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/stretchr/testify v1.8.4 golang.org/x/net v0.15.0 golang.org/x/oauth2 v0.12.0 - google.golang.org/api v0.136.0 + google.golang.org/api v0.142.0 google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 google.golang.org/grpc v1.57.0 google.golang.org/protobuf v1.31.0 @@ -60,7 +60,7 @@ require ( golang.org/x/sync v0.3.0 // indirect golang.org/x/tools v0.9.1 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect ) require ( @@ -89,8 +89,8 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/s2a-go v0.1.4 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect diff --git a/go.sum b/go.sum index 60fb4bb83..30f99faa6 100644 --- a/go.sum +++ b/go.sum @@ -57,16 +57,10 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/colinmarc/hdfs/v2 v2.4.0 h1:v6R8oBx/Wu9fHpdPoJJjpGSUxo8NhHIwrwsfhFvU9W0= github.com/colinmarc/hdfs/v2 v2.4.0/go.mod h1:0NAO+/3knbMx6+5pCv+Hcbaz4xn/Zzbn9+WIib2rKVI= github.com/coreos/go-oidc/v3 v3.6.0 h1:AKVxfYw1Gmkn/w96z0DbT/B/xFnzTd3MkZvWLjF4n/o= @@ -89,8 +83,6 @@ github.com/emicklei/go-restful/v3 v3.10.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRr github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= @@ -153,10 +145,8 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= @@ -185,12 +175,12 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= -github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -394,7 +384,6 @@ github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaD go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= @@ -412,7 +401,6 @@ golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= @@ -448,7 +436,6 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= @@ -485,7 +472,6 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -508,9 +494,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= @@ -543,8 +527,8 @@ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3j golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.136.0 h1:e/6enzUE1s4tGPa6Q3ZYShKTtvRc+1Jq0rrafhppmOs= -google.golang.org/api v0.136.0/go.mod h1:XtJfF+V2zgUxelOn5Zs3kECtluMxneJG8ZxUTlLNTPA= +google.golang.org/api v0.142.0 h1:mf+7EJ94fi5ZcnpPy+m0Yv2dkz8bKm+UL0snTCuwXlY= +google.golang.org/api v0.142.0/go.mod h1:zJAN5o6HRqR7O+9qJUFOWrZkYE66RH+efPBdTLA4xBA= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -561,8 +545,8 @@ google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWof google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 h1:wukfNtZmZUurLN/atp2hiIeTKn7QJWIQdHzqmsOnAOk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb h1:Isk1sSH7bovx8Rti2wZK0UZF6oraBDK74uoyLEEVFN0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -570,8 +554,6 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= From 9001ef8f92b136ee5465375c25e699bb73d9471a Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Fri, 22 Sep 2023 12:35:36 -0700 Subject: [PATCH 28/46] Remove tailwind CSS from full page spinner (#1000) --- ui/src/components/FullPageSpinner.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/components/FullPageSpinner.tsx b/ui/src/components/FullPageSpinner.tsx index 0adf3891f..916197353 100644 --- a/ui/src/components/FullPageSpinner.tsx +++ b/ui/src/components/FullPageSpinner.tsx @@ -3,9 +3,9 @@ import { RingLoader } from 'react-spinners'; export default function FullPageSpinner(): ReactElement { return ( -
+
- Loading... + Loading...
); } From 4f371fc1cc3fd574f026dbca6551d7c382e0731b Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 28 Sep 2023 10:33:59 -0700 Subject: [PATCH 29/46] Add certifier for *.internal-registry.ci.rox.systems (#1005) --- .github/workflows/build-and-push.yaml | 7 +++- certifier/Dockerfile | 2 +- certifier/Makefile | 34 +++++++++++++++--- certifier/main.go | 6 ++++ .../templates/demo-certifier.yaml | 36 +++++++++++++++++++ 5 files changed, 79 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml index 250978e57..55f49c1dd 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.github/workflows/build-and-push.yaml @@ -44,10 +44,14 @@ jobs: run: | make unit-test - - name: Build + - name: Build Infra Server run: | make image + - name: Build Certifier + run: | + cd certifier && make image + - name: Login for image push uses: docker/login-action@v2 with: @@ -58,3 +62,4 @@ jobs: - name: Push run: | make push + cd certifier && make push diff --git a/certifier/Dockerfile b/certifier/Dockerfile index 98d6b2538..de7905473 100644 --- a/certifier/Dockerfile +++ b/certifier/Dockerfile @@ -1,4 +1,4 @@ -FROM certbot/dns-google:v0.38.0 +FROM certbot/dns-google:v2.6.0 COPY certifier /usr/local/bin/certifier diff --git a/certifier/Makefile b/certifier/Makefile index 2489e9704..26322ecdc 100644 --- a/certifier/Makefile +++ b/certifier/Makefile @@ -1,4 +1,30 @@ -.PHONY: build -build: - GOOS=linux GOARCH=amd64 go build -o certifier -ldflags='-s -w' *.go - docker build -t certifier:latest . \ No newline at end of file +.PHONY: all +all: image + +TAG=$(shell git describe --tags --abbrev=10 --long) +TAGGED=$(shell git tag --contains | head) +ifneq (,$(TAGGED)) + # We're tagged. Use the tag explicitly. + VERSION := $(TAGGED) +else + # We're on a dev/PR branch + VERSION := $(TAG) +endif + +.PHONY: tag +tag: + @echo $(VERSION) + +IMAGE=us.gcr.io/stackrox-infra/certifier:$(VERSION) +.PHONY: image-name +image-name: + @echo $(IMAGE) + +.PHONY: image +image: + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o certifier -ldflags='-s -w' *.go + docker build -t $(IMAGE) . + +.PHONY: push +push: + docker push $(IMAGE) | cat diff --git a/certifier/main.go b/certifier/main.go index 935ff218d..124e044ed 100644 --- a/certifier/main.go +++ b/certifier/main.go @@ -28,6 +28,7 @@ type config struct { GCSBucket string GCSPrefix string GoogleCredentialsFile string + GoogleProject string RenewalDays int } @@ -47,6 +48,7 @@ func mainCmd() error { flag.StringVar(&cfg.GCSBucket, "gcs-bucket", "", "") flag.StringVar(&cfg.GCSPrefix, "gcs-prefix", "", "") flag.IntVar(&cfg.RenewalDays, "renewal-days", 15, "") + flag.StringVar(&cfg.GoogleProject, "gcp-project-name", "", "") flag.Parse() googleCredentialsFile, found := os.LookupEnv("GOOGLE_APPLICATION_CREDENTIALS") @@ -165,6 +167,10 @@ func buildCertbotCommand(cfg config) *exec.Cmd { args = append(args, "--domains", cfg.AlternativeNames) } + if cfg.GoogleProject != "" { + args = append(args, "--dns-google-project", cfg.GoogleProject) + } + cmd := exec.Command("certbot", args...) cmd.Stdin = nil cmd.Stdout = os.Stdout diff --git a/chart/infra-server/templates/demo-certifier.yaml b/chart/infra-server/templates/demo-certifier.yaml index 03aec7574..4989226ff 100644 --- a/chart/infra-server/templates/demo-certifier.yaml +++ b/chart/infra-server/templates/demo-certifier.yaml @@ -81,4 +81,40 @@ spec: - name: configuration secret: secretName: demo-certifier-credentials + +--- + +apiVersion: batch/v1 +kind: CronJob +metadata: + name: demo-certifier-internal-registry-ci-rox-systems + namespace: infra +spec: + schedule: "@weekly" + jobTemplate: + spec: + template: + spec: + containers: + - name: certifier + image: us.gcr.io/stackrox-infra/certifier:0.8.0-11-ga083b2097a + imagePullPolicy: IfNotPresent + args: + - --common-name=*.internal-registry.ci.rox.systems + - --cert-name=internal-registry.ci.rox.systems + - --gcs-bucket=sr-demo-files + - --gcs-prefix=certs + - --gcp-project-name=stackrox-ci + env: + - name: GOOGLE_APPLICATION_CREDENTIALS + value: /configuration/google-credentials.json + volumeMounts: + - mountPath: /configuration + name: configuration + readOnly: true + restartPolicy: Never + volumes: + - name: configuration + secret: + secretName: demo-certifier-credentials {{ end }} From e14dc929558ebd70d88e279965ef352a3354452d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:53:08 +0200 Subject: [PATCH 30/46] Bump k8s.io/client-go from 0.28.1 to 0.28.2 (#1009) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 67cd45616..38cb3ca26 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 k8s.io/api v0.28.2 k8s.io/apimachinery v0.28.2 - k8s.io/client-go v0.28.1 + k8s.io/client-go v0.28.2 ) require ( diff --git a/go.sum b/go.sum index 30f99faa6..a622b9495 100644 --- a/go.sum +++ b/go.sum @@ -603,8 +603,8 @@ k8s.io/apimachinery v0.17.8/go.mod h1:Lg8zZ5iC/O8UjCqW6DNhcQG2m4TdjF9kwG3891OWbb k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= k8s.io/client-go v0.17.8/go.mod h1:SJsDS64AAtt9VZyeaQMb4Ck5etCitZ/FwajWdzua5eY= -k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= -k8s.io/client-go v0.28.1/go.mod h1:pEZA3FqOsVkCc07pFVzK076R+P/eXqsgx5zuuRWukNE= +k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= +k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= From d1ef2b28c34f31c682eeb029582e99c479cf3d54 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:53:34 +0200 Subject: [PATCH 31/46] Bump github.com/argoproj/argo-workflows/v3 from 3.4.10 to 3.4.11 (#1007) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 38cb3ca26..54448b5b6 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( cloud.google.com/go/bigquery v1.55.0 cloud.google.com/go/storage v1.33.0 - github.com/argoproj/argo-workflows/v3 v3.4.10 + github.com/argoproj/argo-workflows/v3 v3.4.11 github.com/buger/jsonparser v1.1.1 github.com/coreos/go-oidc/v3 v3.6.0 github.com/dgrijalva/jwt-go v3.2.0+incompatible diff --git a/go.sum b/go.sum index a622b9495..32230ebbe 100644 --- a/go.sum +++ b/go.sum @@ -44,8 +44,8 @@ github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/argoproj/argo-events v1.7.3 h1:XiGnKCzRRQCI7sFCKw3RoeFUOR6IupfAJI9uUK7pnG8= github.com/argoproj/argo-events v1.7.3/go.mod h1:YxDOXrveW52SDAeeTI93Wagkr4jt5DK0dA0juIdWDRw= -github.com/argoproj/argo-workflows/v3 v3.4.10 h1:kdv2VLWpE7qeL6lnL99dLA6wNav53XrrNAA9OIawkxs= -github.com/argoproj/argo-workflows/v3 v3.4.10/go.mod h1:qUfxOxQfgpB074EeoTT1nd3iX2G05PEx+ct1NNvAR0U= +github.com/argoproj/argo-workflows/v3 v3.4.11 h1:WtnK7WngXKzFC7P4oFDT9NTucs7kV6+YthhcPSlbrpQ= +github.com/argoproj/argo-workflows/v3 v3.4.11/go.mod h1:qUfxOxQfgpB074EeoTT1nd3iX2G05PEx+ct1NNvAR0U= github.com/argoproj/pkg v0.13.6 h1:36WPD9MNYECHcO1/R1pj6teYspiK7uMQLCgLGft2abM= github.com/argoproj/pkg v0.13.6/go.mod h1:I698DoJBKuvNFaixh4vFl2C88cNIT1WS7KCbz5ewyF8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= From 26d7f3e413937dc1c8437cc3b5e245ea3daaf64b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 12:54:02 +0200 Subject: [PATCH 32/46] Bump google.golang.org/api from 0.142.0 to 0.143.0 (#1008) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 12 ++++++------ go.sum | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 54448b5b6..66d314491 100644 --- a/go.mod +++ b/go.mod @@ -24,8 +24,8 @@ require ( github.com/stretchr/testify v1.8.4 golang.org/x/net v0.15.0 golang.org/x/oauth2 v0.12.0 - google.golang.org/api v0.142.0 - google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 + google.golang.org/api v0.143.0 + google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb google.golang.org/grpc v1.57.0 google.golang.org/protobuf v1.31.0 gopkg.in/square/go-jose.v2 v2.6.0 @@ -59,12 +59,12 @@ require ( golang.org/x/mod v0.10.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/tools v0.9.1 // indirect - google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect ) require ( - cloud.google.com/go v0.110.6 // indirect + cloud.google.com/go v0.110.7 // indirect cloud.google.com/go/compute v1.23.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.1 // indirect @@ -91,7 +91,7 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/google/uuid v1.3.1 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.1 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect diff --git a/go.sum b/go.sum index 32230ebbe..6587f85fe 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.110.6 h1:8uYAkj3YHTP/1iwReuHPxLSbdcyc+dSBbzFMrVwDR6Q= -cloud.google.com/go v0.110.6/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= +cloud.google.com/go v0.110.7 h1:rJyC7nWRg2jWGZ4wSJ5nY65GTdYJkg0cd/uXb+ACI6o= +cloud.google.com/go v0.110.7/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/bigquery v1.55.0 h1:hs44Xxov3XLWQiCx2J8lK5U/ihLqnpm4RVVl5fdtLLI= cloud.google.com/go/bigquery v1.55.0/go.mod h1:9Y5I3PN9kQWuid6183JFhOGOW3GcirA5LpsKCUn+2ec= cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY= @@ -181,8 +181,8 @@ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= -github.com/googleapis/enterprise-certificate-proxy v0.2.5/go.mod h1:RxW0N9901Cko1VOCW3SXCpWP+mlIEkk2tP7jnHy9a3w= +github.com/googleapis/enterprise-certificate-proxy v0.3.1 h1:SBWmZhjUDRorQxrN0nwzf+AHBxnbFjViHQS4P0yVpmQ= +github.com/googleapis/enterprise-certificate-proxy v0.3.1/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= @@ -527,8 +527,8 @@ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3j golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.142.0 h1:mf+7EJ94fi5ZcnpPy+m0Yv2dkz8bKm+UL0snTCuwXlY= -google.golang.org/api v0.142.0/go.mod h1:zJAN5o6HRqR7O+9qJUFOWrZkYE66RH+efPBdTLA4xBA= +google.golang.org/api v0.143.0 h1:o8cekTkqhywkbZT6p1UHJPZ9+9uuCAJs/KYomxZB8fA= +google.golang.org/api v0.143.0/go.mod h1:FoX9DO9hT7DLNn97OuoZAGSDuNAXdJRuGK98rSUgurk= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -541,12 +541,12 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWofoFcihmDEMYeDR9KN/ThbPWGrh++g= -google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8= -google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= -google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb h1:Isk1sSH7bovx8Rti2wZK0UZF6oraBDK74uoyLEEVFN0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTbz4Zk2h7Mh+eis4nfJEFQFYzJzuIA= +google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI= +google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= From d374894fbad5b3e0653568a0fc46d96622fb2cd2 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Fri, 29 Sep 2023 09:49:14 -0700 Subject: [PATCH 33/46] Switch Modal to patternfly (#1001) --- ui/package.json | 2 - ui/src/components/InformationalModal.tsx | 7 +-- ui/src/components/Modal.tsx | 25 ++++------- .../ClusterInfoPage/DeleteClusterModal.tsx | 38 +++++++--------- .../DownloadArtifactsModal.tsx | 44 ++++++++++++------- .../ClusterInfoPage/MutableLifespan.tsx | 6 +-- ui/yarn.lock | 29 +----------- 7 files changed, 57 insertions(+), 94 deletions(-) diff --git a/ui/package.json b/ui/package.json index a76dd6e91..56b5564db 100644 --- a/ui/package.json +++ b/ui/package.json @@ -35,7 +35,6 @@ "react": "^17.0.1", "react-dom": "^17.0.1", "react-feather": "^2.0.9", - "react-modal": "^3.16.1", "react-router-dom": "^6.14.1", "react-spinners": "^0.13.8", "use-clipboard-copy": "^0.2.0", @@ -51,7 +50,6 @@ "@types/node": "^20.5.4", "@types/react": "^17.0.20", "@types/react-dom": "^17.0.9", - "@types/react-modal": "^3.16.0", "autoprefixer": "^10.4.14", "eslint-config-airbnb-typescript": "^12.0.0", "eslint-config-prettier": "^7.2.0", diff --git a/ui/src/components/InformationalModal.tsx b/ui/src/components/InformationalModal.tsx index 9fb2fcfff..444ead80d 100644 --- a/ui/src/components/InformationalModal.tsx +++ b/ui/src/components/InformationalModal.tsx @@ -1,4 +1,5 @@ import React, { ReactElement, ReactNode } from 'react'; +import { Button } from '@patternfly/react-core'; import Modal from 'components/Modal'; @@ -22,13 +23,13 @@ export default function InformationalModal({ onAcknowledged, }: Props): ReactElement { const button = ( - + ); return ( - + {children} ); diff --git a/ui/src/components/Modal.tsx b/ui/src/components/Modal.tsx index 0c77555f2..b6f7bcc21 100644 --- a/ui/src/components/Modal.tsx +++ b/ui/src/components/Modal.tsx @@ -1,5 +1,5 @@ import React, { ReactElement, ReactNode } from 'react'; -import ReactModal from 'react-modal'; +import { Modal, ModalVariant } from '@patternfly/react-core'; type Props = { isOpen: boolean; @@ -7,31 +7,24 @@ type Props = { header: string; children: ReactNode; buttons?: ReactNode; - className?: string; }; -export default function Modal({ +export default function ({ isOpen, onRequestClose, header, children, buttons, - className = '', }: Props): ReactElement { return ( - -

{header}

-
- {children} - {buttons &&
{buttons}
} -
- + {children} + ); } diff --git a/ui/src/containers/ClusterInfoPage/DeleteClusterModal.tsx b/ui/src/containers/ClusterInfoPage/DeleteClusterModal.tsx index f025fc829..25be51cfe 100644 --- a/ui/src/containers/ClusterInfoPage/DeleteClusterModal.tsx +++ b/ui/src/containers/ClusterInfoPage/DeleteClusterModal.tsx @@ -1,5 +1,5 @@ import React, { ReactElement } from 'react'; -import { AlertCircle, CheckCircle } from 'react-feather'; +import { Button } from '@patternfly/react-core'; import { ClipLoader } from 'react-spinners'; import { V1Cluster, ClusterServiceApi } from 'generated/client'; @@ -27,16 +27,14 @@ export default function DeleteClusterModal({ cluster, onCancel, onDeleted }: Pro if (!called) { // waiting for user confirmation - const buttons = ( - <> - - - - ); + const buttons = [ + , + , + ]; return ( - This action cannot be undone. + + This action cannot be undone. + ); } @@ -54,9 +54,7 @@ export default function DeleteClusterModal({ cluster, onCancel, onDeleted }: Pro // waiting for server response return ( {}} header={`Deleting ${cluster.ID}...`}> -
- -
+ ); } @@ -66,10 +64,7 @@ export default function DeleteClusterModal({ cluster, onCancel, onDeleted }: Pro const message = `Cannot delete cluster. Server error occurred: "${error.message}".`; return ( -
- - {message} -
+ {message} ); } @@ -78,10 +73,7 @@ export default function DeleteClusterModal({ cluster, onCancel, onDeleted }: Pro const message = `Cluster ${cluster.ID} is being destroyed now.`; return ( -
- - {message} -
+ {message} ); } diff --git a/ui/src/containers/ClusterInfoPage/DownloadArtifactsModal.tsx b/ui/src/containers/ClusterInfoPage/DownloadArtifactsModal.tsx index 6fe89d9aa..f205dcf62 100644 --- a/ui/src/containers/ClusterInfoPage/DownloadArtifactsModal.tsx +++ b/ui/src/containers/ClusterInfoPage/DownloadArtifactsModal.tsx @@ -1,10 +1,10 @@ import React, { ReactElement, useCallback } from 'react'; +import { Button, List, ListItem } from '@patternfly/react-core'; import { V1Cluster, ClusterServiceApi, V1Artifact } from 'generated/client'; import configuration from 'client/configuration'; import Modal from 'components/Modal'; import useApiQuery from 'client/useApiQuery'; -import { X } from 'react-feather'; import assertDefined from 'utils/assertDefined'; const clusterService = new ClusterServiceApi(configuration); @@ -15,16 +15,23 @@ type ArtifactsListProps = { function ArtifactsList({ artifacts }: ArtifactsListProps): ReactElement { return ( - + + {artifacts + .sort((a, b) => { + if (a.Description && !b.Description) { + return -1; + } + if (!a.Description && b.Description) { + return 1; + } + return a.Name && b.Name ? a.Name.localeCompare(b.Name) : 0; + }) + .map((artifact) => ( + + {artifact.Name} - {artifact.Description} + + ))} + ); } @@ -50,8 +57,11 @@ function Artifacts({ cluster }: ArtifactsProps): ReactElement { return (
-

Note: You can download all artifacts at the command line with:

- infractl artifacts --download-dir=<some dir> {cluster.ID} +

+ Note: You can download all artifacts at the command line with: +
+ infractl artifacts --download-dir=<some dir> {cluster.ID} +

); } @@ -68,9 +78,9 @@ export default function DownloadArtifactsModal({ cluster, onClose }: Props): Rea assertDefined(cluster.ID); const closeButton = ( - + ); return ( @@ -78,7 +88,7 @@ export default function DownloadArtifactsModal({ cluster, onClose }: Props): Rea isOpen onRequestClose={onClose} header={`Artifacts for ${cluster.ID}`} - buttons={closeButton} + buttons={[closeButton]} > diff --git a/ui/src/containers/ClusterInfoPage/MutableLifespan.tsx b/ui/src/containers/ClusterInfoPage/MutableLifespan.tsx index e595693e8..ef211c0bf 100644 --- a/ui/src/containers/ClusterInfoPage/MutableLifespan.tsx +++ b/ui/src/containers/ClusterInfoPage/MutableLifespan.tsx @@ -5,7 +5,6 @@ import Lifespan, { lifespanToDuration } from 'components/Lifespan'; import { V1Cluster, ClusterServiceApi } from 'generated/client'; import configuration from 'client/configuration'; import InformationalModal from 'components/InformationalModal'; -import { AlertCircle } from 'react-feather'; const clusterService = new ClusterServiceApi(configuration); @@ -27,10 +26,7 @@ export default function MutableLifespan({ cluster }: Props): ReactElement { header="Cannot change the cluster lifespan" onAcknowledged={(): void => setError(null)} > -
- - {message} -
+ {message} ); } diff --git a/ui/yarn.lock b/ui/yarn.lock index 5e01eac00..ffbb6fb60 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -2151,13 +2151,6 @@ dependencies: "@types/react" "*" -"@types/react-modal@^3.16.0": - version "3.16.0" - resolved "https://registry.yarnpkg.com/@types/react-modal/-/react-modal-3.16.0.tgz#b8d6be10de894139a2ea9f4a2505b1b5d02023df" - integrity sha512-iphdqXAyUfByLbxJn5j6d+yh93dbMgshqGP0IuBeaKbZXx0aO+OXsvEkt6QctRdxjeM9/bR+Gp3h9F9djVWTQQ== - dependencies: - "@types/react" "*" - "@types/react@*", "@types/react@^17.0.20": version "17.0.20" resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz#a4284b184d47975c71658cd69e759b6bd37c3b8c" @@ -5417,11 +5410,6 @@ execa@^4.0.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -exenv@^1.2.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d" - integrity sha1-KueOhdmJQVhnCwPUe+wfA72Ru50= - exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -10138,21 +10126,6 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== -react-lifecycles-compat@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" - integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== - -react-modal@^3.16.1: - version "3.16.1" - resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.16.1.tgz#34018528fc206561b1a5467fc3beeaddafb39b2b" - integrity sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg== - dependencies: - exenv "^1.2.0" - prop-types "^15.7.2" - react-lifecycles-compat "^3.0.0" - warning "^4.0.3" - react-refresh@^0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f" @@ -12256,7 +12229,7 @@ walker@^1.0.7, walker@~1.0.5: dependencies: makeerror "1.0.x" -warning@^4.0.0, warning@^4.0.3: +warning@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== From ff5385d3d84c87e73950115bfbca72ce83d38972 Mon Sep 17 00:00:00 2001 From: Stephan Hesselmann Date: Sat, 30 Sep 2023 04:41:16 +0200 Subject: [PATCH 34/46] ROX-17295: trusted certificates for openshift-4 (#1006) --- chart/infra-server/static/flavors.yaml | 15 +++++++++++++++ .../static/workflow-openshift-4-demo.yaml | 7 +++++-- .../static/workflow-openshift-4-perf-scale.yaml | 7 +++++-- .../infra-server/static/workflow-openshift-4.yaml | 7 +++++-- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index d38fe4a55..8abe21311 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -302,6 +302,11 @@ value: false kind: optional + - name: trusted-certs-enabled + description: Should trusted certificates be created + value: false + kind: optional + artifacts: - name: kubeconfig description: Kube config for connecting to this cluster @@ -406,6 +411,11 @@ Version string of the central-db container image tag to use. Setting this value will enable central-db. Default will be derived from the Helm chart. + - name: trusted-certs-enabled + description: Should trusted certificates be created + value: false + kind: optional + artifacts: - name: admin-password description: Admin password for StackRox console @@ -494,6 +504,11 @@ value: false kind: optional + - name: trusted-certs-enabled + description: Should trusted certificates be created + value: false + kind: optional + artifacts: - name: kubeconfig description: Kube config for connecting to this cluster diff --git a/chart/infra-server/static/workflow-openshift-4-demo.yaml b/chart/infra-server/static/workflow-openshift-4-demo.yaml index 12aa5da64..72fa68ae1 100644 --- a/chart/infra-server/static/workflow-openshift-4-demo.yaml +++ b/chart/infra-server/static/workflow-openshift-4-demo.yaml @@ -17,6 +17,7 @@ spec: - name: central-db-image-tag - name: central-services-helm-chart-version - name: secured-cluster-services-helm-chart-version + - name: trusted-certs-enabled volumeClaimTemplates: - metadata: name: data @@ -75,7 +76,7 @@ spec: - name: create container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.6.11 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 imagePullPolicy: Always volumeMounts: - name: data @@ -110,6 +111,8 @@ spec: value: "e2-standard-16" - name: REGION value: "us-east1" + - name: TRUSTED_CERTS_ENABLED + value: "{{workflow.parameters.trusted-certs-enabled}}" - name: pre-install script: @@ -235,7 +238,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.6.11 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 imagePullPolicy: Always command: - entrypoint.sh diff --git a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml index f98b143de..c0bbbc7ac 100644 --- a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml +++ b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml @@ -22,6 +22,7 @@ spec: - name: pull-secret value: "" - name: fips-enabled + - name: trusted-certs-enabled volumeClaimTemplates: - metadata: name: data @@ -75,7 +76,7 @@ spec: archive: tar: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.6.8 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 imagePullPolicy: Always command: - entrypoint.sh @@ -111,6 +112,8 @@ spec: value: "{{workflow.parameters.region}}" - name: FIPS_ENABLED value: "{{workflow.parameters.fips-enabled}}" + - name: TRUSTED_CERTS_ENABLED + value: "{{workflow.parameters.trusted-certs-enabled}}" volumeMounts: - name: data mountPath: /data @@ -120,7 +123,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.6.8 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 imagePullPolicy: Always command: - entrypoint.sh diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index 54a5bf1c0..f9290f35a 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -22,6 +22,7 @@ spec: - name: pull-secret value: "" - name: fips-enabled + - name: trusted-certs-enabled volumeClaimTemplates: - metadata: name: data @@ -75,7 +76,7 @@ spec: archive: tar: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.6.8 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 imagePullPolicy: Always command: - entrypoint.sh @@ -111,6 +112,8 @@ spec: value: "{{workflow.parameters.region}}" - name: FIPS_ENABLED value: "{{workflow.parameters.fips-enabled}}" + - name: TRUSTED_CERTS_ENABLED + value: "{{workflow.parameters.trusted-certs-enabled}}" volumeMounts: - name: data mountPath: /data @@ -120,7 +123,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.6.8 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 imagePullPolicy: Always command: - entrypoint.sh From 439b67aac9a5174d79efd03cbf365b59d4cd6122 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Mon, 2 Oct 2023 08:17:26 -0700 Subject: [PATCH 35/46] UI: Fix warning and sort and CSS from #1001 (#1018) --- ui/src/components/Modal.tsx | 30 +++++++------------ .../ClusterInfoPage/DeleteClusterModal.tsx | 2 +- .../DownloadArtifactsModal.tsx | 2 +- 3 files changed, 13 insertions(+), 21 deletions(-) diff --git a/ui/src/components/Modal.tsx b/ui/src/components/Modal.tsx index b6f7bcc21..a24050fbc 100644 --- a/ui/src/components/Modal.tsx +++ b/ui/src/components/Modal.tsx @@ -9,22 +9,14 @@ type Props = { buttons?: ReactNode; }; -export default function ({ - isOpen, - onRequestClose, - header, - children, - buttons, -}: Props): ReactElement { - return ( - - {children} - - ); -} +export default ({ isOpen, onRequestClose, header, children, buttons }: Props): ReactElement => ( + + {children} + +); diff --git a/ui/src/containers/ClusterInfoPage/DeleteClusterModal.tsx b/ui/src/containers/ClusterInfoPage/DeleteClusterModal.tsx index 25be51cfe..14626b1f0 100644 --- a/ui/src/containers/ClusterInfoPage/DeleteClusterModal.tsx +++ b/ui/src/containers/ClusterInfoPage/DeleteClusterModal.tsx @@ -64,7 +64,7 @@ export default function DeleteClusterModal({ cluster, onCancel, onDeleted }: Pro const message = `Cannot delete cluster. Server error occurred: "${error.message}".`; return ( - {message} + {message} ); } diff --git a/ui/src/containers/ClusterInfoPage/DownloadArtifactsModal.tsx b/ui/src/containers/ClusterInfoPage/DownloadArtifactsModal.tsx index f205dcf62..0e660938e 100644 --- a/ui/src/containers/ClusterInfoPage/DownloadArtifactsModal.tsx +++ b/ui/src/containers/ClusterInfoPage/DownloadArtifactsModal.tsx @@ -24,7 +24,7 @@ function ArtifactsList({ artifacts }: ArtifactsListProps): ReactElement { if (!a.Description && b.Description) { return 1; } - return a.Name && b.Name ? a.Name.localeCompare(b.Name) : 0; + return 0; }) .map((artifact) => ( From 58fe4e1dca6a10078b49ffaa48c126b6635ddd28 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Mon, 2 Oct 2023 11:26:00 -0700 Subject: [PATCH 36/46] Use more consistent artifact naming for openshift clusters (#1014) --- chart/infra-server/static/flavors.yaml | 69 +++++++++++++++++++ .../static/workflow-openshift-4-demo.yaml | 23 ++++++- .../workflow-openshift-4-perf-scale.yaml | 31 +++++++++ .../static/workflow-openshift-4.yaml | 31 +++++++++ .../static/workflow-openshift-aro.yaml | 27 ++++++-- .../static/workflow-openshift-rosa.yaml | 23 ++++++- .../infra-server/static/workflow-osd-aws.yaml | 23 ++++++- .../infra-server/static/workflow-osd-gcp.yaml | 23 ++++++- 8 files changed, 233 insertions(+), 17 deletions(-) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index 8abe21311..54bb3ad42 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -311,6 +311,7 @@ - name: kubeconfig description: Kube config for connecting to this cluster + # (deprecated by cluster-console-password) - name: kubeadmin-password description: The kubeadmin user password for the openshift console @@ -327,6 +328,15 @@ - name: dotenv description: Environment variables used to access the cluster and consoles + - name: cluster-console-url + description: The URL for the openshift console + + - name: cluster-console-username + description: The username to login at the openshift console + + - name: cluster-console-password + description: The password to login at the openshift console + ###################### # openshift-4-demo # ###################### @@ -439,6 +449,15 @@ - name: dotenv description: Environment variables used to access the cluster and consoles + - name: cluster-console-url + description: The URL for the openshift console + + - name: cluster-console-username + description: The username to login at the openshift console + + - name: cluster-console-password + description: The password to login at the openshift console + ############################ # openshift-4-perf-scale # ############################ @@ -513,6 +532,7 @@ - name: kubeconfig description: Kube config for connecting to this cluster + # (deprecated by cluster-console-password) - name: kubeadmin-password description: The kubeadmin user password for the openshift console @@ -529,6 +549,15 @@ - name: dotenv description: Environment variables used to access the cluster and consoles + - name: cluster-console-url + description: The URL for the openshift console + + - name: cluster-console-username + description: The username to login at the openshift console + + - name: cluster-console-password + description: The password to login at the openshift console + ##################### # AWS EKS # ##################### @@ -651,6 +680,16 @@ - name: data description: An archive that includes ssh keys to connect to cluster nodes + - name: cluster-console-url + description: The URL for the openshift console + tags: [url] + + - name: cluster-console-username + description: The username to login at the openshift console + + - name: cluster-console-password + description: The password to login at the openshift console + ##################### # Openshift ROSA # ##################### @@ -684,6 +723,16 @@ - name: data description: An archive that includes ssh keys to connect to cluster nodes + - name: cluster-console-url + description: The URL for the openshift console + tags: [url] + + - name: cluster-console-username + description: The username to login at the openshift console + + - name: cluster-console-password + description: The password to login at the openshift console + ######################### # Openshift OSD on AWS # ######################### @@ -717,6 +766,16 @@ - name: data description: An archive that includes ssh keys to connect to cluster nodes + - name: cluster-console-url + description: The URL for the openshift console + tags: [url] + + - name: cluster-console-username + description: The username to login at the openshift console + + - name: cluster-console-password + description: The password to login at the openshift console + ######################### # Openshift OSD on GCP # ######################### @@ -750,6 +809,16 @@ - name: data description: An archive that includes ssh keys to connect to cluster nodes + - name: cluster-console-url + description: The URL for the openshift console + tags: [url] + + - name: cluster-console-username + description: The username to login at the openshift console + + - name: cluster-console-password + description: The password to login at the openshift console + {{ if ne .Values.deployment "production" -}} ################# # URL artifact # diff --git a/chart/infra-server/static/workflow-openshift-4-demo.yaml b/chart/infra-server/static/workflow-openshift-4-demo.yaml index 72fa68ae1..319976d48 100644 --- a/chart/infra-server/static/workflow-openshift-4-demo.yaml +++ b/chart/infra-server/static/workflow-openshift-4-demo.yaml @@ -195,10 +195,15 @@ spec: mountPath: /data - name: gather - container: + script: image: busybox - imagePullPolicy: Always - command: [echo, "gathering artifacts"] + command: [sh] + source: | + cd /data + . ./dotenv + echo "${OPENSHIFT_CONSOLE_URL}" > cluster-console-url + echo "${OPENSHIFT_CONSOLE_USERNAME}" > cluster-console-username + echo "${OPENSHIFT_CONSOLE_PASSWORD}" > cluster-console-password volumeMounts: - name: data mountPath: /data @@ -232,6 +237,18 @@ spec: path: /data archive: tar: {} + - name: cluster-console-url + path: /data/cluster-console-url + archive: + none: {} + - name: cluster-console-username + path: /data/cluster-console-username + archive: + none: {} + - name: cluster-console-password + path: /data/cluster-console-password + archive: + none: {} - name: wait suspend: {} diff --git a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml index c0bbbc7ac..664e1884b 100644 --- a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml +++ b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml @@ -42,6 +42,9 @@ spec: - - name: create template: create + - - name: gather + template: gather + - - name: wait template: wait @@ -118,6 +121,34 @@ spec: - name: data mountPath: /data + - name: gather + script: + image: busybox + command: [sh] + source: | + cd /data + . ./dotenv + echo "${OPENSHIFT_CONSOLE_URL}" > cluster-console-url + echo "${OPENSHIFT_CONSOLE_USERNAME}" > cluster-console-username + echo "${OPENSHIFT_CONSOLE_PASSWORD}" > cluster-console-password + volumeMounts: + - name: data + mountPath: /data + outputs: + artifacts: + - name: cluster-console-url + path: /data/cluster-console-url + archive: + none: {} + - name: cluster-console-username + path: /data/cluster-console-username + archive: + none: {} + - name: cluster-console-password + path: /data/cluster-console-password + archive: + none: {} + - name: wait suspend: {} diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index f9290f35a..7296f1884 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -42,6 +42,9 @@ spec: - - name: create template: create + - - name: gather + template: gather + - - name: wait template: wait @@ -118,6 +121,34 @@ spec: - name: data mountPath: /data + - name: gather + script: + image: busybox + command: [sh] + source: | + cd /data + . ./dotenv + echo "${OPENSHIFT_CONSOLE_URL}" > cluster-console-url + echo "${OPENSHIFT_CONSOLE_USERNAME}" > cluster-console-username + echo "${OPENSHIFT_CONSOLE_PASSWORD}" > cluster-console-password + volumeMounts: + - name: data + mountPath: /data + outputs: + artifacts: + - name: cluster-console-url + path: /data/cluster-console-url + archive: + none: {} + - name: cluster-console-username + path: /data/cluster-console-username + archive: + none: {} + - name: cluster-console-password + path: /data/cluster-console-password + archive: + none: {} + - name: wait suspend: {} diff --git a/chart/infra-server/static/workflow-openshift-aro.yaml b/chart/infra-server/static/workflow-openshift-aro.yaml index 288b694e9..8d72ac86f 100644 --- a/chart/infra-server/static/workflow-openshift-aro.yaml +++ b/chart/infra-server/static/workflow-openshift-aro.yaml @@ -38,7 +38,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: gcr.io/stackrox-infra/automation-flavors/openshift-aro:0.2.16 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-aro-0.2.16 imagePullPolicy: Always command: - ./entrypoint.sh @@ -82,10 +82,15 @@ spec: mountPath: /data - name: gather - container: + script: image: busybox - imagePullPolicy: Always - command: [echo, "gathering artifacts"] + command: [sh] + source: | + cd /data + . ./dotenv + echo "${CONSOLE_ENDPOINT}" > cluster-console-url + echo "${CONSOLE_USER}" > cluster-console-username + echo "${CONSOLE_PASSWORD}" > cluster-console-password volumeMounts: - name: data mountPath: /data @@ -103,6 +108,18 @@ spec: path: /data archive: tar: {} + - name: cluster-console-url + path: /data/cluster-console-url + archive: + none: {} + - name: cluster-console-username + path: /data/cluster-console-username + archive: + none: {} + - name: cluster-console-password + path: /data/cluster-console-password + archive: + none: {} - name: wait suspend: {} @@ -110,7 +127,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: gcr.io/stackrox-infra/automation-flavors/openshift-aro:0.2.16 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-aro-0.2.16 imagePullPolicy: Always command: - ./entrypoint.sh diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index c04438169..5641d2506 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -77,10 +77,15 @@ spec: mountPath: /data - name: gather - container: + script: image: busybox - imagePullPolicy: Always - command: [echo, "gathering artifacts"] + command: [sh] + source: | + cd /data + . ./dotenv + echo "${CONSOLE_ENDPOINT}" > cluster-console-url + echo "${CONSOLE_USER}" > cluster-console-username + echo "${CONSOLE_PASSWORD}" > cluster-console-password volumeMounts: - name: data mountPath: /data @@ -98,6 +103,18 @@ spec: path: /data archive: tar: {} + - name: cluster-console-url + path: /data/cluster-console-url + archive: + none: {} + - name: cluster-console-username + path: /data/cluster-console-username + archive: + none: {} + - name: cluster-console-password + path: /data/cluster-console-password + archive: + none: {} - name: wait suspend: {} diff --git a/chart/infra-server/static/workflow-osd-aws.yaml b/chart/infra-server/static/workflow-osd-aws.yaml index 536a67d74..033bf37af 100644 --- a/chart/infra-server/static/workflow-osd-aws.yaml +++ b/chart/infra-server/static/workflow-osd-aws.yaml @@ -78,10 +78,15 @@ spec: mountPath: /data - name: gather - container: + script: image: busybox - imagePullPolicy: Always - command: [echo, "gathering artifacts"] + command: [sh] + source: | + cd /data + . ./dotenv + echo "${CLUSTER_CONSOLE_ENDPOINT}" > cluster-console-url + echo "${CLUSTER_USERNAME}" > cluster-console-username + echo "${CLUSTER_PASSWORD}" > cluster-console-password volumeMounts: - name: data mountPath: /data @@ -99,6 +104,18 @@ spec: path: /data archive: tar: {} + - name: cluster-console-url + path: /data/cluster-console-url + archive: + none: {} + - name: cluster-console-username + path: /data/cluster-console-username + archive: + none: {} + - name: cluster-console-password + path: /data/cluster-console-password + archive: + none: {} - name: wait suspend: {} diff --git a/chart/infra-server/static/workflow-osd-gcp.yaml b/chart/infra-server/static/workflow-osd-gcp.yaml index 3727a9ca0..861b91b33 100644 --- a/chart/infra-server/static/workflow-osd-gcp.yaml +++ b/chart/infra-server/static/workflow-osd-gcp.yaml @@ -75,10 +75,15 @@ spec: mountPath: /data - name: gather - container: + script: image: busybox - imagePullPolicy: Always - command: [echo, "gathering artifacts"] + command: [sh] + source: | + cd /data + . ./dotenv + echo "${CLUSTER_CONSOLE_ENDPOINT}" > cluster-console-url + echo "${CLUSTER_USERNAME}" > cluster-console-username + echo "${CLUSTER_PASSWORD}" > cluster-console-password volumeMounts: - name: data mountPath: /data @@ -96,6 +101,18 @@ spec: path: /data archive: tar: {} + - name: cluster-console-url + path: /data/cluster-console-url + archive: + none: {} + - name: cluster-console-username + path: /data/cluster-console-username + archive: + none: {} + - name: cluster-console-password + path: /data/cluster-console-password + archive: + none: {} - name: wait suspend: {} From a87ead70f585a689121e1e912cbf288040323df9 Mon Sep 17 00:00:00 2001 From: Linda Song Date: Mon, 2 Oct 2023 11:26:26 -0700 Subject: [PATCH 37/46] Hackathon '23: Adding all clusters to url and drag/drop window split screen (#1013) --- ui/src/containers/HomePage/HomePage.tsx | 26 ++++++++++++++++--- .../containers/HomePage/LaunchPageSection.tsx | 10 ++++--- .../HomePage/MyClustersPageSection.tsx | 13 ++++++---- 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/ui/src/containers/HomePage/HomePage.tsx b/ui/src/containers/HomePage/HomePage.tsx index 978b9d320..b8c921ea3 100644 --- a/ui/src/containers/HomePage/HomePage.tsx +++ b/ui/src/containers/HomePage/HomePage.tsx @@ -1,13 +1,31 @@ import React, { ReactElement } from 'react'; +import { + Drawer, + DrawerContent, + DrawerContentBody, + DrawerPanelContent, + DrawerHead, +} from '@patternfly/react-core'; import LaunchPageSection from './LaunchPageSection'; import MyClustersPageSection from './MyClustersPageSection'; export default function HomePage(): ReactElement { return ( - <> - - - + + + + + + + } + > + + + + + ); } diff --git a/ui/src/containers/HomePage/LaunchPageSection.tsx b/ui/src/containers/HomePage/LaunchPageSection.tsx index c89fcab28..eb3631dc8 100644 --- a/ui/src/containers/HomePage/LaunchPageSection.tsx +++ b/ui/src/containers/HomePage/LaunchPageSection.tsx @@ -1,5 +1,6 @@ /* eslint-disable jsx-a11y/label-has-associated-control */ -import React, { useState, ReactElement } from 'react'; +import React, { ReactElement } from 'react'; +import { useSearchParams } from 'react-router-dom'; import { AxiosPromise } from 'axios'; import { Gallery, GalleryItem } from '@patternfly/react-core'; @@ -51,10 +52,13 @@ function FlavorCards({ showAllFlavors = false }: FlavorCardsProps): ReactElement } export default function LaunchPageSection(): ReactElement { - const [showAllFlavors, setShowAllFlavors] = useState(false); + const [searchParams, setSearchParams] = useSearchParams(); + const showAllFlavors = searchParams.get('showAllFlavors') === 'true'; function toggleFlavorFilter() { - setShowAllFlavors(!showAllFlavors); + const newSearchParams = new URLSearchParams(searchParams); + newSearchParams.set('showAllFlavors', (!showAllFlavors).toString()); + setSearchParams(newSearchParams); } const headerText = showAllFlavors ? 'All Flavors' : 'My Flavors'; diff --git a/ui/src/containers/HomePage/MyClustersPageSection.tsx b/ui/src/containers/HomePage/MyClustersPageSection.tsx index e91597689..b9565d95b 100644 --- a/ui/src/containers/HomePage/MyClustersPageSection.tsx +++ b/ui/src/containers/HomePage/MyClustersPageSection.tsx @@ -1,5 +1,6 @@ /* eslint-disable jsx-a11y/label-has-associated-control */ -import React, { useState, ReactElement } from 'react'; +import React, { ReactElement } from 'react'; +import { useSearchParams } from 'react-router-dom'; import { AxiosPromise } from 'axios'; import moment from 'moment'; import { Gallery, GalleryItem } from '@patternfly/react-core'; @@ -86,11 +87,13 @@ function ClusterCards({ showAllClusters = false }: ClusterCardsProps): ReactElem return <>{cards}; } -export default function LaunchPageSection(): ReactElement { - const [showAllClusters, setShowAllClusters] = useState(false); - +export default function MyClustersPageSection(): ReactElement { + const [searchParams, setSearchParams] = useSearchParams(); + const showAllClusters = searchParams.get('showAllClusters') === 'true'; function toggleClusterFilter() { - setShowAllClusters(!showAllClusters); + const newSearchParams = new URLSearchParams(searchParams); + newSearchParams.set('showAllClusters', (!showAllClusters).toString()); + setSearchParams(newSearchParams); } const headerText = showAllClusters ? 'All Clusters' : 'My Clusters'; From 8274b21ae8a26bd6b16190fe27d584eea8d4f34c Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Mon, 2 Oct 2023 15:58:49 -0700 Subject: [PATCH 38/46] Use public image for OSD-on-GCP flavor (#1020) --- chart/infra-server/static/workflow-osd-gcp.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chart/infra-server/static/workflow-osd-gcp.yaml b/chart/infra-server/static/workflow-osd-gcp.yaml index 861b91b33..126f39d42 100644 --- a/chart/infra-server/static/workflow-osd-gcp.yaml +++ b/chart/infra-server/static/workflow-osd-gcp.yaml @@ -38,7 +38,7 @@ spec: - name: create activeDeadlineSeconds: 7200 container: - image: gcr.io/stackrox-infra/automation-flavors/openshift-osd:0.2.24 + image: quay.io/stackrox-io/ci:automation-flavors-osd-0.2.24 imagePullPolicy: Always command: - ./entrypoint.sh @@ -120,7 +120,7 @@ spec: - name: destroy activeDeadlineSeconds: 3600 container: - image: gcr.io/stackrox-infra/automation-flavors/openshift-osd:0.2.24 + image: quay.io/stackrox-io/ci:automation-flavors-osd-0.2.24 imagePullPolicy: Always command: - ./entrypoint.sh From d25b2f46055355a6ee2496ad9839201c03163b97 Mon Sep 17 00:00:00 2001 From: Robot Rox <42458750+roxbot@users.noreply.github.com> Date: Tue, 3 Oct 2023 23:32:16 -0700 Subject: [PATCH 39/46] Bump demo versions to 4.2.1 (#1022) Co-authored-by: alwayshooin --- chart/infra-server/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/infra-server/Chart.yaml b/chart/infra-server/Chart.yaml index c18a6cc43..9d3ccc09d 100644 --- a/chart/infra-server/Chart.yaml +++ b/chart/infra-server/Chart.yaml @@ -7,4 +7,4 @@ home: https://github.com/stackrox/infra sources: - https://github.com/stackrox/infra annotations: - acsDemoVersion: 4.2.0 + acsDemoVersion: 4.2.1 From c13a16f085aa833fe855acee03295e2013399a0b Mon Sep 17 00:00:00 2001 From: Tom Martensen Date: Wed, 4 Oct 2023 08:33:40 +0200 Subject: [PATCH 40/46] fix: cluster name length should be maximum 28 (#1016) --- CHANGELOG.md | 2 ++ cmd/infractl/cluster/create/command.go | 13 +++++++++++-- ui/src/containers/LaunchClusterPage/ClusterForm.tsx | 5 +++-- ui/src/utils/cluster.utils.ts | 9 ++++----- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b11a96ddd..b7ec7b851 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ Please avoid adding duplicate information across this changelog and JIRA/doc inp ## [NEXT RELEASE] +- Fix: CLI and UI now consistently enforce restrictions on the cluster name format and length + ## [0.8.0] - Switch GKE based flavors (gke-default, demo, qa-demo) to use a RH project (ROX-17123,ROX-19217) diff --git a/cmd/infractl/cluster/create/command.go b/cmd/infractl/cluster/create/command.go index 17821c0af..09fdd3407 100644 --- a/cmd/infractl/cluster/create/command.go +++ b/cmd/infractl/cluster/create/command.go @@ -159,12 +159,15 @@ func validateName(name string) error { return errors.New("cluster name too long") } - match, err := regexp.MatchString(`^(?:[a-z](?:[-a-z0-9]{0,28}[a-z0-9])?)$`, name) + match, err := regexp.MatchString(`^(?:[a-z](?:[-a-z0-9]{1,26}[a-z0-9]))$`, name) if err != nil { return err } if !match { - return errors.New("The name does not match the requirements. Only lowercase letters, numbers, and '-' allowed, must start with a letter and end with a letter or number.") + return errors.New( + "The name does not match the requirements. " + + "Only lowercase letters, numbers, and '-' allowed, must start with a letter and end with a letter or number. " + + "A minimum length of 3 characters and a maximum length of 28 is allowed.") } return nil @@ -261,6 +264,12 @@ func getNameForQaDemoFlavor() string { name := strings.TrimSuffix(workingEnvironment.tag, "-dirty") name = strings.ReplaceAll(name, ".", "-") + // Ensure that the generated name is a maximum of 28 characters long and does not end with hyphen. + if len(name) > 28 { + name = name[:28] + name = strings.TrimSuffix(name, "-") + } + return name } diff --git a/ui/src/containers/LaunchClusterPage/ClusterForm.tsx b/ui/src/containers/LaunchClusterPage/ClusterForm.tsx index 6fcca41a2..033f8ea79 100644 --- a/ui/src/containers/LaunchClusterPage/ClusterForm.tsx +++ b/ui/src/containers/LaunchClusterPage/ClusterForm.tsx @@ -28,7 +28,7 @@ const clusterService = new ClusterServiceApi(configuration); function helpByParameterName(name?: string): string { const help: { [key: string]: string } = { name: - "You can use the generated name, or type in your own. Only lowercase letters, numbers, and '-' allowed, must start with a letter and end with a letter or number.", + "You can use the generated name, or type in your own. Only lowercase letters, numbers, and '-' allowed, must start with a letter and end with a letter or number. The name must be between 3 and 28 characters long.", }; if (name && name in help) { @@ -38,12 +38,13 @@ function helpByParameterName(name?: string): string { } const schemasByParameterName: { [key: string]: yup.BaseSchema } = { + // name length is restricted by certificate generation name: yup .string() .min(3, 'Too short') .max(28, 'Too long') .matches( - /^(?:[a-z](?:[-a-z0-9]{0,38}[a-z0-9])?)$/, // this is what GKE expects + /^(?:[a-z](?:[a-z0-9-]{1,26}[a-z0-9]))$/, 'The input value does not match its requirements. See the (?) section for details.' ), nodes: yup diff --git a/ui/src/utils/cluster.utils.ts b/ui/src/utils/cluster.utils.ts index 26a19a88d..3320e8e20 100644 --- a/ui/src/utils/cluster.utils.ts +++ b/ui/src/utils/cluster.utils.ts @@ -19,10 +19,9 @@ export function generateClusterName(username = ''): string { // prepare to combine, but filter any empty part (only one that should ever be empty is user string) const nameArray = [userPart, datePart, randomPart].filter(Boolean); - // combine the 3 parts, truncate it at 28 characters, and remove a trailing '-', if any. - // Truncation is needed to allow generating wildcard certificates for OpenShift using Let's Encrypt: since LE insists - // on the domain forming the Common Name of the certificate, the string '*.apps..openshift.infra.rox.systems' - // must not exceed 64 characters. This leaves a budget of 29 characters for the portion. - // RS-171 - 29 chars raises openshift error: "openshift_public_hostname must be 63 characters or less" + // ROX-15492 + // - OCP 3.11 flavor allows us a maximum of up to 28 characters to fulfil: "openshift_public_hostname must be 63 characters or less". + // - OCP 4 demo: Let's Encrypt allows common names of up to 63 characters. With the format '*.apps..openshift.infra.rox.systems', 28 characters remain for the name. + // Combine the 3 parts, truncate it at 28 characters, and remove a trailing '-', if any. return nameArray.join('-').slice(0, 28).replace(/-$/, ''); } From 3fd1082f44ebeef7be0d3f8c5a1c0a8c16850c2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:46:12 +0200 Subject: [PATCH 41/46] Bump go.uber.org/zap from 1.24.0 to 1.26.0 (#1025) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 5 ++--- go.sum | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 66d314491..9a2bd0e89 100644 --- a/go.mod +++ b/go.mod @@ -54,8 +54,7 @@ require ( github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/pierrec/lz4/v4 v4.1.15 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect + go.uber.org/multierr v1.10.0 // indirect golang.org/x/mod v0.10.0 // indirect golang.org/x/sync v0.3.0 // indirect golang.org/x/tools v0.9.1 // indirect @@ -125,7 +124,7 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect go.opencensus.io v0.24.0 // indirect - go.uber.org/zap v1.24.0 + go.uber.org/zap v1.26.0 golang.org/x/crypto v0.13.0 // indirect golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect golang.org/x/sys v0.12.0 // indirect diff --git a/go.sum b/go.sum index 6587f85fe..311f80480 100644 --- a/go.sum +++ b/go.sum @@ -50,7 +50,6 @@ github.com/argoproj/pkg v0.13.6 h1:36WPD9MNYECHcO1/R1pj6teYspiK7uMQLCgLGft2abM= github.com/argoproj/pkg v0.13.6/go.mod h1:I698DoJBKuvNFaixh4vFl2C88cNIT1WS7KCbz5ewyF8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/aws/aws-sdk-go v1.44.39/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= @@ -384,15 +383,15 @@ github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaD go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= From 2667244cad712d0e90706f8969f1e10a21ff69a0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:46:23 +0200 Subject: [PATCH 42/46] Bump google.golang.org/grpc from 1.57.0 to 1.58.2 (#1024) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9a2bd0e89..552363693 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( golang.org/x/oauth2 v0.12.0 google.golang.org/api v0.143.0 google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb - google.golang.org/grpc v1.57.0 + google.golang.org/grpc v1.58.2 google.golang.org/protobuf v1.31.0 gopkg.in/square/go-jose.v2 v2.6.0 k8s.io/api v0.28.2 diff --git a/go.sum b/go.sum index 311f80480..499bf7592 100644 --- a/go.sum +++ b/go.sum @@ -553,8 +553,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 33885dccf3407cfbb1ae807e8e29a5e4ff4cfa7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 08:46:35 +0200 Subject: [PATCH 43/46] Bump github.com/prometheus/client_golang from 1.16.0 to 1.17.0 (#1023) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 8 ++++---- go.sum | 17 ++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 552363693..1908ef92a 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/jeremywohl/flatten/v2 v2.0.0-20211013061545-07e4a09fb8e4 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.16.0 + github.com/prometheus/client_golang v1.17.0 github.com/slack-go/slack v0.12.3 github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 @@ -113,9 +113,9 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.10.1 // indirect + github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect + github.com/prometheus/common v0.44.0 // indirect + github.com/prometheus/procfs v0.11.1 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect github.com/sethvargo/go-limiter v0.7.2 // indirect github.com/shopspring/decimal v1.2.0 // indirect diff --git a/go.sum b/go.sum index 499bf7592..261f32fe1 100644 --- a/go.sum +++ b/go.sum @@ -137,7 +137,6 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -316,15 +315,15 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= -github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= +github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= -github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM= +github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= +github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= +github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= From 903b0718a2da8b4b11fb516d84c23855506c8c01 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Wed, 4 Oct 2023 14:33:02 -0700 Subject: [PATCH 44/46] ROX-19218, etc: Move GCP based OCP flavors in infra to a RH project (#1021) --- chart/infra-server/static/flavors.yaml | 4 ++-- .../static/workflow-openshift-4-demo.yaml | 21 +++++++++++-------- .../workflow-openshift-4-perf-scale.yaml | 17 ++++++++------- .../static/workflow-openshift-4.yaml | 17 ++++++++------- .../infra-server/static/workflow-osd-gcp.yaml | 8 +++---- .../templates/openshift-4/secrets.yaml | 19 +++++++++++++++++ chart/infra-server/templates/osd/secrets.yaml | 3 +++ ui/src/utils/cluster.utils.ts | 1 - 8 files changed, 60 insertions(+), 30 deletions(-) diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml index 54bb3ad42..40cd2a197 100644 --- a/chart/infra-server/static/flavors.yaml +++ b/chart/infra-server/static/flavors.yaml @@ -495,7 +495,7 @@ - name: master-node-type description: the type of master nodes - value: c2d-highcpu-16 + value: n1-standard-16 kind: optional - name: master-node-count @@ -505,7 +505,7 @@ - name: worker-node-type description: the type of worker nodes - value: c2d-highcpu-8 + value: n1-standard-8 kind: optional - name: worker-node-count diff --git a/chart/infra-server/static/workflow-openshift-4-demo.yaml b/chart/infra-server/static/workflow-openshift-4-demo.yaml index 319976d48..d8ef0f840 100644 --- a/chart/infra-server/static/workflow-openshift-4-demo.yaml +++ b/chart/infra-server/static/workflow-openshift-4-demo.yaml @@ -29,7 +29,7 @@ spec: volumes: - name: credentials secret: - secretName: google-credentials-openshift-4 + secretName: openshift-4-gcp-service-account - name: demo-secrets secret: secretName: demo-secrets @@ -76,7 +76,7 @@ spec: - name: create container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot imagePullPolicy: Always volumeMounts: - name: data @@ -86,14 +86,15 @@ spec: args: - create - "{{workflow.parameters.name}}" - - srox-temp-dev-test - - openshift.infra.rox.systems + - ocp.infra.rox.systems env: - name: GOOGLE_CREDENTIALS valueFrom: secretKeyRef: - name: google-credentials-openshift-4 + name: openshift-4-gcp-service-account key: google-credentials.json + - name: GCP_PROJECT + value : "acs-team-temp-dev" - name: PULL_SECRET valueFrom: secretKeyRef: @@ -124,7 +125,7 @@ spec: source: | openssl rand -base64 32 | tr "+/" "_#" | cut -c 1-20 > /data/admin_password base64 /data/auth/kubeconfig | tr -d "\n" > /data/auth/kubeconfig_base64 - subdomain="apps.{{workflow.parameters.name}}.openshift.infra.rox.systems" + subdomain="apps.{{workflow.parameters.name}}.ocp.infra.rox.systems" echo "https://console-openshift-console.${subdomain}" > /data/url-openshift echo "https://central-stackrox.${subdomain}" > /data/url-stackrox outputs: @@ -166,7 +167,7 @@ spec: - name: GOOGLE_CREDENTIALS valueFrom: secretKeyRef: - name: google-credentials-openshift-4 + name: openshift-4-gcp-service-account key: google-credentials.json - name: CENTRAL_PORT value: "443" @@ -255,7 +256,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot imagePullPolicy: Always command: - entrypoint.sh @@ -265,8 +266,10 @@ spec: - name: GOOGLE_CREDENTIALS valueFrom: secretKeyRef: - name: google-credentials-openshift-4 + name: openshift-4-gcp-service-account key: google-credentials.json + - name: GCP_PROJECT + value : "acs-team-temp-dev" volumeMounts: - name: data mountPath: /data diff --git a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml index 664e1884b..f3b2cfc03 100644 --- a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml +++ b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml @@ -34,7 +34,7 @@ spec: volumes: - name: credentials secret: - secretName: google-credentials-openshift-4 + secretName: openshift-4-gcp-service-account templates: - name: start @@ -79,21 +79,22 @@ spec: archive: tar: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot imagePullPolicy: Always command: - entrypoint.sh args: - create - "{{workflow.parameters.name}}" - - srox-temp-dev-test - - openshift.infra.rox.systems + - ocp.infra.rox.systems env: - name: GOOGLE_CREDENTIALS valueFrom: secretKeyRef: - name: google-credentials-openshift-4 + name: openshift-4-gcp-service-account key: google-credentials.json + - name: GCP_PROJECT + value : "acs-team-temp-dev" - name: PULL_SECRET valueFrom: secretKeyRef: @@ -154,7 +155,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot imagePullPolicy: Always command: - entrypoint.sh @@ -164,8 +165,10 @@ spec: - name: GOOGLE_CREDENTIALS valueFrom: secretKeyRef: - name: google-credentials-openshift-4 + name: openshift-4-gcp-service-account key: google-credentials.json + - name: GCP_PROJECT + value : "acs-team-temp-dev" volumeMounts: - name: data mountPath: /data diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index 7296f1884..e8d13c43a 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -34,7 +34,7 @@ spec: volumes: - name: credentials secret: - secretName: google-credentials-openshift-4 + secretName: openshift-4-gcp-service-account templates: - name: start @@ -79,21 +79,22 @@ spec: archive: tar: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot imagePullPolicy: Always command: - entrypoint.sh args: - create - "{{workflow.parameters.name}}" - - srox-temp-dev-test - - openshift.infra.rox.systems + - ocp.infra.rox.systems env: - name: GOOGLE_CREDENTIALS valueFrom: secretKeyRef: - name: google-credentials-openshift-4 + name: openshift-4-gcp-service-account key: google-credentials.json + - name: GCP_PROJECT + value : "acs-team-temp-dev" - name: PULL_SECRET valueFrom: secretKeyRef: @@ -154,7 +155,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1 + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot imagePullPolicy: Always command: - entrypoint.sh @@ -164,8 +165,10 @@ spec: - name: GOOGLE_CREDENTIALS valueFrom: secretKeyRef: - name: google-credentials-openshift-4 + name: openshift-4-gcp-service-account key: google-credentials.json + - name: GCP_PROJECT + value : "acs-team-temp-dev" volumeMounts: - name: data mountPath: /data diff --git a/chart/infra-server/static/workflow-osd-gcp.yaml b/chart/infra-server/static/workflow-osd-gcp.yaml index 126f39d42..dffcffbfb 100644 --- a/chart/infra-server/static/workflow-osd-gcp.yaml +++ b/chart/infra-server/static/workflow-osd-gcp.yaml @@ -61,9 +61,9 @@ spec: valueFrom: secretKeyRef: name: osd-access-secrets - key: GCP_SA_CREDS_JSON_BASE64 + key: GCP_SERVICE_ACCOUNT_KEY_BASE64 - name: GCP_PROJECT - value: "srox-temp-dev-test" + value: "acs-team-temp-dev" - name: NODE_COUNT value: "{{workflow.parameters.nodes}}" - name: INSTANCE_TYPE @@ -143,9 +143,9 @@ spec: valueFrom: secretKeyRef: name: osd-access-secrets - key: GCP_SA_CREDS_JSON_BASE64 + key: GCP_SERVICE_ACCOUNT_KEY_BASE64 - name: GCP_PROJECT - value: "srox-temp-dev-test" + value: "acs-team-temp-dev" volumeMounts: - name: data mountPath: /data diff --git a/chart/infra-server/templates/openshift-4/secrets.yaml b/chart/infra-server/templates/openshift-4/secrets.yaml index 3bce61ba5..3fe49ca72 100644 --- a/chart/infra-server/templates/openshift-4/secrets.yaml +++ b/chart/infra-server/templates/openshift-4/secrets.yaml @@ -2,6 +2,25 @@ apiVersion: v1 kind: Secret type: Opaque +metadata: + name: openshift-4-gcp-service-account + namespace: default + +data: + google-credentials.json: |- + {{ required ".Values.openshift_4__gcp_service_account_key_json is undefined" .Values.openshift_4__gcp_service_account_key_json }} + + +--- + +# (deprecated) this secret is used for openshift-4 provisioning with +# stackrox.com GCP and can be removed once the migration away from that account +# and its projects are complete. In the meantime this must remain to facilitate +# drain and rollback if required. +apiVersion: v1 +kind: Secret +type: Opaque + metadata: name: google-credentials-openshift-4 namespace: default diff --git a/chart/infra-server/templates/osd/secrets.yaml b/chart/infra-server/templates/osd/secrets.yaml index 75ff515ae..aafbb21b1 100644 --- a/chart/infra-server/templates/osd/secrets.yaml +++ b/chart/infra-server/templates/osd/secrets.yaml @@ -14,5 +14,8 @@ data: {{ .Values.osdClusterManager.redHatPullSecretBase64 | b64enc }} OPENSHIFT_CLUSTER_MANAGER_API_TOKEN: |- {{ .Values.osdClusterManager.openshiftClusterManagerApiToken | b64enc }} + # (deprecated) used in stackrox.com GCP provisioning and can be removed once the migration away from that account and its projects are complete GCP_SA_CREDS_JSON_BASE64: |- {{ .Values.osdClusterManager.gcpSaCredsJsonBase64 | b64enc }} + GCP_SERVICE_ACCOUNT_KEY_BASE64: |- + {{ .Values.osdClusterManager.gcpServiceAccountKeyBase64 | b64enc }} diff --git a/ui/src/utils/cluster.utils.ts b/ui/src/utils/cluster.utils.ts index 3320e8e20..863efb1ec 100644 --- a/ui/src/utils/cluster.utils.ts +++ b/ui/src/utils/cluster.utils.ts @@ -21,7 +21,6 @@ export function generateClusterName(username = ''): string { // ROX-15492 // - OCP 3.11 flavor allows us a maximum of up to 28 characters to fulfil: "openshift_public_hostname must be 63 characters or less". - // - OCP 4 demo: Let's Encrypt allows common names of up to 63 characters. With the format '*.apps..openshift.infra.rox.systems', 28 characters remain for the name. // Combine the 3 parts, truncate it at 28 characters, and remove a trailing '-', if any. return nameArray.join('-').slice(0, 28).replace(/-$/, ''); } From bf41e2622e5432b6e64ed2507216c28e361127cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 21:34:27 +0000 Subject: [PATCH 45/46] Bump postcss from 8.4.27 to 8.4.31 in /ui (#1026) --- ui/package.json | 2 +- ui/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/package.json b/ui/package.json index 56b5564db..cda7248cd 100644 --- a/ui/package.json +++ b/ui/package.json @@ -57,7 +57,7 @@ "eslint-plugin-prettier": "^3.4.1", "http-proxy-middleware": "^2.0.6", "npm-run-all": "^4.1.5", - "postcss": "^8.4.27", + "postcss": "^8.4.31", "postcss-cli": "^10.1.0", "prettier": "^2.2.1", "react-scripts": "^4.0.1", diff --git a/ui/yarn.lock b/ui/yarn.lock index ffbb6fb60..cefe01394 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -9745,10 +9745,10 @@ postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, po source-map "^0.6.1" supports-color "^6.1.0" -postcss@^8.1.0, postcss@^8.1.6, postcss@^8.2.1, postcss@^8.4.27: - version "8.4.27" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057" - integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ== +postcss@^8.1.0, postcss@^8.1.6, postcss@^8.2.1, postcss@^8.4.31: + version "8.4.31" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== dependencies: nanoid "^3.3.6" picocolors "^1.0.0" From 31b462583ca3a41109bebcb8d0e9fcf131915def Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Wed, 4 Oct 2023 15:12:38 -0700 Subject: [PATCH 46/46] Prep for 0.8.2 (#1027) --- CHANGELOG.md | 9 +++++++++ chart/infra-server/static/workflow-openshift-4-demo.yaml | 4 ++-- .../static/workflow-openshift-4-perf-scale.yaml | 4 ++-- chart/infra-server/static/workflow-openshift-4.yaml | 4 ++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7ec7b851..e76e2ab5f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,16 @@ Please avoid adding duplicate information across this changelog and JIRA/doc inp ## [NEXT RELEASE] +## [0.8.2] + +- Hackathon '23: + - Adding all clusters to url and drag/drop window split screen + - ROX-17295: trusted certificates for openshift-4 - Fix: CLI and UI now consistently enforce restrictions on the cluster name format and length +- Change: ROX-19218, etc: Move GCP based OCP flavors in infra to a RH project +- Change: Use more consistent artifact naming for openshift clusters +- Chore: Misc tailwind -> patternfly +- Chore: Bump demo versions to 4.2.1 ## [0.8.0] diff --git a/chart/infra-server/static/workflow-openshift-4-demo.yaml b/chart/infra-server/static/workflow-openshift-4-demo.yaml index d8ef0f840..be47c5012 100644 --- a/chart/infra-server/static/workflow-openshift-4-demo.yaml +++ b/chart/infra-server/static/workflow-openshift-4-demo.yaml @@ -76,7 +76,7 @@ spec: - name: create container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.2 imagePullPolicy: Always volumeMounts: - name: data @@ -256,7 +256,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.2 imagePullPolicy: Always command: - entrypoint.sh diff --git a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml index f3b2cfc03..bbb6b5733 100644 --- a/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml +++ b/chart/infra-server/static/workflow-openshift-4-perf-scale.yaml @@ -79,7 +79,7 @@ spec: archive: tar: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.2 imagePullPolicy: Always command: - entrypoint.sh @@ -155,7 +155,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.2 imagePullPolicy: Always command: - entrypoint.sh diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index e8d13c43a..d0f74adf3 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -79,7 +79,7 @@ spec: archive: tar: {} container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.2 imagePullPolicy: Always command: - entrypoint.sh @@ -155,7 +155,7 @@ spec: - name: destroy container: - image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.1-4-g85c5c37504-snapshot + image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-0.8.2 imagePullPolicy: Always command: - entrypoint.sh