Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 50b0ff4

Browse files
oliverbaehleroliverbaehler
committedFeb 7, 2025··
ci(helm): update workflows and correct testing
Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>
1 parent 1d8e27f commit 50b0ff4

File tree

12 files changed

+82
-93
lines changed

12 files changed

+82
-93
lines changed
 

‎.github/ISSUE_TEMPLATE/config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ blank_issues_enabled: false
22
contact_links:
33
- name: Chat on Slack
44
url: https://kubernetes.slack.com/archives/C03GETTJQRL
5-
about: Maybe chatting with the community can help
5+
about: Maybe chatting with the community can help

‎.github/actions/exists/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ runs:
1818
- shell: bash
1919
id: check
2020
run: |
21-
echo "result=${{ inputs.value != '' }}" >> $GITHUB_OUTPUT
21+
echo "result=${{ inputs.value != '' }}" >> $GITHUB_OUTPUT

‎.github/actions/setup-caches/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ runs:
1717
if: ${{ inputs.build-cache-key }}
1818
with:
1919
path: ~/.cache/go-build
20-
key: ${{ runner.os }}-build-cache-${{ inputs.build-cache-key }}-${{ hashFiles('**/go.sum') }}-${{ hashFiles('Makefile') }}
20+
key: ${{ runner.os }}-build-cache-${{ inputs.build-cache-key }}-${{ hashFiles('**/go.sum') }}-${{ hashFiles('Makefile') }}

‎.github/configs/ct.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ remote: origin
22
target-branch: main
33
chart-dirs:
44
- charts
5-
helm-extra-args: "--timeout 600s"
5+
helm-extra-args: "--timeout 600s"
66
validate-chart-schema: false
77
validate-maintainers: false
88
validate-yaml: true
99
exclude-deprecated: true
10-
check-version-increment: false
10+
check-version-increment: false

‎.github/workflows/helm-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
echo "version=$(echo $VERSION)" >> $GITHUB_OUTPUT
5555
- name: Helm | Publish
5656
id: helm_publish
57-
uses: peak-scale/github-actions/helm-oci-chart@a441cca016861c546ab7e065277e40ce41a3eb84
57+
uses: peak-scale/github-actions/helm-oci-chart@a441cca016861c546ab7e065277e40ce41a3eb84
5858
with:
5959
registry: ghcr.io
6060
repository: ${{ github.repository_owner }}/charts

‎.github/workflows/scorecard.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ jobs:
3939
- name: Upload to code-scanning
4040
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
4141
with:
42-
sarif_file: results.sarif
42+
sarif_file: results.sarif

‎.golangci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ issues:
2020
linters:
2121
enable-all: true
2222
disable:
23-
- err113
24-
- mnd
2523
- errchkjson
2624
- errname
2725
- forcetypeassert

‎.ko.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ builds:
66
- id: capsule-proxy
77
main: ./
88
ldflags:
9-
- '{{ if index .Env "LD_FLAGS" }}{{ .Env.LD_FLAGS }}{{ end }}'
9+
- '{{ if index .Env "LD_FLAGS" }}{{ .Env.LD_FLAGS }}{{ end }}'

‎api/v1beta1/zz_generated.deepcopy.go

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/capsule-proxy/crds/capsule.clastix.io_globalproxysettings.yaml

+38-42
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.16.3
87
name: globalproxysettings.capsule.clastix.io
98
spec:
109
group: capsule.clastix.io
@@ -22,25 +21,30 @@ spec:
2221
API.
2322
properties:
2423
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2829
type: string
2930
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3337
type: string
3438
metadata:
3539
type: object
3640
spec:
3741
description: GlobalProxySettingsSpec defines the desired state of GlobalProxySettings.
3842
properties:
3943
rules:
40-
description: Subjects that should receive additional permissions.
41-
The subjects are selected based on the oncoming requests. They don't
42-
have to relate to an existing tenant. However they must be part
43-
of the capsule-user groups.
44+
description: |-
45+
Subjects that should receive additional permissions.
46+
The subjects are selected based on the oncoming requests. They don't have to relate to an existing tenant.
47+
However they must be part of the capsule-user groups.
4448
items:
4549
properties:
4650
clusterResources:
@@ -75,35 +79,33 @@ spec:
7579
type: string
7680
type: array
7781
selector:
78-
description: Select all cluster scoped resources with
79-
the given label selector. Defining a selector which
80-
does not match any resources is considered not selectable
81-
(eg. using operation NotExists).
82+
description: |-
83+
Select all cluster scoped resources with the given label selector.
84+
Defining a selector which does not match any resources is considered not selectable (eg. using operation NotExists).
8285
properties:
8386
matchExpressions:
8487
description: matchExpressions is a list of label selector
8588
requirements. The requirements are ANDed.
8689
items:
87-
description: A label selector requirement is a selector
88-
that contains values, a key, and an operator that
90+
description: |-
91+
A label selector requirement is a selector that contains values, a key, and an operator that
8992
relates the key and values.
9093
properties:
9194
key:
9295
description: key is the label key that the selector
9396
applies to.
9497
type: string
9598
operator:
96-
description: operator represents a key's relationship
97-
to a set of values. Valid operators are In,
98-
NotIn, Exists and DoesNotExist.
99+
description: |-
100+
operator represents a key's relationship to a set of values.
101+
Valid operators are In, NotIn, Exists and DoesNotExist.
99102
type: string
100103
values:
101-
description: values is an array of string values.
102-
If the operator is In or NotIn, the values
103-
array must be non-empty. If the operator is
104-
Exists or DoesNotExist, the values array must
105-
be empty. This array is replaced during a
106-
strategic merge patch.
104+
description: |-
105+
values is an array of string values. If the operator is In or NotIn,
106+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
107+
the values array must be empty. This array is replaced during a strategic
108+
merge patch.
107109
items:
108110
type: string
109111
type: array
@@ -117,13 +119,13 @@ spec:
117119
matchLabels:
118120
additionalProperties:
119121
type: string
120-
description: matchLabels is a map of {key,value} pairs.
121-
A single {key,value} in the matchLabels map is equivalent
122-
to an element of matchExpressions, whose key field
123-
is "key", the operator is "In", and the values array
124-
contains only "value". The requirements are ANDed.
122+
description: |-
123+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
124+
map is equivalent to an element of matchExpressions, whose key field is "key", the
125+
operator is "In", and the values array contains only "value". The requirements are ANDed.
125126
type: object
126127
type: object
128+
x-kubernetes-map-type: atomic
127129
required:
128130
- apiGroups
129131
- operations
@@ -132,10 +134,10 @@ spec:
132134
type: object
133135
type: array
134136
subjects:
135-
description: Subjects that should receive additional permissions.
136-
The subjects are selected based on the oncoming requests.
137-
They don't have to relate to an existing tenant. However they
138-
must be part of the capsule-user groups.
137+
description: |-
138+
Subjects that should receive additional permissions.
139+
The subjects are selected based on the oncoming requests. They don't have to relate to an existing tenant.
140+
However they must be part of the capsule-user groups.
139141
items:
140142
properties:
141143
kind:
@@ -167,9 +169,3 @@ spec:
167169
storage: true
168170
subresources:
169171
status: {}
170-
status:
171-
acceptedNames:
172-
kind: ""
173-
plural: ""
174-
conditions: []
175-
storedVersions: []

