Skip to content

Commit 0aebe7e

Browse files
joelanfordjoelanford
committed
WIP: initial transition to Helm v3 and K8s 1.16
1 parent 36b6de4 commit 0aebe7e

33 files changed

+1144
-860
lines changed

‎cmd/operator-sdk/new/cmd.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
"github.com/operator-framework/operator-sdk/internal/scaffold/input"
2929
"github.com/operator-framework/operator-sdk/internal/util/projutil"
3030

31+
"github.com/ghodss/yaml"
3132
"github.com/pkg/errors"
3233
log "github.com/sirupsen/logrus"
3334
"github.com/spf13/cobra"
@@ -308,8 +309,13 @@ func doHelmScaffold() error {
308309
return fmt.Errorf("failed to create helm chart: %s", err)
309310
}
310311

311-
valuesPath := filepath.Join("<project_dir>", helm.HelmChartsDir, chart.GetMetadata().GetName(), "values.yaml")
312-
crSpec := fmt.Sprintf("# Default values copied from %s\n\n%s", valuesPath, chart.GetValues().GetRaw())
312+
valuesPath := filepath.Join("<project_dir>", helm.HelmChartsDir, chart.Name(), "values.yaml")
313+
314+
rawValues, err := yaml.Marshal(chart.Values)
315+
if err != nil {
316+
return fmt.Errorf("failed to get raw chart values: %s", err)
317+
}
318+
crSpec := fmt.Sprintf("# Default values copied from %s\n\n%s", valuesPath, rawValues)
313319

