Skip to content

Commit

Permalink
Move CoreOS stream metadata to data/data/coreos, add OWNERS
Browse files Browse the repository at this point in the history
It's more logically owned by the CoreOS team and this will
allow us to have a separate `OWNERS` file.

The `OWNERS` file is copied from the current one in openshift/os.
  • Loading branch information
cgwalters committed Oct 27, 2021
1 parent d773ee5 commit 61605bd
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 3 deletions.
33 changes: 33 additions & 0 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,36 @@ aliases:
ibmcloud-reviewers:
- bobbyradford
- hasueki
# Keep in sync with the `coreos-approvers` and `coreos-reviewers` lists in https://github.com/openshift/release/blob/master/OWNERS_ALIASES
coreos-approvers:
- miabbott
- cgwalters
- bgilbert
- dustymabe
- mike-nguyen
- jlebon
- ashcrow
- lucab
- sohankunkerkar
- travier
- saqibali-2k
- HuijingHei
- jmarrero
- aaradhak
- ravanelli
coreos-reviewers:
- miabbott
- cgwalters
- bgilbert
- dustymabe
- mike-nguyen
- jlebon
- ashcrow
- lucab
- sohankunkerkar
- travier
- saqibali-2k
- HuijingHei
- jmarrero
- aaradhak
- ravanelli
8 changes: 8 additions & 0 deletions data/data/coreos/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# See the OWNERS docs: https://git.k8s.io/community/contributors/guide/owners.md
# This file should mirror the list of users defined on coreos-approvers in:
# https://github.com/openshift/release/blob/master/OWNERS_ALIASES

approvers:
- coreos-approvers
reviewers:
- coreos-reviewers
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion hack/build-coreos-manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import (
)

const (
streamJSON = "data/data/rhcos-stream.json"
// FIXME - Add an OKD conditional here
streamJSON = "data/data/coreos/rhcos.json"
dest = "bin/manifests/coreos-bootimages.yaml"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/rhcos/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
package rhcos

func getStreamFileName() string {
return "rhcos-stream.json"
return "coreos/rhcos.json"
}
2 changes: 1 addition & 1 deletion pkg/rhcos/stream_okd.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
package rhcos

func getStreamFileName() string {
return "fcos-stream.json"
return "coreos/fcos.json"
}

0 comments on commit 61605bd

Please sign in to comment.