Skip to content

Commit 30779da

Browse files
tamalsahatamalsaha
authored
Use k8s 1.25.1 libs (#277)
Signed-off-by: Tamal Saha <tamal@appscode.com> Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent e7dc289 commit 30779da

File tree

219 files changed

+3992
-13360
lines changed

Some content is hidden

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

219 files changed

+3992
-13360
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
name: Build
1919
runs-on: ubuntu-latest
2020
steps:
21-
- name: Set up Go 1.18
21+
- name: Set up Go 1.19
2222
uses: actions/setup-go@v1
2323
with:
24-
go-version: 1.18
24+
go-version: 1.19
2525
id: go
2626

2727
- name: Check out code into the Go module directory

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ BIN := installer
2121
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
2222
CRD_OPTIONS ?= "crd:crdVersions={v1}"
2323
# https://github.com/appscodelabs/gengo-builder
24-
CODE_GENERATOR_IMAGE ?= appscode/gengo:release-1.24
24+
CODE_GENERATOR_IMAGE ?= appscode/gengo:release-1.25
2525
API_GROUPS ?= installer:v1alpha1
2626

2727
# This version-strategy uses git tags to set the version string
@@ -61,7 +61,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
6161
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian11
6262
BASEIMAGE_DBG ?= debian:bullseye
6363

64-
GO_VERSION ?= 1.18
64+
GO_VERSION ?= 1.19
6565
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)
6666
CHART_TEST_IMAGE ?= quay.io/helmpack/chart-testing:v3.5.1
6767

