Skip to content

Commit

Permalink
bump knative version, remove build (#1762)
Browse files Browse the repository at this point in the history
* bump knative version, remove build
* dep, increase ci timeout
* revert timeout increase
  • Loading branch information
ilackarms authored and soloio-bulldozer[bot] committed Nov 25, 2019
1 parent 8a653ee commit c0dd0a2
Show file tree
Hide file tree
Showing 8 changed files with 1,681 additions and 1,661 deletions.
7 changes: 7 additions & 0 deletions changelog/v1.1.0/bump-knative.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
changelog:
- type: NEW_FEATURE
description: Bump default version of Knative Serving installed via glooctl install to 0.10.0
issueLink: https://github.com/solo-io/gloo/issues/1761
- type: NON_USER_FACING
description: Remove deprecated knative/build from install.
issueLink: https://github.com/solo-io/gloo/issues/1761
6 changes: 2 additions & 4 deletions docs/content/cli/glooctl_install_knative.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ glooctl install knative [flags]
-d, --dry-run Dump the raw installation yaml instead of applying it to kubernetes
-f, --file string Install Gloo from this Helm chart archive file rather than from a release
-h, --help help for knative
-b, --install-build Bundle Knative-Build with your Gloo installation. Requires install-knative to be true
--install-build-version true Version of Knative Build to install, when --install-build is set to true (default "0.7.0")
-e, --install-eventing Bundle Knative-Eventing with your Gloo installation. Requires install-knative to be true
--install-eventing-version true Version of Knative Eventing to install, when --install-eventing is set to true (default "0.7.0")
--install-eventing-version true Version of Knative Eventing to install, when --install-eventing is set to true (default "0.10.0")
-k, --install-knative Bundle Knative-Serving with your Gloo installation (default true)
--install-knative-version true Version of Knative Serving to install, when --install-knative is set to true. This version will also be used to install Knative Monitoring, --install-monitoring is set (default "0.8.0")
--install-knative-version true Version of Knative Serving to install, when --install-knative is set to true. This version will also be used to install Knative Monitoring, --install-monitoring is set (default "0.10.0")
-m, --install-monitoring Bundle Knative-Monitoring with your Gloo installation. Requires install-knative to be true
-n, --namespace string namespace to install gloo into (default "gloo-system")
-g, --skip-installing-gloo Skip installing Gloo. Only Knative components will be installed
Expand Down
5 changes: 3 additions & 2 deletions docs/content/installation/gateway/kubernetes/values.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
|settings.invalidConfigPolicy.replaceInvalidRoutes|bool|false|Rather than pausing configuration updates, in the event of an invalid Route defined on a virtual service or route table, Gloo will serve the route with a predefined direct response action. This allows valid routes to be updated when other routes are invalid.|
|settings.invalidConfigPolicy.invalidRouteResponseCode|int64|404|the response code for the direct response|
|settings.invalidConfigPolicy.invalidRouteResponseBody|string|Gloo Gateway has invalid configuration. Administrators should run `glooctl check` to find and fix config errors.|the response body for the direct response|
|settings.linkerd|bool|false|Enable automatic Linkerd integration in Gloo.|
|gloo.deployment.image.tag|string|<release_version, ex: 1.2.3>|tag for the container|
|gloo.deployment.image.repository|string|gloo|image name (repository) for the container.|
|gloo.deployment.image.registry|string||image prefix/registry e.g. (quay.io/solo-io)|
Expand Down Expand Up @@ -132,7 +133,7 @@
|gatewayProxies.NAME.gatewaySettings.useProxyProto|bool||use proxy protocol|
|gatewayProxies.NAME.gatewaySettings.customHttpGateway|string||custom yaml to use for http gateway settings|
|gatewayProxies.NAME.gatewaySettings.customHttpsGateway|string||custom yaml to use for https gateway settings|
|gatewayProxies.NAME.envoyArgs[]|string||envoy container args|
|gatewayProxies.NAME.extraEnvoyArgs[]|string||envoy container args, (e.g. https://www.envoyproxy.io/docs/envoy/latest/operations/cli)|
|gatewayProxies.NAME.extraContainersHelper|string|||
|gatewayProxies.NAME.extraInitContainersHelper|string|||
|gatewayProxies.NAME.extraVolumeHelper|string|||
Expand Down Expand Up @@ -183,7 +184,7 @@
|gatewayProxies.gatewayProxy.gatewaySettings.useProxyProto|bool|false|use proxy protocol|
|gatewayProxies.gatewayProxy.gatewaySettings.customHttpGateway|string||custom yaml to use for http gateway settings|
|gatewayProxies.gatewayProxy.gatewaySettings.customHttpsGateway|string||custom yaml to use for https gateway settings|
|gatewayProxies.gatewayProxy.envoyArgs[]|string||envoy container args|
|gatewayProxies.gatewayProxy.extraEnvoyArgs[]|string||envoy container args, (e.g. https://www.envoyproxy.io/docs/envoy/latest/operations/cli)|
|gatewayProxies.gatewayProxy.extraContainersHelper|string|||
|gatewayProxies.gatewayProxy.extraInitContainersHelper|string|||
|gatewayProxies.gatewayProxy.extraVolumeHelper|string|||
Expand Down
11 changes: 0 additions & 11 deletions projects/gloo/cli/pkg/cmd/install/knative.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ const (
installedByUsAnnotationKey = "gloo.solo.io/glooctl_install_info"

servingReleaseUrlTemplate = "https://github.com/knative/serving/releases/download/v%v/serving.yaml"
buildReleaseUrlTemplate = "https://github.com/knative/build/releases/download/v%v/build.yaml"
eventingReleaseUrlTemplate = "https://github.com/knative/eventing/releases/download/v%v/release.yaml"
monitoringReleaseUrlTemplate = "https://github.com/knative/serving/releases/download/v%v/monitoring.yaml"

Expand Down Expand Up @@ -160,7 +159,6 @@ func checkKnativeInstallation(kubeclient ...kubernetes.Interface) (bool, *option
// used by e2e test
func RenderKnativeManifests(opts options.Knative) (string, error) {
knativeVersion := opts.InstallKnativeVersion
build := opts.InstallKnativeBuild
eventing := opts.InstallKnativeEventing
monitoring := opts.InstallKnativeMonitoring

Expand All @@ -171,15 +169,6 @@ func RenderKnativeManifests(opts options.Knative) (string, error) {
}
outputManifests := []string{servingManifest}

if build {
buildReleaseUrl := fmt.Sprintf(buildReleaseUrlTemplate, opts.InstallKnativeBuildVersion)
buildManifest, err := getManifestForInstallation(buildReleaseUrl)
if err != nil {
return "", err
}
outputManifests = append(outputManifests, buildManifest)
}

if eventing {
eventingReleaseUrl := fmt.Sprintf(eventingReleaseUrlTemplate, opts.InstallKnativeEventingVersion)
eventingManifest, err := getManifestForInstallation(eventingReleaseUrl)
Expand Down
10 changes: 4 additions & 6 deletions projects/gloo/cli/pkg/cmd/install/knative_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,16 @@ import (

var _ = Describe("Knative", func() {
knativeInstallOpts := options.Knative{
InstallKnativeVersion: "0.8.0",
InstallKnativeEventingVersion: "0.7.0",
InstallKnativeBuildVersion: "0.7.0",
InstallKnativeBuild: true,
InstallKnativeVersion: "0.10.0",
InstallKnativeEventingVersion: "0.10.0",
InstallKnativeEventing: true,
InstallKnativeMonitoring: true,
}
Context("RenderKnativeManifests", func() {
It("renders manifests for each knative component", func() {
manifests, err := RenderKnativeManifests(knativeInstallOpts)
Expect(err).NotTo(HaveOccurred())
Expect(manifests).To(Equal(expected070Manifests))
Expect(manifests).To(Equal(expected0100Manifests))
})
})
Context("checkKnativeInstallation", func() {
Expand Down Expand Up @@ -74,7 +72,7 @@ var _ = Describe("Knative", func() {
})

// does not contain any networking.knative.dev/ingress-provider=istio resources
var expected070Manifests = func() string {
var expected0100Manifests = func() string {
currentFile, err := testutils.GetCurrentFile()
if err != nil {
panic(err)
Expand Down
Loading

0 comments on commit c0dd0a2

Please sign in to comment.