Skip to content

Commit 4b8cf1d

Browse files
akagami-harshakagami-harsh
committed
Merge branch 'master' into create-Helm-Chart-for-Tutorials
2 parents 1f2292f + 3f5ebd6 commit 4b8cf1d

File tree

116 files changed

+1113
-1043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+1113
-1043
lines changed

‎.github/workflows/lint-sample.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Run linter
3636
uses: golangci/golangci-lint-action@v6
3737
with:
38-
version: v1.62.2
38+
version: v1.63.4
3939
working-directory: ${{ matrix.folder }}
4040
args: --config .golangci.yml ./...
4141
- name: Run linter via makefile target

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Run linter
2727
uses: golangci/golangci-lint-action@v6
2828
with:
29-
version: v1.62.2
29+
version: v1.63.4
3030

3131
yamllint:
3232
runs-on: ubuntu-latest

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
125125
golangci-lint:
126126
@[ -f $(GOLANGCI_LINT) ] || { \
127127
set -e ;\
128-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.62.2 ;\
128+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.63.4 ;\
129129
}
130130

131131
.PHONY: apidiff

‎docs/book/src/SUMMARY.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
- [go/v4](./plugins/available/go-v4-plugin.md)
121121
- [grafana/v1-alpha](./plugins/available/grafana-v1-alpha.md)
122122
- [deploy-image/v1-alpha](./plugins/available/deploy-image-plugin-v1-alpha.md)
123+
- [helm/v1-alpha](./plugins/available/helm-v1-alpha.md)
123124
- [kustomize/v2](./plugins/available/kustomize-v2.md)
124125
- [Extending](./plugins/extending.md)
125126
- [CLI and Plugins](./plugins/extending/extending_cli_features_and_plugins.md)

‎docs/book/src/cronjob-tutorial/testdata/project/.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ jobs:
2020
- name: Run linter
2121
uses: golangci/golangci-lint-action@v6
2222
with:
23-
version: v1.62.2
23+
version: v1.63.4

‎docs/book/src/cronjob-tutorial/testdata/project/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,12 +177,12 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
177177

178178
## Tool Versions
179179
KUSTOMIZE_VERSION ?= v5.5.0
180-
CONTROLLER_TOOLS_VERSION ?= v0.17.0
180+
CONTROLLER_TOOLS_VERSION ?= v0.17.1
181181
#ENVTEST_VERSION is the version of controller-runtime release branch to fetch the envtest setup script (i.e. release-0.20)
182182
ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
183183
#ENVTEST_K8S_VERSION is the version of Kubernetes to use for setting up ENVTEST binaries (i.e. 1.31)
184184
ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
185-
GOLANGCI_LINT_VERSION ?= v1.62.2
185+
GOLANGCI_LINT_VERSION ?= v1.63.4
186186

187187
.PHONY: kustomize
188188
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.

‎docs/book/src/cronjob-tutorial/testdata/project/cmd/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func main() {
155155

156156
// Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server.
157157
// More info:
158-
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.1/pkg/metrics/server
158+
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.0/pkg/metrics/server
159159
// - https://book.kubebuilder.io/reference/metrics.html
160160
metricsServerOptions := metricsserver.Options{
161161
BindAddress: metricsAddr,
@@ -167,7 +167,7 @@ func main() {
167167
// FilterProvider is used to protect the metrics endpoint with authn/authz.
168168
// These configurations ensure that only authorized users and service accounts
169169
// can access the metrics endpoint. The RBAC are configured in 'config/rbac/kustomization.yaml'. More info:
170-
// https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.19.1/pkg/metrics/filters#WithAuthenticationAndAuthorization
170+
// https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.0/pkg/metrics/filters#WithAuthenticationAndAuthorization
171171
metricsServerOptions.FilterProvider = filters.WithAuthenticationAndAuthorization
172172
}
173173

‎docs/book/src/cronjob-tutorial/testdata/project/config/crd/bases/batch.tutorial.kubebuilder.io_cronjobs.yaml‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.0
6+
controller-gen.kubebuilder.io/version: v0.17.1
77
name: cronjobs.batch.tutorial.kubebuilder.io
88
spec:
99
group: batch.tutorial.kubebuilder.io
@@ -2778,6 +2778,39 @@ spec:
27782778
x-kubernetes-list-map-keys:
27792779
- name
27802780
x-kubernetes-list-type: map
2781+
resources:
2782+
properties:
2783+
claims:
2784+
items:
2785+
properties:
2786+
name:
2787+
type: string
2788+
request:
2789+
type: string
2790+
required:
2791+
- name
2792+
type: object
2793+
type: array
2794+
x-kubernetes-list-map-keys:
2795+
- name
2796+
x-kubernetes-list-type: map
2797+
limits:
2798+
additionalProperties:
2799+
anyOf:
2800+
- type: integer
2801+
- type: string
2802+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
2803+
x-kubernetes-int-or-string: true
2804+
type: object
2805+
requests:
2806+
additionalProperties:
2807+
anyOf:
2808+
- type: integer
2809+
- type: string
2810+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
2811+
x-kubernetes-int-or-string: true
2812+
type: object
2813+
type: object
27812814
restartPolicy:
27822815
type: string
27832816
runtimeClassName:
@@ -2820,6 +2853,8 @@ spec:
28202853
runAsUser:
28212854
format: int64
28222855
type: integer
2856+
seLinuxChangePolicy:
2857+
type: string
28232858
seLinuxOptions:
28242859
properties:
28252860
level:

‎docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/crd/batch.tutorial.kubebuilder.io_cronjobs.yaml‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
{{- if .Values.crd.keep }}
1010
"helm.sh/resource-policy": keep
1111
{{- end }}
12-
controller-gen.kubebuilder.io/version: v0.17.0
12+
controller-gen.kubebuilder.io/version: v0.17.1
1313
name: cronjobs.batch.tutorial.kubebuilder.io
1414
spec:
1515
group: batch.tutorial.kubebuilder.io
@@ -2784,6 +2784,39 @@ spec:
27842784
x-kubernetes-list-map-keys:
27852785
- name
27862786
x-kubernetes-list-type: map
2787+
resources:
2788+
properties:
2789+
claims:
2790+
items:
2791+
properties:
2792+
name:
2793+
type: string
2794+
request:
2795+
type: string
2796+
required:
2797+
- name
2798+
type: object
2799+
type: array
2800+
x-kubernetes-list-map-keys:
2801+
- name
2802+
x-kubernetes-list-type: map
2803+
limits:
2804+
additionalProperties:
2805+
anyOf:
2806+
- type: integer
2807+
- type: string
2808+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
2809+
x-kubernetes-int-or-string: true
2810+
type: object
2811+
requests:
2812+
additionalProperties:
2813+
anyOf:
2814+
- type: integer
2815+
- type: string
2816+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
2817+
x-kubernetes-int-or-string: true
2818+
type: object
2819+
type: object
27872820
restartPolicy:
27882821
type: string
27892822
runtimeClassName:
@@ -2826,6 +2859,8 @@ spec:
28262859
runAsUser:
28272860
format: int64
28282861
type: integer
2862+
seLinuxChangePolicy:
2863+
type: string
28292864
seLinuxOptions:
28302865
properties:
28312866
level:

‎docs/book/src/cronjob-tutorial/testdata/project/dist/chart/templates/webhook/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: {{ include "chart.name" . }}-webhook-service
5+
name: project-webhook-service
66
namespace: {{ .Release.Namespace }}
77
labels:
88
{{- include "chart.labels" . | nindent 4 }}

0 commit comments

Comments
 (0)