Skip to content

Commit

Permalink
Upgrade some tools
Browse files Browse the repository at this point in the history
  • Loading branch information
timebertt committed Nov 1, 2023
1 parent 9197755 commit 47ebc73
Show file tree
Hide file tree
Showing 4 changed files with 126 additions and 127 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/webhosting-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
cache-dependency-path: webhosting-operator/go.sum
- uses: ko-build/setup-ko@v0.6
with:
version: v0.14.1
version: v0.15.0
- name: Prepare image metadata
id: meta
# generate comma-separated tags and labels for image build (similar to docker/metadata-action)
Expand Down
2 changes: 1 addition & 1 deletion hack/config/kyverno/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
- https://github.com/kyverno/kyverno/releases/download/v1.10.1/install.yaml
- https://github.com/kyverno/kyverno/releases/download/v1.10.4/install.yaml

configMapGenerator:
- name: kyverno
Expand Down
239 changes: 119 additions & 120 deletions hack/config/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,223 +1,222 @@
---
apiVersion: skaffold/v4beta6
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: cert-manager
manifests:
kustomize:
paths:
- hack/config/cert-manager
- hack/config/cert-manager
deploy:
kubectl:
defaultNamespace: ""
flags:
apply:
- --server-side
- --force-conflicts
- --server-side
- --force-conflicts
defaultNamespace: ""
---
apiVersion: skaffold/v4beta6
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: cert-manager-resources
manifests:
kustomize:
paths:
- hack/config/cert-manager/resources
- hack/config/cert-manager/resources
deploy:
kubectl:
defaultNamespace: ""
flags:
apply:
- --server-side
- --force-conflicts
- --server-side
- --force-conflicts
defaultNamespace: ""
---
apiVersion: skaffold/v4beta6
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: ingress-nginx
manifests:
kustomize:
paths:
- hack/config/ingress-nginx/default
- hack/config/ingress-nginx/default
deploy:
kubectl:
hooks:
before:
- host:
command:
- /usr/bin/env
- bash
- -c
# job template is immutable, delete the old job to prepare for upgrade
- kubectl -n ingress-nginx delete job --ignore-not-found ingress-nginx-admission-create ingress-nginx-admission-patch
defaultNamespace: ""
flags:
apply:
- --server-side
- --force-conflicts
- --server-side
- --force-conflicts
defaultNamespace: ""
hooks:
before:
- host:
command:
- /usr/bin/env
- bash
- -c
# job template is immutable, delete the old job to prepare for upgrade
- kubectl -n ingress-nginx delete job --ignore-not-found ingress-nginx-admission-create ingress-nginx-admission-patch
profiles:
- name: kind
activation:
- kubeContext: kind-.*
manifests:
kustomize:
paths:
- hack/config/ingress-nginx/kind
- name: shoot
activation:
- kubeContext: .*--sharding.*
manifests:
kustomize:
paths:
- hack/config/ingress-nginx/shoot
- name: kind
activation:
- kubeContext: kind-.*
manifests:
kustomize:
paths:
- hack/config/ingress-nginx/kind
- name: shoot
activation:
- kubeContext: .*--sharding.*
manifests:
kustomize:
paths:
- hack/config/ingress-nginx/shoot
---
apiVersion: skaffold/v4beta6
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: kyverno
manifests:
kustomize:
paths:
- hack/config/kyverno
- hack/config/kyverno
deploy:
kubectl:
defaultNamespace: ""
flags:
apply:
- --server-side
- --force-conflicts
- --server-side
- --force-conflicts
defaultNamespace: ""
---
apiVersion: skaffold/v4beta6
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: policy
profiles:
- name: shoot
activation:
- kubeContext: .*--sharding.*
manifests:
kustomize:
paths:
- hack/config/policy
deploy:
kubectl:
defaultNamespace: ""
flags:
apply:
- --server-side
- --force-conflicts
statusCheck: false
- name: shoot
activation:
- kubeContext: .*--sharding.*
manifests:
kustomize:
paths:
- hack/config/policy
deploy:
kubectl:
flags:
apply:
- --server-side
- --force-conflicts
defaultNamespace: ""
statusCheck: false
---
apiVersion: skaffold/v4beta6
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: monitoring-crds
manifests:
kustomize:
paths:
- hack/config/monitoring/crds
- hack/config/monitoring/crds
deploy:
kubectl:
defaultNamespace: ""
flags:
apply:
- --server-side
- --force-conflicts
- --server-side
- --force-conflicts
defaultNamespace: ""
---
apiVersion: skaffold/v4beta6
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: monitoring
requires:
- configs:
- monitoring-crds
- configs:
- monitoring-crds
manifests:
kustomize:
paths:
- hack/config/monitoring/default
- hack/config/monitoring/default
hooks:
before:
- host:
command:
- hack/config/monitoring/default/ensure-admin-password.sh
- host:
command:
- hack/config/monitoring/default/ensure-admin-password.sh
deploy:
kubectl:
defaultNamespace: ""
flags:
apply:
- --server-side
- --force-conflicts
profiles:
- name: shoot
activation:
- kubeContext: .*--sharding.*
manifests:
kustomize:
paths:
- hack/config/monitoring/shoot
- --server-side
- --force-conflicts
defaultNamespace: ""
portForward:
- resourceType: service
namespace: monitoring
resourceName: grafana
port: http
localPort: 3000
- resourceType: service
namespace: monitoring
resourceName: prometheus-k8s
port: web
localPort: 9090
- resourceType: service
resourceName: grafana
namespace: monitoring
port: http
localPort: 3000
- resourceType: service
resourceName: prometheus-k8s
namespace: monitoring
port: web
localPort: 9090
profiles:
- name: shoot
activation:
- kubeContext: .*--sharding.*
manifests:
kustomize:
paths:
- hack/config/monitoring/shoot
---
apiVersion: skaffold/v4beta6
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: profiling
manifests:
kustomize:
paths:
- hack/config/profiling
- hack/config/profiling
hooks:
before:
- host:
command:
- hack/config/profiling/ensure-admin-password.sh
- host:
command:
- hack/config/profiling/ensure-admin-password.sh
deploy:
kubectl:
defaultNamespace: ""
flags:
apply:
- --server-side
- --force-conflicts
- --server-side
- --force-conflicts
defaultNamespace: ""
portForward:
- resourceType: service
namespace: parca
resourceName: parca
port: http
localPort: 7070
- resourceType: service
resourceName: parca
namespace: parca
port: http
localPort: 7070
---
apiVersion: skaffold/v4beta6
apiVersion: skaffold/v4beta7
kind: Config
metadata:
name: sharder
build:
artifacts:
- image: ghcr.io/timebertt/kubernetes-controller-sharding/sharder
ko:
dependencies:
paths:
- go.mod
- '**/*.go'
main: ./cmd/sharder
local:
concurrency: 0
artifacts:
- image: ghcr.io/timebertt/kubernetes-controller-sharding/sharder
ko:
main: ./cmd/sharder
dependencies:
paths:
- go.mod
- '**/*.go'
manifests:
kustomize:
paths:
- config/default
- config/monitoring
- config/default
- config/monitoring
deploy:
kubectl:
defaultNamespace: ""
flags:
apply:
- --server-side
- --force-conflicts
- --server-side
- --force-conflicts
defaultNamespace: ""
Loading

0 comments on commit 47ebc73

Please sign in to comment.