Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mage crds #716

Merged
merged 3 commits into from
Jan 14, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix lint
philipgough committed Jan 14, 2025
commit e126d69e1540c169b138c2da62e65bf510cbc18d
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ require (
github.com/bwplotka/mimic v0.2.1-0.20230303101552-f705cca2f4a4
github.com/go-kit/log v0.2.1
github.com/google/go-jsonnet v0.20.0
github.com/magefile/mage v1.15.0
github.com/observatorium/api v0.1.3-0.20230711132510-96e8799ade44
github.com/observatorium/observatorium v0.0.0-20240202123905-a8245e065e5c
github.com/observatorium/up v0.0.0-20240109115132-3a34c4c4fa24
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -901,8 +901,6 @@ github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0U
github.com/linode/linodego v1.2.1/go.mod h1:x/7+BoaKd4unViBmS2umdjYyVAmpFtBtEXZ0wou7FYQ=
github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
6 changes: 2 additions & 4 deletions magefiles/magefile.go
Original file line number Diff line number Diff line change
@@ -14,12 +14,10 @@ import (
v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
yaml2 "k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/apimachinery/pkg/util/yaml"
)

const (
namespace = "rhobs"

templatePath = "resources"
templateServicesPath = "services"
)
@@ -58,7 +56,7 @@ func CRDS() error {
}

var obj v1.CustomResourceDefinition
decoder := yaml2.NewYAMLOrJSONDecoder(resp.Body, 100000)
decoder := yaml.NewYAMLOrJSONDecoder(resp.Body, 100000)
err = decoder.Decode(&obj)
if err != nil {
return fmt.Errorf("failed to decode %s: %w", manifest, err)