Skip to content

Commit 0e5c138

Browse files
Added Tests
1 parent a207137 commit 0e5c138

12 files changed

+2520
-784
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,4 +267,4 @@ require (
267267
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
268268
)
269269

270-
replace github.com/openshift/api => github.com/anirudhAgniRedhat/openshift-api v0.0.2
270+
replace github.com/openshift/api => github.com/anirudhAgniRedhat/openshift-api v0.1.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pO
7171
github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
7272
github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw=
7373
github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I=
74-
github.com/anirudhAgniRedhat/openshift-api v0.0.2 h1:a8hXwzEWWmF3/ea/KTuZLAfF4XBJL9xKjWLpYxuWnHw=
75-
github.com/anirudhAgniRedhat/openshift-api v0.0.2/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
74+
github.com/anirudhAgniRedhat/openshift-api v0.1.2 h1:hm9pEd3ySb3XoiTdeqcc2fT4boM9TIlMy3ERMCc21S4=
75+
github.com/anirudhAgniRedhat/openshift-api v0.1.2/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
7676
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
7777
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
7878
github.com/ashanbrown/forbidigo v1.5.1 h1:WXhzLjOlnuDYPYQo/eFlcFMi8X/kLfvWLYu6CSoebis=

hack/crds-sync.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
set -euo pipefail
44

55
# map names of CRD files between the vendored openshift/api repository and the ./install directory
6-
CRDS_MAPPING=( "vendor/github.com/openshift/api/machine/v1beta1/0000_10_machine.crd.yaml:0000_30_machine-api-operator_02_machine.crd.yaml"
7-
"vendor/github.com/openshift/api/machine/v1beta1/0000_10_machineset.crd.yaml:0000_30_machine-api-operator_03_machineset.crd.yaml"
8-
"vendor/github.com/openshift/api/machine/v1beta1/0000_10_machinehealthcheck.yaml:0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml")
6+
CRDS_MAPPING=( "vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machines.crd.yaml:0000_30_machine-api-operator_02_machine.crd.yaml"
7+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets.crd.yaml:0000_30_machine-api-operator_03_machineset.crd.yaml"
8+
"vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinehealthchecks.crd.yaml:0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml")
99

1010
for crd in "${CRDS_MAPPING[@]}" ; do
1111
SRC="${crd%%:*}"

install/0000_30_machine-api-operator_02_machine.crd.yaml

Lines changed: 447 additions & 290 deletions
Large diffs are not rendered by default.

install/0000_30_machine-api-operator_03_machineset.crd.yaml

Lines changed: 522 additions & 318 deletions
Large diffs are not rendered by default.

install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml

Lines changed: 236 additions & 168 deletions
Large diffs are not rendered by default.

pkg/webhooks/machine_webhook.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"strconv"
1010
"strings"
1111

12+
_ "github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests"
1213
corev1 "k8s.io/api/core/v1"
1314
apierrors "k8s.io/apimachinery/pkg/api/errors"
1415
"k8s.io/apimachinery/pkg/api/resource"

vendor/github.com/openshift/api/machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinehealthchecks.crd.yaml

Lines changed: 263 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)