Skip to content

Commit 712f9d5

Browse files
committed
update v2 samples and add v3 samples
1 parent 3546167 commit 712f9d5

File tree

136 files changed

+3108
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+3108
-14
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
entries:
2+
- description: >
3+
(go/v2) bumped controller-runtime from v0.6.3 to v0.6.4
4+
kind: change
5+
migration:
6+
header: Go projects should update their controller-runtime version to v0.6.4
7+
body: >
8+
In your go.mod file, update the sigs.k8s.io/controller-runtime version to v0.6.4

go.sum

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,9 +1229,6 @@ sigs.k8s.io/controller-runtime v0.6.3 h1:SBbr+inLPEKhvlJtrvDcwIpm+uhDvp63Bl72xYJ
12291229
sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY=
12301230
sigs.k8s.io/controller-tools v0.3.0 h1:y3YD99XOyWaXkiF1kd41uRvfp/64teWcrEZFuHxPhJ4=
12311231
sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI=
1232-
sigs.k8s.io/kubebuilder v1.0.8 h1:XYctSbuOICM9z1Ok0GIWChc1cj90EEEczeJQnb7ZPf0=
1233-
sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201204182959-6b775b860148 h1:Wcp7eE1mnaXcmI2ltDoAaCKmX1cE4sGkd70JNQ49gBY=
1234-
sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201204182959-6b775b860148/go.mod h1:J/D/179LBZhQOhRvmMRNbje/Bk+PjbN0/fzUupmO7+U=
12351232
sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201204230216-593f2e80cdf6 h1:SE+xhj4aauOCSeZKjRizd6VwHgkVfJABJpVk/xqYTiI=
12361233
sigs.k8s.io/kubebuilder/v2 v2.3.2-0.20201204230216-593f2e80cdf6/go.mod h1:J/D/179LBZhQOhRvmMRNbje/Bk+PjbN0/fzUupmO7+U=
12371234
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=

hack/generate/samples/generate_testdata.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
log "github.com/sirupsen/logrus"
2323

2424
"github.com/operator-framework/operator-sdk/hack/generate/samples/internal/ansible"
25-
gosamples "github.com/operator-framework/operator-sdk/hack/generate/samples/internal/go"
25+
golang "github.com/operator-framework/operator-sdk/hack/generate/samples/internal/go"
2626
"github.com/operator-framework/operator-sdk/hack/generate/samples/internal/helm"
2727
"github.com/operator-framework/operator-sdk/internal/testutils"
2828
)
@@ -54,5 +54,5 @@ func main() {
5454
ansible.GenerateMemcachedAnsibleSample(samplesPath)
5555

5656
log.Infof("creating Go Memcached Sample with Webhooks")
57-
gosamples.GenerateMemcachedGoWithWebhooksSample(samplesPath)
57+
golang.GenerateMemcachedGoWithWebhooksSample(samplesPath)
5858
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Copyright 2020 The Operator-SDK Authors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
package pkg
16+
17+
import (
18+
"path/filepath"
19+
20+
golangv2 "github.com/operator-framework/operator-sdk/hack/generate/samples/internal/go/v2"
21+
golangv3 "github.com/operator-framework/operator-sdk/hack/generate/samples/internal/go/v3"
22+
)
23+
24+
func GenerateMemcachedGoWithWebhooksSample(rootPath string) {
25+
golangv2.GenerateMemcachedGoWithWebhooksSample(filepath.Join(rootPath, "go", "v2"))
26+
golangv3.GenerateMemcachedGoWithWebhooksSample(filepath.Join(rootPath, "go", "v3"))
27+
}

0 commit comments

Comments
 (0)