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.

Sign up for GitHub

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

Jump to bottom

Add sideEffects field to Webhooks #2963

Merged
merged 6 commits into from Jun 21, 2019
Merged

Add sideEffects field to Webhooks #2963

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ec0c18
Bump min supported version to 1.12
Pothulapati Jun 18, 2019
3dd2986
Add SideEffects field and corresponding omit flag
Pothulapati Jun 18, 2019
45adf1f
updating golden test outputs
Pothulapati Jun 18, 2019
f452d34
omit flag dosent have to be exported
Pothulapati Jun 20, 2019
d09cab2
add flag to proto to support upgrade
Pothulapati Jun 20, 2019
1456dd9
Fix inconsistency during upgrade command
Pothulapati Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions chart/templates/proxy_injector-rbac.yaml
View file
Open in desktop
Expand Up @@ -77,4 +77,7 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
{{- if not .OmitWebhookSideEffects }}
sideEffects: None
{{- end }}
{{end -}}
3 changes: 3 additions & 0 deletions chart/templates/sp_validator-rbac.yaml
View file
Open in desktop
Expand Up @@ -67,4 +67,7 @@ webhooks:
apiGroups: ["linkerd.io"]
apiVersions: ["v1alpha1"]
resources: ["serviceprofiles"]
{{- if not .OmitWebhookSideEffects }}
sideEffects: None
{{- end }}
{{end -}}
58 changes: 33 additions & 25 deletions cli/cmd/install.go
View file
Open in desktop
Expand Up @@ -58,6 +58,7 @@ type (
EnableH2Upgrade bool
NoInitContainer bool
WebhookFailurePolicy string
OmitWebhookSideEffects bool

Configs configJSONs

Expand Down Expand Up @@ -119,15 +120,16 @@ type (
// in order to hold values for command line flags that apply to both inject and
// install.
installOptions struct {
controlPlaneVersion string
controllerReplicas uint
controllerLogLevel string
highAvailability bool
controllerUID int64
disableH2Upgrade bool
noInitContainer bool
skipChecks bool
identityOptions *installIdentityOptions
controlPlaneVersion string
controllerReplicas uint
controllerLogLevel string
highAvailability bool
controllerUID int64
disableH2Upgrade bool
noInitContainer bool
skipChecks bool
OmitWebhookSideEffects bool
Pothulapati marked this conversation as resolved.
Show resolved Hide resolved
identityOptions *installIdentityOptions
*proxyConfigOptions

recordedFlags []*pb.Install_Flag
Expand Down Expand Up @@ -169,13 +171,14 @@ const (
// injection-time.
func newInstallOptionsWithDefaults() *installOptions {
return &installOptions{
controlPlaneVersion: version.Version,
controllerReplicas: defaultControllerReplicas,
controllerLogLevel: "info",
highAvailability: false,
controllerUID: 2103,
disableH2Upgrade: false,
noInitContainer: false,
controlPlaneVersion: version.Version,
controllerReplicas: defaultControllerReplicas,
controllerLogLevel: "info",
highAvailability: false,
controllerUID: 2103,
disableH2Upgrade: false,
noInitContainer: false,
OmitWebhookSideEffects: false,
proxyConfigOptions: &proxyConfigOptions{
proxyVersion: version.Version,
ignoreCluster: false,
Expand Down Expand Up @@ -435,6 +438,10 @@ func (options *installOptions) recordableFlagSet() *pflag.FlagSet {
&options.identityOptions.clockSkewAllowance, "identity-clock-skew-allowance", options.identityOptions.clockSkewAllowance,
"The amount of time to allow for clock skew within a Linkerd cluster",
)
flags.BoolVar(
&options.OmitWebhookSideEffects, "omit-webhook-side-effects", options.OmitWebhookSideEffects,
"Omit the sideEffects flag in the webhook manifests, to run on Kubernetes versions less than 1.12",
Pothulapati marked this conversation as resolved.
Show resolved Hide resolved
)

flags.StringVarP(&options.controlPlaneVersion, "control-plane-version", "", options.controlPlaneVersion, "(Development) Tag to be used for the control plane component images")
flags.MarkHidden("control-plane-version")
Expand Down Expand Up @@ -566,15 +573,16 @@ func (options *installOptions) buildValuesWithoutIdentity(configs *pb.All) (*ins
LinkerdNamespaceLabel: k8s.LinkerdNamespaceLabel,

// Controller configuration:
Namespace: controlPlaneNamespace,
UUID: configs.GetInstall().GetUuid(),
ControllerReplicas: options.controllerReplicas,
ControllerLogLevel: options.controllerLogLevel,
ControllerUID: options.controllerUID,
EnableH2Upgrade: !options.disableH2Upgrade,
NoInitContainer: options.noInitContainer,
WebhookFailurePolicy: "Ignore",
PrometheusLogLevel: toPromLogLevel(strings.ToLower(options.controllerLogLevel)),
Namespace: controlPlaneNamespace,
UUID: configs.GetInstall().GetUuid(),
ControllerReplicas: options.controllerReplicas,
ControllerLogLevel: options.controllerLogLevel,
ControllerUID: options.controllerUID,
EnableH2Upgrade: !options.disableH2Upgrade,
NoInitContainer: options.noInitContainer,
WebhookFailurePolicy: "Ignore",
OmitWebhookSideEffects: options.OmitWebhookSideEffects,
PrometheusLogLevel: toPromLogLevel(strings.ToLower(options.controllerLogLevel)),

Configs: configJSONs{
Global: globalJSON,
Expand Down
2 changes: 2 additions & 0 deletions cli/cmd/testdata/install_config.golden
View file
Open in desktop
Expand Up @@ -319,6 +319,7 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
sideEffects: None
---
###
### Service Profile Validator RBAC
Expand Down Expand Up @@ -387,6 +388,7 @@ webhooks:
apiGroups: ["linkerd.io"]
apiVersions: ["v1alpha1"]
resources: ["serviceprofiles"]
sideEffects: None
---
###
### Tap RBAC
Expand Down
2 changes: 2 additions & 0 deletions cli/cmd/testdata/install_default.golden
View file
Open in desktop
Expand Up @@ -319,6 +319,7 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
sideEffects: None
---
###
### Service Profile Validator RBAC
Expand Down Expand Up @@ -387,6 +388,7 @@ webhooks:
apiGroups: ["linkerd.io"]
apiVersions: ["v1alpha1"]
resources: ["serviceprofiles"]
sideEffects: None
---
###
### Tap RBAC
Expand Down
2 changes: 2 additions & 0 deletions cli/cmd/testdata/install_ha_output.golden
View file
Open in desktop
Expand Up @@ -319,6 +319,7 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
sideEffects: None
---
###
### Service Profile Validator RBAC
Expand Down Expand Up @@ -387,6 +388,7 @@ webhooks:
apiGroups: ["linkerd.io"]
apiVersions: ["v1alpha1"]
resources: ["serviceprofiles"]
sideEffects: None
---
###
### Tap RBAC
Expand Down
2 changes: 2 additions & 0 deletions cli/cmd/testdata/install_ha_with_overrides_output.golden
View file
Open in desktop
Expand Up @@ -319,6 +319,7 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
sideEffects: None
---
###
### Service Profile Validator RBAC
Expand Down Expand Up @@ -387,6 +388,7 @@ webhooks:
apiGroups: ["linkerd.io"]
apiVersions: ["v1alpha1"]
resources: ["serviceprofiles"]
sideEffects: None
---
###
### Tap RBAC
Expand Down
2 changes: 2 additions & 0 deletions cli/cmd/testdata/install_no_init_container.golden
View file
Open in desktop
Expand Up @@ -319,6 +319,7 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
sideEffects: None
---
###
### Service Profile Validator RBAC
Expand Down Expand Up @@ -387,6 +388,7 @@ webhooks:
apiGroups: ["linkerd.io"]
apiVersions: ["v1alpha1"]
resources: ["serviceprofiles"]
sideEffects: None
---
###
### Tap RBAC
Expand Down
2 changes: 2 additions & 0 deletions cli/cmd/testdata/install_output.golden
View file
Open in desktop
Expand Up @@ -319,6 +319,7 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
sideEffects: None
---
###
### Service Profile Validator RBAC
Expand Down Expand Up @@ -387,6 +388,7 @@ webhooks:
apiGroups: ["linkerd.io"]
apiVersions: ["v1alpha1"]
resources: ["serviceprofiles"]
sideEffects: None
---
###
### Tap RBAC
Expand Down
2 changes: 2 additions & 0 deletions cli/cmd/testdata/upgrade_default.golden
View file
Open in desktop
Expand Up @@ -319,6 +319,7 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
sideEffects: None
---
###
### Service Profile Validator RBAC
Expand Down Expand Up @@ -387,6 +388,7 @@ webhooks:
apiGroups: ["linkerd.io"]
apiVersions: ["v1alpha1"]
resources: ["serviceprofiles"]
sideEffects: None
---
###
### Tap RBAC
Expand Down
2 changes: 2 additions & 0 deletions cli/cmd/testdata/upgrade_ha.golden
View file
Open in desktop
Expand Up @@ -319,6 +319,7 @@ webhooks:
apiGroups: [""]
apiVersions: ["v1"]
resources: ["pods"]
sideEffects: None
---
###
### Service Profile Validator RBAC
Expand Down Expand Up @@ -387,6 +388,7 @@ webhooks:
apiGroups: ["linkerd.io"]
apiVersions: ["v1alpha1"]
resources: ["serviceprofiles"]
sideEffects: None
---
###
### Tap RBAC
Expand Down
2 changes: 1 addition & 1 deletion pkg/k8s/api.go
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ import (
_ "k8s.io/client-go/plugin/pkg/client/auth"
)

var minAPIVersion = [3]int{1, 10, 0}
var minAPIVersion = [3]int{1, 12, 0}

// KubernetesAPI provides a client for accessing a Kubernetes cluster.
// TODO: support ServiceProfile ClientSet. A prerequisite is moving the
Expand Down