‎charts/capsule-proxy/crds/capsule.clastix.io_proxysettings.yaml

+33-37
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.16.3
87
name: proxysettings.capsule.clastix.io
98
spec:
109
group: capsule.clastix.io
@@ -21,21 +20,26 @@ spec:
2120
description: ProxySetting is the Schema for the proxysettings API.
2221
properties:
2322
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2728
type: string
2829
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3236
type: string
3337
metadata:
3438
type: object
3539
spec:
36-
description: ProxySettingSpec defines the additional Capsule Proxy settings
37-
for additional users of the Tenant. Resource is Namespace-scoped and
38-
applies the settings to the belonged Tenant.
40+
description: |-
41+
ProxySettingSpec defines the additional Capsule Proxy settings for additional users of the Tenant.
42+
Resource is Namespace-scoped and applies the settings to the belonged Tenant.
3943
properties:
4044
subjects:
4145
description: Subjects that should receive additional permissions.
@@ -73,35 +77,33 @@ spec:
7377
type: string
7478
type: array
7579
selector:
76-
description: Select all cluster scoped resources with
77-
the given label selector. Defining a selector which
78-
does not match any resources is considered not selectable
79-
(eg. using operation NotExists).
80+
description: |-
81+
Select all cluster scoped resources with the given label selector.
82+
Defining a selector which does not match any resources is considered not selectable (eg. using operation NotExists).
8083
properties:
8184
matchExpressions:
8285
description: matchExpressions is a list of label selector
8386
requirements. The requirements are ANDed.
8487
items:
85-
description: A label selector requirement is a selector
86-
that contains values, a key, and an operator that
88+
description: |-
89+
A label selector requirement is a selector that contains values, a key, and an operator that
8790
relates the key and values.
8891
properties:
8992
key:
9093
description: key is the label key that the selector
9194
applies to.
9295
type: string
9396
operator:
94-
description: operator represents a key's relationship
95-
to a set of values. Valid operators are In,
96-
NotIn, Exists and DoesNotExist.
97+
description: |-
98+
operator represents a key's relationship to a set of values.
99+
Valid operators are In, NotIn, Exists and DoesNotExist.
97100
type: string
98101
values:
99-
description: values is an array of string values.
100-
If the operator is In or NotIn, the values
101-
array must be non-empty. If the operator is
102-
Exists or DoesNotExist, the values array must
103-
be empty. This array is replaced during a
104-
strategic merge patch.
102+
description: |-
103+
values is an array of string values. If the operator is In or NotIn,
104+
the values array must be non-empty. If the operator is Exists or DoesNotExist,
105+
the values array must be empty. This array is replaced during a strategic
106+
merge patch.
105107
items:
106108
type: string
107109
type: array
@@ -115,13 +117,13 @@ spec:
115117
matchLabels:
116118
additionalProperties:
117119
type: string
118-
description: matchLabels is a map of {key,value} pairs.
119-
A single {key,value} in the matchLabels map is equivalent
120-
to an element of matchExpressions, whose key field
121-
is "key", the operator is "In", and the values array
122-
contains only "value". The requirements are ANDed.
120+
description: |-
121+
matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
122+
map is equivalent to an element of matchExpressions, whose key field is "key", the
123+
operator is "In", and the values array contains only "value". The requirements are ANDed.
123124
type: object
124125
type: object
126+
x-kubernetes-map-type: atomic
125127
required:
126128
- apiGroups
127129
- operations
@@ -178,9 +180,3 @@ spec:
178180
type: object
179181
served: true
180182
storage: true
181-
status:
182-
acceptedNames:
183-
kind: ""
184-
plural: ""
185-
conditions: []
186-
storedVersions: []

‎e2e/kind.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: kind.x-k8s.io/v1alpha4
22
kind: Cluster
3-
#networking:
4-
# apiServerAddress: "127.0.0.1"
5-
# apiServerPort: 6443
3+
# networking:
4+
# apiServerAddress: "127.0.0.1"
5+
# apiServerPort: 6443
66
nodes:
77
- role: control-plane
88
- role: worker

0 commit comments

Comments
 (0)
Please sign in to comment.