Skip to content

Commit dff5c1a

Browse files
authored
Merge pull request #7912 from chrischdi/pr-book-fix-runtimesdk-example
📖 Fix Runtime SDK implement extension sample to reflect updated k8s.io/component-base changes
2 parents b3665e0 + df53223 commit dff5c1a

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

docs/book/src/developer/tilt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ A provider must supply a `tilt-provider.yaml` file describing how to build it. H
365365
```yaml
366366
name: aws
367367
config:
368-
image: "gcr.io/k8s-staging-cluster-api-aws/cluster-api-aws-controller",
368+
image: "gcr.io/k8s-staging-cluster-api-aws/cluster-api-aws-controller"
369369
live_reload_deps: ["main.go", "go.mod", "go.sum", "api", "cmd", "controllers", "pkg"]
370370
label: CAPA
371371
```

docs/book/src/tasks/experimental-features/runtime-sdk/implement-extensions.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ import (
4646
"github.com/spf13/pflag"
4747
cliflag "k8s.io/component-base/cli/flag"
4848
"k8s.io/component-base/logs"
49+
logsv1 "k8s.io/component-base/logs/api/v1"
4950
"k8s.io/klog/v2"
50-
"k8s.io/utils/pointer"
5151
ctrl "sigs.k8s.io/controller-runtime"
5252

5353
runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog"
@@ -75,7 +75,7 @@ func init() {
7575
func InitFlags(fs *pflag.FlagSet) {
7676
// Initialize logs flags using Kubernetes component-base machinery.
7777
logs.AddFlags(fs, logs.SkipLoggingConfigurationFlags())
78-
logOptions.AddFlags(fs)
78+
logsv1.AddFlags(logOptions, fs)
7979

8080
// Add test-extension specific flags
8181
fs.StringVar(&profilerAddress, "profiler-address", "",
@@ -99,7 +99,7 @@ func main() {
9999
pflag.Parse()
100100

101101
// Validates logs flags using Kubernetes component-base machinery and applies them
102-
if err := logOptions.ValidateAndApply(nil); err != nil {
102+
if err := logsv1.ValidateAndApply(logOptions, nil); err != nil {
103103
setupLog.Error(err, "unable to start extension")
104104
os.Exit(1)
105105
}
@@ -128,17 +128,17 @@ func main() {
128128

129129
// Register extension handlers.
130130
if err := webhookServer.AddExtensionHandler(server.ExtensionHandler{
131-
Hook: runtimehooksv1.BeforeClusterCreate,
132-
Name: "before-cluster-create",
133-
HandlerFunc: DoBeforeClusterCreate,
131+
Hook: runtimehooksv1.BeforeClusterCreate,
132+
Name: "before-cluster-create",
133+
HandlerFunc: DoBeforeClusterCreate,
134134
}); err != nil {
135135
setupLog.Error(err, "error adding handler")
136136
os.Exit(1)
137137
}
138138
if err := webhookServer.AddExtensionHandler(server.ExtensionHandler{
139-
Hook: runtimehooksv1.BeforeClusterUpgrade,
140-
Name: "before-cluster-upgrade",
141-
HandlerFunc: DoBeforeClusterUpgrade,
139+
Hook: runtimehooksv1.BeforeClusterUpgrade,
140+
Name: "before-cluster-upgrade",
141+
HandlerFunc: DoBeforeClusterUpgrade,
142142
}); err != nil {
143143
setupLog.Error(err, "error adding handler")
144144
os.Exit(1)

0 commit comments

Comments
 (0)