Skip to content

Commit 68b91c6

Browse files
committed
fix linting errors
1 parent 7316a4e commit 68b91c6

File tree

5 files changed

+45
-24
lines changed

5 files changed

+45
-24
lines changed

kubernetes/apps/istio.yaml

+14-8
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ spec:
1616
- path: config/crd/experimental
1717
repoURL: https://github.com/kubernetes-sigs/gateway-api
1818
targetRevision: v1.1.0
19-
ignoreDifferences:
20-
- group: admissionregistration.k8s.io
19+
ignoreDifferences:
20+
- group: admissionregistration.k8s.io
2121
kind: ValidatingWebhookConfiguration
22-
jsonPointers:
22+
jsonPointers:
2323
- /webhooks/0/failurePolicy
2424
syncPolicy:
2525
automated:
@@ -52,7 +52,11 @@ spec:
5252
enablePrometheusMerge: true
5353
protocolDetectionTimeout: 5s
5454
enableTracing: true
55+
defaultConfig:
56+
tracing:
5557
extensionProviders:
58+
- name: stackdriver
59+
stackdriver:
5660
- name: "oauth2-proxy"
5761
envoyExtAuthzHttp:
5862
service: "oauth2-proxy.oauth2-proxy.svc.cluster.local"
@@ -69,6 +73,8 @@ spec:
6973
- authorization
7074
- cookie
7175
- user-agent
76+
includeAdditionalHeadersInCheck:
77+
X-Auth-Request-Redirect: https://%REQ(Host)%%REQ(:PATH)%
7278
defaultConfig:
7379
gatewayTopology:
7480
numTrustedProxies: 2
@@ -79,12 +85,12 @@ spec:
7985
enabled: true
8086
wasmEnabled: false
8187
- path: kubernetes/gke-utility/istio-system
82-
repoURL: https://github.com/borg-land/k8s.io
83-
targetRevision: istio
84-
ignoreDifferences:
85-
- group: admissionregistration.k8s.io
88+
repoURL: https://github.com/kubernetes/k8s.io
89+
targetRevision: main
90+
ignoreDifferences:
91+
- group: admissionregistration.k8s.io
8692
kind: ValidatingWebhookConfiguration
87-
jsonPointers:
93+
jsonPointers:
8894
- /webhooks/0/failurePolicy
8995
syncPolicy:
9096
automated:

kubernetes/gke-utility/argocd/argocd-cm.yaml

+7-13
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,11 @@ data:
1212
ignoreDifferences: |
1313
jqPathExpressions:
1414
- '.webhooks[]?.clientConfig.caBundle'
15+
resource.exclusions: |
16+
- apiGroups:
17+
- cilium.io
18+
kinds:
19+
- CiliumIdentity
20+
clusters:
21+
- "*"
1522
kustomize.buildOptions: --load-restrictor LoadRestrictionsNone --enable-alpha-plugins
16-
dex.config: |
17-
connectors:
18-
- type: github
19-
id: github
20-
name: GitHub
21-
config:
22-
clientID: $dex.github.clientId
23-
clientSecret: $dex.github.clientSecret
24-
orgs:
25-
- name: kubernetes
26-
useLoginAsID: true
27-
loadAllGroups: true
28-
teamNameField: slug

kubernetes/gke-utility/argocd/extras.yaml

+23-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
labels:
77
argocd.argoproj.io/secret-type: repository
88
stringData:
9-
url: https://github.com/kubernetes
9+
url: https://github.com/kubernetes/k8s.io
1010
name: kubernetes
1111
type: git
1212
---
@@ -43,3 +43,25 @@ spec:
4343
- backendRefs:
4444
- name: argocd-server
4545
port: 80
46+
---
47+
apiVersion: security.istio.io/v1
48+
kind: AuthorizationPolicy
49+
metadata:
50+
name: argocd
51+
spec:
52+
selector:
53+
matchLabels:
54+
app.kubernetes.io/name: argocd-server
55+
action: ALLOW
56+
rules:
57+
- from:
58+
- source:
59+
namespaces:
60+
- istio-system
61+
when:
62+
- key: request.headers[X-Auth-Request-User]
63+
values:
64+
- dims
65+
- upodroid
66+
- ameukam
67+
- BenTheElder

kubernetes/gke-utility/helm/oauth2-proxy.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
config:
32
existingSecret: oauth2-proxy-creds
43

54
extraArgs:
65
provider: github
76
github-org: kubernetes
8-
github-team: sig-k8s-infra-leads,sig-k8s-infra
97
redirect-url: https://oauth2-proxy.k8s.io/oauth2/callback
108
reverse-proxy: true
119
pass-access-token: true
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3+
namespace: istio-system
34
resources:
45
- auth-policy.yaml
56
- gateway.yaml

0 commit comments

Comments
 (0)