314320
roleScaffold := helm.DefaultRoleScaffold
315321
if k8sCfg, err := config.GetConfig(); err != nil {
@@ -325,7 +331,7 @@ func doHelmScaffold() error {
325331
&helm.Dockerfile{},
326332
&helm.WatchesYAML{
327333
Resource: resource,
328-
ChartName: chart.GetMetadata().GetName(),
334+
ChartName: chart.Name(),
329335
},
330336
&scaffold.ServiceAccount{},
331337
&roleScaffold,

‎go.mod

Lines changed: 48 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,90 +3,84 @@ module github.com/operator-framework/operator-sdk
33
go 1.13
44

55
require (
6-
github.com/DATA-DOG/go-sqlmock v1.3.3 // indirect
7-
github.com/Masterminds/goutils v1.1.0 // indirect
8-
github.com/Masterminds/semver v1.5.0 // indirect
9-
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
106
github.com/blang/semver v3.5.1+incompatible
11-
github.com/coreos/go-semver v0.2.0
12-
github.com/coreos/prometheus-operator v0.29.0
13-
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
14-
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
15-
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
16-
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
17-
github.com/fatih/camelcase v1.0.0 // indirect
18-
github.com/ghodss/yaml v1.0.1-0.20180820084758-c7ce16629ff4
7+
github.com/coreos/go-semver v0.3.0
8+
github.com/coreos/prometheus-operator v0.33.0
9+
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
1910
github.com/go-logr/logr v0.1.0
2011
github.com/go-logr/zapr v0.1.1
21-
github.com/gobuffalo/packr v1.30.1 // indirect
22-
github.com/gobwas/glob v0.2.3 // indirect
23-
github.com/huandu/xstrings v1.2.0 // indirect
24-
github.com/iancoleman/strcase v0.0.0-20180726023541-3605ed457bf7
25-
github.com/jmoiron/sqlx v1.2.0 // indirect
26-
github.com/lib/pq v1.2.0 // indirect
12+
github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365
2713
github.com/markbates/inflect v1.0.4
28-
github.com/martinlindhe/base36 v0.0.0-20180729042928-5cda0030da17
14+
github.com/martinlindhe/base36 v1.0.0
2915
github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a
3016
github.com/mattn/go-isatty v0.0.8
31-
github.com/mitchellh/copystructure v1.0.0 // indirect
3217
github.com/mitchellh/go-homedir v1.1.0
3318
github.com/mitchellh/mapstructure v1.1.2
34-
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
19+
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190926160646-a61144936680
3520
github.com/operator-framework/operator-registry v1.1.1
3621
github.com/pborman/uuid v1.2.0
3722
github.com/pkg/errors v0.8.1
38-
github.com/prometheus/client_golang v1.0.0
23+
github.com/prometheus/client_golang v1.1.0
3924
github.com/rogpeppe/go-internal v1.5.0
40-
github.com/rubenv/sql-migrate v0.0.0-20191022111038-5cdff0d8cc42 // indirect
4125
github.com/sergi/go-diff v1.0.0
4226
github.com/sirupsen/logrus v1.4.2
4327
github.com/spf13/afero v1.2.2
4428
github.com/spf13/cobra v0.0.5
4529
github.com/spf13/pflag v1.0.3
4630
github.com/spf13/viper v1.4.0
47-
github.com/stretchr/testify v1.3.0
48-
github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 // indirect
49-
github.com/ziutek/mymysql v1.5.4 // indirect
31+
github.com/stretchr/testify v1.4.0
5032
go.uber.org/zap v1.10.0
5133
golang.org/x/tools v0.0.0-20191018212557-ed542cd5b28a
52-
gopkg.in/gorp.v1 v1.7.2 // indirect
53-
gopkg.in/yaml.v2 v2.2.2
34+
gopkg.in/yaml.v2 v2.2.4
35+
helm.sh/helm/v3 v3.0.0-beta.5
5436
k8s.io/api v0.0.0
5537
k8s.io/apiextensions-apiserver v0.0.0
5638
k8s.io/apimachinery v0.0.0
5739
k8s.io/cli-runtime v0.0.0
5840
k8s.io/client-go v11.0.0+incompatible
5941
k8s.io/code-generator v0.0.0
6042
k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f
61-
k8s.io/helm v2.15.0+incompatible
62-
k8s.io/klog v0.3.3
43+
k8s.io/klog v0.4.0
6344
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
64-
k8s.io/kube-state-metrics v1.7.2
65-
k8s.io/kubernetes v1.15.4
66-
sigs.k8s.io/controller-runtime v0.3.0
45+
k8s.io/kube-state-metrics v1.8.0
46+
k8s.io/kubectl v0.0.0
47+
k8s.io/kubernetes v1.16.2 // indirect
48+
sigs.k8s.io/controller-runtime v0.3.1-0.20191022174215-ad57a976ffa1 // TODO: bump to v0.4.0 when released
6749
sigs.k8s.io/controller-tools v0.2.2
6850
)
6951

70-
// Pinned to kubernetes-1.15.4
52+
// Pinned to kubernetes-1.16.2
7153
replace (
72-
k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
73-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
74-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
75-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
76-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
77-
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
78-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
79-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
80-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
81-
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
82-
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
83-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
84-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
85-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
86-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
87-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918202713-c34a54b3ec8e
88-
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918202550-958285cf3eef
89-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
90-
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
91-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
54+
k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a
55+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
56+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
57+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
58+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5
59+
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
60+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191016115326-20453efc2458
61+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191016115129-c07a134afb42
62+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
63+
k8s.io/component-base => k8s.io/component-base v0.0.0-20191016111319-039242c015a9
64+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
65+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20191016115521-756ffa5af0bd
66+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20191016112429-9587704a8ad4
67+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20191016114939-2b2b218dc1df
68+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20191016114407-2e83b6f20229
69+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20191016114748-65049c67a58b
70+
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20191016120415-2ed914427d51
71+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20191016114556-7841ed97f1b2
72+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191016115753-cf0698c3a16b
73+
k8s.io/metrics => k8s.io/metrics v0.0.0-20191016113814-3b1a734dba6e
74+
k8s.io/node-api => k8s.io/node-api v0.0.0-20191016115955-b0b11a2622b0
75+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
76+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20191016114214-d25a4244b17f
77+
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20191016113152-0c2dd40eec0c
78+
)
79+
80+
replace (
81+
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
82+
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20191025141232-e7fa4b871a25+incompatible // Required by OLM
83+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20191022152013-2823239d2298 // Required by OLM
84+
github.com/prometheus/prometheus => github.com/prometheus/prometheus v2.3.2+incompatible // Need this to get prometheus-operator dep to work
85+
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20191023203907-336d3378ca53 // Required by OLM
9286
)

0 commit comments

Comments
 (0)