‎apis/installer/v1alpha1/types_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ import (
2727

2828
func TestDefaultValues(t *testing.T) {
2929
checker := schemachecker.New(os.DirFS("../../.."),
30-
v1alpha1.StashCatalogSpec{},
31-
v1alpha1.StashCommunitySpec{},
32-
v1alpha1.StashEnterpriseSpec{},
33-
v1alpha1.StashSpec{},
34-
v1alpha1.StashUiServerSpec{},
30+
schemachecker.TestCase{Obj: v1alpha1.StashCatalogSpec{}},
31+
schemachecker.TestCase{Obj: v1alpha1.StashCommunitySpec{}},
32+
schemachecker.TestCase{Obj: v1alpha1.StashEnterpriseSpec{}},
33+
schemachecker.TestCase{Obj: v1alpha1.StashSpec{}},
34+
schemachecker.TestCase{Obj: v1alpha1.StashUiServerSpec{}},
3535
)
3636
checker.TestAll(t)
3737
}

‎charts/stash-community/values.openapiv3_schema.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ properties:
8989
type: object
9090
type: array
9191
type: object
92+
x-kubernetes-map-type: atomic
9293
weight:
9394
description: Weight associated with matching the corresponding nodeSelectorTerm,
9495
in the range 1-100.
@@ -179,10 +180,12 @@ properties:
179180
type: object
180181
type: array
181182
type: object
183+
x-kubernetes-map-type: atomic
182184
type: array
183185
required:
184186
- nodeSelectorTerms
185187
type: object
188+
x-kubernetes-map-type: atomic
186189
type: object
187190
podAffinity:
188191
description: Describes pod affinity scheduling rules (e.g. co-locate this
@@ -251,6 +254,7 @@ properties:
251254
only "value". The requirements are ANDed.
252255
type: object
253256
type: object
257+
x-kubernetes-map-type: atomic
254258
namespaceSelector:
255259
description: A label query over the set of namespaces that the
256260
term applies to. The term is applied to the union of the namespaces
@@ -300,6 +304,7 @@ properties:
300304
only "value". The requirements are ANDed.
301305
type: object
302306
type: object
307+
x-kubernetes-map-type: atomic
303308
namespaces:
304309
description: namespaces specifies a static list of namespace
305310
names that the term applies to. The term is applied to the
@@ -391,6 +396,7 @@ properties:
391396
are ANDed.
392397
type: object
393398
type: object
399+
x-kubernetes-map-type: atomic
394400
namespaceSelector:
395401
description: A label query over the set of namespaces that the term
396402
applies to. The term is applied to the union of the namespaces
@@ -439,6 +445,7 @@ properties:
439445
are ANDed.
440446
type: object
441447
type: object
448+
x-kubernetes-map-type: atomic
442449
namespaces:
443450
description: namespaces specifies a static list of namespace names
444451
that the term applies to. The term is applied to the union of
@@ -528,6 +535,7 @@ properties:
528535
only "value". The requirements are ANDed.
529536
type: object
530537
type: object
538+
x-kubernetes-map-type: atomic
531539
namespaceSelector:
532540
description: A label query over the set of namespaces that the
533541
term applies to. The term is applied to the union of the namespaces
@@ -577,6 +585,7 @@ properties:
577585
only "value". The requirements are ANDed.
578586
type: object
579587
type: object
588+
x-kubernetes-map-type: atomic
580589
namespaces:
581590
description: namespaces specifies a static list of namespace
582591
names that the term applies to. The term is applied to the
@@ -668,6 +677,7 @@ properties:
668677
are ANDed.
669678
type: object
670679
type: object
680+
x-kubernetes-map-type: atomic
671681
namespaceSelector:
672682
description: A label query over the set of namespaces that the term
673683
applies to. The term is applied to the union of the namespaces
@@ -716,6 +726,7 @@ properties:
716726
are ANDed.
717727
type: object
718728
type: object
729+
x-kubernetes-map-type: atomic
719730
namespaces:
720731
description: namespaces specifies a static list of namespace names
721732
that the term applies to. The term is applied to the union of

‎charts/stash-enterprise/values.openapiv3_schema.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ properties:
8989
type: object
9090
type: array
9191
type: object
92+
x-kubernetes-map-type: atomic
9293
weight:
9394
description: Weight associated with matching the corresponding nodeSelectorTerm,
9495
in the range 1-100.
@@ -179,10 +180,12 @@ properties:
179180
type: object
180181
type: array
181182
type: object
183+
x-kubernetes-map-type: atomic
182184
type: array
183185
required:
184186
- nodeSelectorTerms
185187
type: object
188+
x-kubernetes-map-type: atomic
186189
type: object
187190
podAffinity:
188191
description: Describes pod affinity scheduling rules (e.g. co-locate this
@@ -251,6 +254,7 @@ properties:
251254
only "value". The requirements are ANDed.
252255
type: object
253256
type: object
257+
x-kubernetes-map-type: atomic
254258
namespaceSelector:
255259
description: A label query over the set of namespaces that the
256260
term applies to. The term is applied to the union of the namespaces
@@ -300,6 +304,7 @@ properties:
300304
only "value". The requirements are ANDed.
301305
type: object
302306
type: object
307+
x-kubernetes-map-type: atomic
303308
namespaces:
304309
description: namespaces specifies a static list of namespace
305310
names that the term applies to. The term is applied to the
@@ -391,6 +396,7 @@ properties:
391396
are ANDed.
392397
type: object
393398
type: object
399+
x-kubernetes-map-type: atomic
394400
namespaceSelector:
395401
description: A label query over the set of namespaces that the term
396402
applies to. The term is applied to the union of the namespaces
@@ -439,6 +445,7 @@ properties:
439445
are ANDed.
440446
type: object
441447
type: object
448+
x-kubernetes-map-type: atomic
442449
namespaces:
443450
description: namespaces specifies a static list of namespace names
444451
that the term applies to. The term is applied to the union of
@@ -528,6 +535,7 @@ properties:
528535
only "value". The requirements are ANDed.
529536
type: object
530537
type: object
538+
x-kubernetes-map-type: atomic
531539
namespaceSelector:
532540
description: A label query over the set of namespaces that the
533541
term applies to. The term is applied to the union of the namespaces
@@ -577,6 +585,7 @@ properties:
577585
only "value". The requirements are ANDed.
578586
type: object
579587
type: object
588+
x-kubernetes-map-type: atomic
580589
namespaces:
581590
description: namespaces specifies a static list of namespace
582591
names that the term applies to. The term is applied to the
@@ -668,6 +677,7 @@ properties:
668677
are ANDed.
669678
type: object
670679
type: object
680+
x-kubernetes-map-type: atomic
671681
namespaceSelector:
672682
description: A label query over the set of namespaces that the term
673683
applies to. The term is applied to the union of the namespaces
@@ -716,6 +726,7 @@ properties:
716726
are ANDed.
717727
type: object
718728
type: object
729+
x-kubernetes-map-type: atomic
719730
namespaces:
720731
description: namespaces specifies a static list of namespace names
721732
that the term applies to. The term is applied to the union of

‎charts/stash-ui-server/values.openapiv3_schema.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ properties:
8989
type: object
9090
type: array
9191
type: object
92+
x-kubernetes-map-type: atomic
9293
weight:
9394
description: Weight associated with matching the corresponding nodeSelectorTerm,
9495
in the range 1-100.
@@ -179,10 +180,12 @@ properties:
179180
type: object
180181
type: array
181182
type: object
183+
x-kubernetes-map-type: atomic
182184
type: array
183185
required:
184186
- nodeSelectorTerms
185187
type: object
188+
x-kubernetes-map-type: atomic
186189
type: object
187190
podAffinity:
188191
description: Describes pod affinity scheduling rules (e.g. co-locate this
@@ -251,6 +254,7 @@ properties:
251254
only "value". The requirements are ANDed.
252255
type: object
253256
type: object
257+
x-kubernetes-map-type: atomic
254258
namespaceSelector:
255259
description: A label query over the set of namespaces that the
256260
term applies to. The term is applied to the union of the namespaces
@@ -300,6 +304,7 @@ properties:
300304
only "value". The requirements are ANDed.
301305
type: object
302306
type: object
307+
x-kubernetes-map-type: atomic
303308
namespaces:
304309
description: namespaces specifies a static list of namespace
305310
names that the term applies to. The term is applied to the
@@ -391,6 +396,7 @@ properties:
391396
are ANDed.
392397
type: object
393398
type: object
399+
x-kubernetes-map-type: atomic
394400
namespaceSelector:
395401
description: A label query over the set of namespaces that the term
396402
applies to. The term is applied to the union of the namespaces
@@ -439,6 +445,7 @@ properties:
439445
are ANDed.
440446
type: object
441447
type: object
448+
x-kubernetes-map-type: atomic
442449
namespaces:
443450
description: namespaces specifies a static list of namespace names
444451
that the term applies to. The term is applied to the union of
@@ -528,6 +535,7 @@ properties:
528535
only "value". The requirements are ANDed.
529536
type: object
530537
type: object
538+
x-kubernetes-map-type: atomic
531539
namespaceSelector:
532540
description: A label query over the set of namespaces that the
533541
term applies to. The term is applied to the union of the namespaces
@@ -577,6 +585,7 @@ properties:
577585
only "value". The requirements are ANDed.
578586
type: object
579587
type: object
588+
x-kubernetes-map-type: atomic
580589
namespaces:
581590
description: namespaces specifies a static list of namespace
582591
names that the term applies to. The term is applied to the
@@ -668,6 +677,7 @@ properties:
668677
are ANDed.
669678
type: object
670679
type: object
680+
x-kubernetes-map-type: atomic
671681
namespaceSelector:
672682
description: A label query over the set of namespaces that the term
673683
applies to. The term is applied to the union of the namespaces
@@ -716,6 +726,7 @@ properties:
716726
are ANDed.
717727
type: object
718728
type: object
729+
x-kubernetes-map-type: atomic
719730
namespaces:
720731
description: namespaces specifies a static list of namespace names
721732
that the term applies to. The term is applied to the union of

0 commit comments

Comments
 (0)