Skip to content

Commit

Permalink
Update Knative to v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
tshak committed Nov 8, 2021
1 parent a3833e2 commit 5606c61
Show file tree
Hide file tree
Showing 19 changed files with 18,682 additions and 22,725 deletions.
32,943 changes: 16,542 additions & 16,401 deletions config/infra/cert-manager/cert-manager.yaml

Large diffs are not rendered by default.

22 changes: 12 additions & 10 deletions config/infra/flux/apply.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
namespace: flux
labels:
app: flux
chart: flux-1.4.0
chart: flux-1.11.2
release: flux
heritage: Helm
---
Expand Down Expand Up @@ -41,13 +41,13 @@ data:
users: []
---
# Source: flux/templates/rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: flux
labels:
app: flux
chart: flux-1.4.0
chart: flux-1.11.2
release: flux
heritage: Helm
rules:
Expand All @@ -63,13 +63,13 @@ rules:
- '*'
---
# Source: flux/templates/rbac.yaml
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: flux
labels:
app: flux
chart: flux-1.4.0
chart: flux-1.11.2
release: flux
heritage: Helm
roleRef:
Expand All @@ -89,7 +89,7 @@ metadata:
namespace: flux
labels:
app: flux
chart: flux-1.4.0
chart: flux-1.11.2
release: flux
heritage: Helm
spec:
Expand All @@ -111,7 +111,7 @@ metadata:
namespace: flux
labels:
app: flux
chart: flux-1.4.0
chart: flux-1.11.2
release: flux
heritage: Helm
spec:
Expand All @@ -120,6 +120,8 @@ spec:
matchLabels:
app: flux
release: flux
strategy:
type: Recreate
template:
metadata:
annotations:
Expand All @@ -141,7 +143,7 @@ spec:
medium: Memory
containers:
- name: flux
image: "docker.io/fluxcd/flux:1.20.1"
image: "docker.io/fluxcd/flux:1.24.2"
imagePullPolicy: IfNotPresent
ports:
- name: http
Expand Down Expand Up @@ -175,7 +177,7 @@ spec:
name: flux-git
args:
- --log-format=fmt

