Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.local
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ wait-ready-external-dns-test:
until kubectl wait pods -l app.kubernetes.io/instance=external-dns --for condition=Ready --timeout=120s ; do echo "."; sleep 1; done

#################
GATEWAY_API_VERSION ?= v0.6.0
GATEWAY_API_VERSION ?= v0.6.2

.PHONY: gateway-api-upstream-get
gateway-api-upstream-get:
mkdir -p upstream-gateway-api/crds upstream-gateway-api/webhook
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=$(GATEWAY_API_VERSION)" > upstream-gateway-api/crds/crds.yaml
#kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=$(GATEWAY_API_VERSION)" > upstream-gateway-api-crds/crds.yaml
(cd upstream-gateway-api/webhook && for manifestfile in 0-namespace.yaml admission_webhook.yaml certificate_config.yaml; do curl -sL -O https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/main/config/webhook/$$manifestfile; done)
(cd upstream-gateway-api/webhook && for manifestfile in 0-namespace.yaml admission_webhook.yaml certificate_config.yaml; do curl -sL -O https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/$(GATEWAY_API_VERSION)/config/webhook/$$manifestfile; done)

.PHONY: deploy-gateway-api
deploy-gateway-api:
Expand Down
6 changes: 3 additions & 3 deletions upstream-gateway-api/crds/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/1538
gateway.networking.k8s.io/bundle-version: v0.6.0
gateway.networking.k8s.io/bundle-version: v0.6.2
gateway.networking.k8s.io/channel: standard
creationTimestamp: null
name: gatewayclasses.gateway.networking.k8s.io
Expand Down Expand Up @@ -439,7 +439,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/1538
gateway.networking.k8s.io/bundle-version: v0.6.0
gateway.networking.k8s.io/bundle-version: v0.6.2
gateway.networking.k8s.io/channel: standard
creationTimestamp: null
name: gateways.gateway.networking.k8s.io
Expand Down Expand Up @@ -1873,7 +1873,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/1538
gateway.networking.k8s.io/bundle-version: v0.6.0
gateway.networking.k8s.io/bundle-version: v0.6.2
gateway.networking.k8s.io/channel: standard
creationTimestamp: null
name: httproutes.gateway.networking.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion upstream-gateway-api/webhook/admission_webhook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
spec:
containers:
- name: webhook
image: gcr.io/k8s-staging-gateway-api/admission-server:v0.6.0
image: gcr.io/k8s-staging-gateway-api/admission-server:v0.6.2
imagePullPolicy: Always
args:
- -logtostderr
Expand Down
5 changes: 2 additions & 3 deletions upstream-gateway-api/webhook/certificate_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ metadata:
annotations:
labels:
name: gateway-api-webhook
namespace: gateway-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand Down Expand Up @@ -89,7 +88,7 @@ spec:
spec:
containers:
- name: create
image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.1.1
imagePullPolicy: IfNotPresent
args:
- create
Expand Down Expand Up @@ -123,7 +122,7 @@ spec:
spec:
containers:
- name: patch
image: k8s.gcr.io/ingress-nginx/kube-webhook-certgen:v1.1.1
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.1.1
imagePullPolicy: IfNotPresent
args:
- patch
Expand Down