Skip to content

Commit d19845d

Browse files
tremestremes
authored
Boilerplate: Subscribe at f2283ca508e2f9af2e1f1d08e86051aefdad0386 (#227)
Conventions: - openshift/golang-osd-operator: Update
1 parent e959ce1 commit d19845d

18 files changed

+261
-64
lines changed

Diff for: ‎.ci-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: boilerplate
33
namespace: openshift
4-
tag: image-v2.3.2
4+
tag: image-v3.0.2

Diff for: ‎.github/dependabot.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "docker"
4+
directory: "/build"
5+
labels:
6+
- "area/dependency"
7+
- "ok-to-test"
8+
schedule:
9+
interval: "weekly"
10+
ignore:
11+
- dependency-name: "app-sre/boilerplate"
12+
# don't upgrade boilerplate via these means

Diff for: ‎OWNERS_ALIASES

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# ================================ DO NOT EDIT ================================
2+
# This file is managed in https://github.com/openshift/boilerplate
3+
# See the OWNERS_ALIASES docs: https://git.k8s.io/community/contributors/guide/owners.md#OWNERS_ALIASES
4+
# =============================================================================
5+
aliases:
6+
srep-functional-team-aurora:
7+
- abyrne55
8+
- bdematte
9+
- boranx
10+
- dakotalongRH
11+
- lnguyen1401
12+
- luis-falcon
13+
- rafael-azevedo
14+
srep-functional-team-fedramp:
15+
- tonytheleg
16+
- theautoroboto
17+
- rhdedgar
18+
- katherinelc321
19+
- robotmaxtron
20+
- rojasreinold
21+
srep-functional-team-hulk:
22+
- mrbarge
23+
- a7vicky
24+
- bmeng
25+
- jwai7
26+
- rendhalver
27+
- ravitri
28+
- shitaljante
29+
- weherdh
30+
srep-functional-team-orange:
31+
- bng0y
32+
- typeid
33+
- Makdaam
34+
- Nikokolas3270
35+
- ninabauer
36+
- RaphaelBut
37+
- Tessg22
38+
- thavlice
39+
srep-functional-team-rocket:
40+
- anispate
41+
- yithian
42+
- aliceh
43+
- bdmiller3
44+
- mjlshen
45+
- sam-nguyen7
46+
- tnierman
47+
srep-functional-team-security:
48+
- karthikperu7
49+
- clcollins
50+
- gsleeman
51+
- jaybeeunix
52+
- wshearn
53+
srep-functional-team-thor:
54+
- wanghaoran1988
55+
- MitaliBhalla
56+
- hectorakemp
57+
- reetika-vyas
58+
- feichashao
59+
- supreeth7
60+
- Tafhim
61+
srep-functional-team-v1alpha1:
62+
- iamkirkbater
63+
- AlexVulaj
64+
- T0MASD
65+
- bergmannf
66+
- dkeohane
67+
- reedcort
68+
- mrWinston
69+
srep-functional-leads:
70+
- mrbarge
71+
- rafael-azevedo
72+
- wanghaoran1988
73+
- sam-nguyen7
74+
- iamkirkbater
75+
- bng0y
76+
- tonytheleg
77+
- karthikperu7
78+
srep-team-leads:
79+
- cblecker
80+
- jharrington22
81+
- NautiluX
82+
- rogbas
83+
- jewzaam
84+
- fahlmant
85+
- dustman9000
86+
srep-architects:
87+
- jewzaam
88+
- jharrington22
89+
- cblecker

Diff for: ‎pkg/apis/apis.go renamed to ‎api/apis.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package apis
1+
package api
22

33
import (
44
"k8s.io/apimachinery/pkg/runtime"

Diff for: ‎boilerplate/_data/backing-image-tag

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
image-v2.3.2
1+
image-v3.0.2

Diff for: ‎boilerplate/_data/last-boilerplate-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2bdc59eec75cc9dcd03c2d790e7bea9138579ce7
1+
f2283ca508e2f9af2e1f1d08e86051aefdad0386

Diff for: ‎boilerplate/_lib/container-make

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ CONTAINER_MOUNT=/go/src/$(repo_import $REPO_ROOT)
1919

2020
# First set up a detached container with the repo mounted.
2121
banner "Starting the container"
22+
CE_OPTS="--platform=linux/amd64"
2223
if [[ "${CONTAINER_ENGINE##*/}" == "podman" ]]; then
23-
if [[ $OSTYPE == *"darwin"* ]]; then
24-
CE_OPTS="--userns keep-id -v $REPO_ROOT:$CONTAINER_MOUNT"
25-
else
26-
CE_OPTS="--userns keep-id -v $REPO_ROOT:$CONTAINER_MOUNT:Z"
27-
fi
24+
CE_OPTS="${CE_OPTS} --userns keep-id"
25+
fi
26+
if [[ "${CONTAINER_ENGINE##*/}" == "podman" ]] && [[ $OSTYPE == *"linux"* ]]; then
27+
CE_OPTS="${CE_OPTS} -v $REPO_ROOT:$CONTAINER_MOUNT:Z"
2828
else
29-
CE_OPTS="-v $REPO_ROOT:$CONTAINER_MOUNT"
29+
CE_OPTS="${CE_OPTS} -v $REPO_ROOT:$CONTAINER_MOUNT"
3030
fi
3131
container_id=$($CONTAINER_ENGINE run -d ${CE_OPTS} $IMAGE_PULL_PATH sleep infinity)
3232

Diff for: ‎boilerplate/_lib/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ release_prep_clone() {
9797
# If a release repo clone wasn't specified, create one
9898
if [[ -z "$RELEASE_CLONE" ]]; then
9999
RELEASE_CLONE=$(mktemp -dt openshift_release_XXXXXXX)
100-
git clone [email protected]:${RELEASE_REPO}.git $RELEASE_CLONE
100+
git clone --depth=1 [email protected]:${RELEASE_REPO}.git $RELEASE_CLONE
101101
else
102102
[[ -z "$(git -C $RELEASE_CLONE status --porcelain)" ]] || err "
103103
Your release clone must start clean."

Diff for: ‎boilerplate/openshift/golang-osd-operator/OWNERS_ALIASES

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
# ================================ DO NOT EDIT ================================
2+
# This file is managed in https://github.com/openshift/boilerplate
3+
# See the OWNERS_ALIASES docs: https://git.k8s.io/community/contributors/guide/owners.md#OWNERS_ALIASES
4+
# =============================================================================
5+
aliases:
6+
srep-functional-team-aurora:
7+
- abyrne55
8+
- bdematte
9+
- boranx
10+
- dakotalongRH
11+
- lnguyen1401
12+
- luis-falcon
13+
- rafael-azevedo
14+
srep-functional-team-fedramp:
15+
- tonytheleg
16+
- theautoroboto
17+
- rhdedgar
18+
- katherinelc321
19+
- robotmaxtron
20+
- rojasreinold
21+
srep-functional-team-hulk:
22+
- mrbarge
23+
- a7vicky
24+
- bmeng
25+
- jwai7
26+
- rendhalver
27+
- ravitri
28+
- shitaljante
29+
- weherdh
30+
srep-functional-team-orange:
31+
- bng0y
32+
- typeid
33+
- Makdaam
34+
- Nikokolas3270
35+
- ninabauer
36+
- RaphaelBut
37+
- Tessg22
38+
- thavlice
39+
srep-functional-team-rocket:
40+
- anispate
41+
- yithian
42+
- aliceh
43+
- bdmiller3
44+
- mjlshen
45+
- sam-nguyen7
46+
- tnierman
47+
srep-functional-team-security:
48+
- karthikperu7
49+
- clcollins
50+
- gsleeman
51+
- jaybeeunix
52+
- wshearn
53+
srep-functional-team-thor:
54+
- wanghaoran1988
55+
- MitaliBhalla
56+
- hectorakemp
57+
- reetika-vyas
58+
- feichashao
59+
- supreeth7
60+
- Tafhim
61+
srep-functional-team-v1alpha1:
62+
- iamkirkbater
63+
- AlexVulaj
64+
- T0MASD
65+
- bergmannf
66+
- dkeohane
67+
- reedcort
68+
- mrWinston
69+
srep-functional-leads:
70+
- mrbarge
71+
- rafael-azevedo
72+
- wanghaoran1988
73+
- sam-nguyen7
74+
- iamkirkbater
75+
- bng0y
76+
- tonytheleg
77+
- karthikperu7
78+
srep-team-leads:
79+
- cblecker
80+
- jharrington22
81+
- NautiluX
82+
- rogbas
83+
- jewzaam
84+
- fahlmant
85+
- dustman9000
86+
srep-architects:
87+
- jewzaam
88+
- jharrington22
89+
- cblecker

Diff for: ‎boilerplate/openshift/golang-osd-operator/dependabot.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "docker"
4+
directory: "/build"
5+
labels:
6+
- "area/dependency"
7+
- "ok-to-test"
8+
schedule:
9+
interval: "weekly"
10+
ignore:
11+
- dependency-name: "app-sre/boilerplate"
12+
# don't upgrade boilerplate via these means

Diff for: ‎boilerplate/openshift/golang-osd-operator/fips.go.tmplt

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build fips_enabled
12
// +build fips_enabled
23

34
// BOILERPLATE GENERATED -- DO NOT EDIT

Diff for: ‎boilerplate/openshift/golang-osd-operator/golangci.yml

-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,11 @@ issues:
1616
linters:
1717
disable-all: true
1818
enable:
19-
- deadcode
2019
- errcheck
2120
- gosec
2221
- gosimple
2322
- govet
2423
- ineffassign
2524
- staticcheck
26-
- structcheck
2725
- typecheck
2826
- unused
29-
- varcheck

0 commit comments

Comments
 (0)