- --ssh-keygen-dir=/var/fluxd/keygen
- --ssh-keygen-format=RFC4716
- --k8s-secret-name=flux-git-deploy
Expand Down Expand Up @@ -205,4 +207,4 @@ spec:
cpu: 50m
memory: 64Mi
nodeSelector:
beta.kubernetes.io/os: linux
kubernetes.io/os: linux
4 changes: 2 additions & 2 deletions config/infra/flux/helm_values.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# https://github.com/fluxcd/flux/blob/master/chart/flux/values.yaml
image:
tag: "1.20.1"
tag: "1.24.2"
env:
secretName: flux-git
git:
url: $(GIT_URL)
path: $(GIT_PATH)
branch: main
branch: $(GIT_BRANCH)
readonly: true
pollInterval: 10s
memcached:
Expand Down
20 changes: 12 additions & 8 deletions config/infra/knative/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
A base [Kustomization](https://kustomize.io/) is provided for generation of Knative Serving manifests that work with Riser. The base manifests are:
- [serving-core](https://github.com/knative/serving/releases)
- [net-istio](https://github.com/knative/net-istio/releases)
- [operator](https://github.com/knative/operator/releases)
- [net-certmanager](https://github.com/knative/net-certmanager/releases)

To build run `kustomize build base >/path/to/gitops/repo/kustomization.yaml`
Expand All @@ -11,16 +10,21 @@ To build run `kustomize build base >/path/to/gitops/repo/kustomization.yaml`
Knative configuration is vast and is dependant largely on your needs. The following is meant to help get you started with a basic demo of Riser and is not intended as being exhaustive.

### Domain Name
You should configure a wildcard domain for each environment and namespace using a pattern like `<environment>.riser.<your-domain>` (e.g. for the `dev` environment `dev.riser.your-domain.org`. To do this, create a ConfigMap like the following example:
You should configure a wildcard domain for each environment and namespace using a pattern like `<environment>.riser.<your-domain>` (e.g. for the `dev` environment `dev.riser.your-domain.org`. To do this, add your domain to the configuration found in `knative.serving.yaml` file e.g.

```yaml
apiVersion: v1
kind: ConfigMap
apiVersion: operator.knative.dev/v1alpha1
kind: KnativeServing
metadata:
name: config-domain
name: knative-serving
namespace: knative-serving
data:
dev.riser.your-domain.org: ""
spec:
version: 1.0.0
config:
# ---v--- example domain configuration
domain:
dev.riser.your-domain.org: ""
# ---^--- example domain configuration
```


Expand Down
8 changes: 0 additions & 8 deletions config/infra/knative/base/config-autoscaler.yaml

This file was deleted.

5 changes: 2 additions & 3 deletions config/infra/knative/base/config-certmanager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ kind: ConfigMap
metadata:
name: config-certmanager
namespace: knative-serving
labels:
networking.knative.dev/certificate-provider: cert-manager
data:
enabled: "true"
issuerRef: |
kind: ClusterIssuer
name: selfsigning-issuer
name: selfsigning-issuer
7 changes: 0 additions & 7 deletions config/infra/knative/base/config-defaults.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions config/infra/knative/base/config-deployment.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions config/infra/knative/base/config-istio.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions config/infra/knative/base/config-network.yaml

This file was deleted.

21 changes: 21 additions & 0 deletions config/infra/knative/base/knative-serving.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: operator.knative.dev/v1alpha1
kind: KnativeServing
metadata:
name: knative-serving
namespace: knative-serving
spec:
version: 1.0.0
config:
autoscaler:
scale-to-zero-pod-retention-period: "10m"
defaults:
enable-service-links: "false"
deployment:
# This is so that we can use Kind image caching for e2e tests. See also https://github.com/knative/serving/issues/6114
registriesSkippingTagResolving: index.docker.io
istio:
enabled: "true"
local-gateway.mesh: "mesh"
network:
autoTLS: Enabled
httpProtocol: Redirected
15 changes: 4 additions & 11 deletions config/infra/knative/base/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
resources:
- namespace.yaml
- knative-serving.yaml
- operator.yaml
- net-certmanager.yaml
- net-istio.yaml
- serving-core.yaml

patches:
- config-autoscaler.yaml
- config-certmanager.yaml
- config-defaults.yaml
- config-deployment.yaml
- config-istio.yaml
- config-network.yaml
- patch-ingress-gateway.yaml
- patch-webhooks.yaml

- config-certmanager.yaml
6 changes: 6 additions & 0 deletions config/infra/knative/base/namespace.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: v1
kind: Namespace
metadata:
name: knative-serving
labels:
istio-injection: "enabled"
24 changes: 12 additions & 12 deletions config/infra/knative/base/net-certmanager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ metadata:
# These are the permissions needed by the `cert-manager` `Certificate` implementation.
name: knative-serving-certmanager
labels:
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
serving.knative.dev/controller: "true"
networking.knative.dev/certificate-provider: cert-manager
rules:
Expand Down Expand Up @@ -49,7 +49,7 @@ kind: ValidatingWebhookConfiguration
metadata:
name: config.webhook.net-certmanager.networking.internal.knative.dev
labels:
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
networking.knative.dev/certificate-provider: cert-manager
webhooks:
- admissionReviewVersions:
Expand Down Expand Up @@ -88,7 +88,7 @@ metadata:
name: net-certmanager-webhook-certs
namespace: knative-serving
labels:
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
networking.knative.dev/certificate-provider: cert-manager

---
Expand All @@ -112,7 +112,7 @@ metadata:
name: config-certmanager
namespace: knative-serving
labels:
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
networking.knative.dev/certificate-provider: cert-manager
data:
_example: |
Expand Down Expand Up @@ -159,7 +159,7 @@ metadata:
name: net-certmanager-controller
namespace: knative-serving
labels:
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
networking.knative.dev/certificate-provider: cert-manager
spec:
selector:
Expand All @@ -171,14 +171,14 @@ spec:
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
labels:
app: net-certmanager-controller
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
spec:
serviceAccountName: controller
containers:
- name: controller
# This is the Go import path for the binary that is containerized
# and substituted here.
image: gcr.io/knative-releases/knative.dev/net-certmanager/cmd/controller@sha256:45bb63cc9bfe2183aafcd8815c1e5688e35a4e9967aaac625f44d12dc1c87bba
image: gcr.io/knative-releases/knative.dev/net-certmanager/cmd/controller@sha256:37d0467229be1bd74eb3e826e62ec60adfb52e8529f1177a08c6d276b8bd78ee
resources:
requests:
cpu: 30m
Expand Down Expand Up @@ -216,7 +216,7 @@ kind: Service
metadata:
labels:
app: net-certmanager-controller
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
networking.knative.dev/certificate-provider: cert-manager
name: net-certmanager-controller
namespace: knative-serving
Expand Down Expand Up @@ -253,7 +253,7 @@ metadata:
name: net-certmanager-webhook
namespace: knative-serving
labels:
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
networking.knative.dev/certificate-provider: cert-manager
spec:
selector:
Expand All @@ -267,14 +267,14 @@ spec:
labels:
app: net-certmanager-webhook
role: net-certmanager-webhook
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
spec:
serviceAccountName: controller
containers:
- name: webhook
# This is the Go import path for the binary that is containerized
# and substituted here.
image: gcr.io/knative-releases/knative.dev/net-certmanager/cmd/webhook@sha256:1402c0ff90bfa64ea72f44bc6aaed96206854dfa95bcfa014b776cc88df89ad2
image: gcr.io/knative-releases/knative.dev/net-certmanager/cmd/webhook@sha256:192fceb31b89fa2fb602bcb44a512c6faec2574ce4c4cb3aae2171eed32ee6dc
resources:
requests:
cpu: 20m
Expand Down Expand Up @@ -333,7 +333,7 @@ metadata:
namespace: knative-serving
labels:
role: net-certmanager-webhook
serving.knative.dev/release: "v0.24.0"
serving.knative.dev/release: "v1.0.0"
networking.knative.dev/certificate-provider: cert-manager
spec:
ports:
Expand Down
Loading

0 comments on commit 5606c61

Please sign in to comment.