Skip to content

Commit ddbadb7

Browse files
sbuliarcasbuliarca
authored
Merge pull request #4 from utilitywarehouse/revert-to-26
Downgrade to 2.6.1 as it doesn't require cluster wide secrets access
2 parents befb2b1 + e8d36a0 commit ddbadb7

File tree

3 files changed

+29
-160
lines changed

3 files changed

+29
-160
lines changed

‎cluster/crds.yaml

+19-150
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
---
12
apiVersion: apiextensions.k8s.io/v1
23
kind: CustomResourceDefinition
34
metadata:
45
annotations:
5-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.6.1
67
creationTimestamp: null
78
labels:
89
app.kubernetes.io/part-of: keda-operator
9-
app.kubernetes.io/version: 2.7.1
10+
app.kubernetes.io/version: 2.6.1
1011
name: clustertriggerauthentications.keda.sh
1112
spec:
1213
group: keda.sh
@@ -49,72 +50,6 @@ spec:
4950
spec:
5051
description: TriggerAuthenticationSpec defines the various ways to authenticate
5152
properties:
52-
azureKeyVault:
53-
description: AzureKeyVault is used to authenticate using Azure Key Vault
54-
properties:
55-
cloud:
56-
properties:
57-
activeDirectoryEndpoint:
58-
type: string
59-
keyVaultResourceURL:
60-
type: string
61-
type:
62-
type: string
63-
required:
64-
- type
65-
type: object
66-
credentials:
67-
properties:
68-
clientId:
69-
type: string
70-
clientSecret:
71-
properties:
72-
valueFrom:
73-
properties:
74-
secretKeyRef:
75-
properties:
76-
key:
77-
type: string
78-
name:
79-
type: string
80-
required:
81-
- key
82-
- name
83-
type: object
84-
required:
85-
- secretKeyRef
86-
type: object
87-
required:
88-
- valueFrom
89-
type: object
90-
tenantId:
91-
type: string
92-
required:
93-
- clientId
94-
- clientSecret
95-
- tenantId
96-
type: object
97-
secrets:
98-
items:
99-
properties:
100-
name:
101-
type: string
102-
parameter:
103-
type: string
104-
version:
105-
type: string
106-
required:
107-
- name
108-
- parameter
109-
type: object
110-
type: array
111-
vaultUri:
112-
type: string
113-
required:
114-
- credentials
115-
- secrets
116-
- vaultUri
117-
type: object
11853
env:
11954
items:
12055
description: AuthEnvironment is used to authenticate using environment variables in the destination ScaleTarget spec
@@ -216,11 +151,11 @@ apiVersion: apiextensions.k8s.io/v1
216151
kind: CustomResourceDefinition
217152
metadata:
218153
annotations:
219-
controller-gen.kubebuilder.io/version: v0.8.0
154+
controller-gen.kubebuilder.io/version: v0.6.1
220155
creationTimestamp: null
221156
labels:
222157
app.kubernetes.io/part-of: keda-operator
223-
app.kubernetes.io/version: 2.7.1
158+
app.kubernetes.io/version: 2.6.1
224159
name: scaledjobs.keda.sh
225160
spec:
226161
group: keda.sh
@@ -3455,7 +3390,7 @@ spec:
34553390
description: TopologyKey is the key of node labels. Nodes that have a label with this key and identical values are considered to be in the same topology. We consider each <key, value> as a "bucket", and try to put balanced number of pods into each bucket. It's a required field.
34563391
type: string
34573392
whenUnsatisfiable:
3458-
description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it. - ScheduleAnyway tells the scheduler to schedule the pod in any location, but giving higher precedence to topologies that would help reduce the skew. A constraint is considered "Unsatisfiable" for an incoming pod if and only if every possible node assignment for that pod would violate "MaxSkew" on some topology. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler won''t make it *more* imbalanced. It''s a required field.'
3393+
description: 'WhenUnsatisfiable indicates how to deal with a pod if it doesn''t satisfy the spread constraint. - DoNotSchedule (default) tells the scheduler not to schedule it. - ScheduleAnyway tells the scheduler to schedule the pod in any location, but giving higher precedence to topologies that would help reduce the skew. A constraint is considered "Unsatisfiable" for an incoming pod if and only if every possible node assignment for that pod would violate "MaxSkew" on some topology. For example, in a 3-zone cluster, MaxSkew is set to 1, and pods with the same labelSelector spread as 3/1/1: | zone1 | zone2 | zone3 | | P P P | P | P | If WhenUnsatisfiable is set to DoNotSchedule, incoming pod can only be scheduled to zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on zone2(zone3) satisfies MaxSkew(1). In other words, the cluster can still be imbalanced, but scheduler won''t make it *more* imbalanced. It''s a required field.'
34593394
type: string
34603395
required:
34613396
- maxSkew
@@ -3715,7 +3650,7 @@ spec:
37153650
x-kubernetes-int-or-string: true
37163651
type: object
37173652
ephemeral:
3718-
description: "Ephemeral represents a volume that is handled by a cluster storage driver. The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts, and deleted when the pod is removed. \n Use this if: a) the volume is only needed while the pod runs, b) features of normal volumes like restoring from snapshot or capacity tracking are needed, c) the storage driver is specified through a storage class, and d) the storage driver supports dynamic volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource for more information on the connection between this volume type and PersistentVolumeClaim). \n Use PersistentVolumeClaim or one of the vendor-specific APIs for volumes that persist for longer than the lifecycle of an individual pod. \n Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to be used that way - see the documentation of the driver for more information. \n A pod can use both types of ephemeral volumes and persistent volumes at the same time."
3653+
description: "Ephemeral represents a volume that is handled by a cluster storage driver. The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts, and deleted when the pod is removed. \n Use this if: a) the volume is only needed while the pod runs, b) features of normal volumes like restoring from snapshot or capacity tracking are needed, c) the storage driver is specified through a storage class, and d) the storage driver supports dynamic volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource for more information on the connection between this volume type and PersistentVolumeClaim). \n Use PersistentVolumeClaim or one of the vendor-specific APIs for volumes that persist for longer than the lifecycle of an individual pod. \n Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to be used that way - see the documentation of the driver for more information. \n A pod can use both types of ephemeral volumes and persistent volumes at the same time."
37193654
properties:
37203655
volumeClaimTemplate:
37213656
description: "Will be used to create a stand-alone PVC to provision the volume. The pod in which this EphemeralVolumeSource is embedded will be the owner of the PVC, i.e. the PVC will be deleted together with the pod. The name of the PVC will be `<pod name>-<volume name>` where `<volume name>` is the name from the `PodSpec.Volumes` array entry. Pod validation will reject the pod if the concatenated name is not valid for a PVC (for example, too long). \n An existing PVC with that name that is not owned by the pod will *not* be used for the pod to avoid using an unrelated volume by mistake. Starting the pod is then blocked until the unrelated PVC is removed. If such a pre-created PVC is meant to be used by the pod, the PVC has to updated with an owner reference to the pod once the pod exists. Normally this should not be necessary, but it may be useful when manually reconstructing a broken cluster. \n This field is read-only and no changes will be made by Kubernetes to the PVC after it has been created. \n Required, must not be nil."
@@ -3748,7 +3683,7 @@ spec:
37483683
- name
37493684
type: object
37503685
dataSourceRef:
3751-
description: 'Specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any local object from a non-empty API group (non core object) or a PersistentVolumeClaim object. When this field is specified, volume binding will only succeed if the type of the specified object matches some installed volume populator or dynamic provisioner. This field will replace the functionality of the DataSource field and as such if both fields are non-empty, they must have the same value. For backwards compatibility, both fields (DataSource and DataSourceRef) will be set to the same value automatically if one of them is empty and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, DataSourceRef allows any non-core object, as well as PersistentVolumeClaim objects. * While DataSource ignores disallowed values (dropping them), DataSourceRef preserves all values, and generates an error if a disallowed value is specified. (Alpha) Using this field requires the AnyVolumeDataSource feature gate to be enabled.'
3686+
description: 'Specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any local object from a non-empty API group (non core object) or a PersistentVolumeClaim object. When this field is specified, volume binding will only succeed if the type of the specified object matches some installed volume populator or dynamic provisioner. This field will replace the functionality of the DataSource field and as such if both fields are non-empty, they must have the same value. For backwards compatibility, both fields (DataSource and DataSourceRef) will be set to the same value automatically if one of them is empty and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, DataSourceRef allows any non-core object, as well as PersistentVolumeClaim objects. * While DataSource ignores disallowed values (dropping them), DataSourceRef preserves all values, and generates an error if a disallowed value is specified. (Alpha) Using this field requires the AnyVolumeDataSource feature gate to be enabled.'
37523687
properties:
37533688
apiGroup:
37543689
description: APIGroup is the group for the resource being referenced. If APIGroup is not specified, the specified Kind must be in the core API group. For any other third-party types, APIGroup is required.
@@ -4437,6 +4372,9 @@ spec:
44374372
required:
44384373
- name
44394374
type: object
4375+
fallback:
4376+
format: int32
4377+
type: integer
44404378
metadata:
44414379
additionalProperties:
44424380
type: string
@@ -4499,11 +4437,11 @@ apiVersion: apiextensions.k8s.io/v1
44994437
kind: CustomResourceDefinition
45004438
metadata:
45014439
annotations:
4502-
controller-gen.kubebuilder.io/version: v0.8.0
4440+
controller-gen.kubebuilder.io/version: v0.6.1
45034441
creationTimestamp: null
45044442
labels:
45054443
app.kubernetes.io/part-of: keda-operator
4506-
app.kubernetes.io/version: 2.7.1
4444+
app.kubernetes.io/version: 2.6.1
45074445
name: scaledobjects.keda.sh
45084446
spec:
45094447
group: keda.sh
@@ -4606,7 +4544,7 @@ spec:
46064544
type: integer
46074545
type: object
46084546
scaleUp:
4609-
description: 'scaleUp is scaling policy for scaling Up. If not set, the default value is the higher of: * increase no more than 4 pods per 60 seconds * double the number of pods per 60 seconds No stabilization is used.'
4547+
description: 'scaleUp is scaling policy for scaling Up. If not set, the default value is the higher of: * increase no more than 4 pods per 60 seconds * double the number of pods per 60 seconds No stabilization is used.'
46104548
properties:
46114549
policies:
46124550
description: policies is a list of potential scaling polices which can be used during scaling. At least one policy must be specified, otherwise the HPAScalingRules will be discarded as invalid
@@ -4700,13 +4638,13 @@ spec:
47004638
required:
47014639
- name
47024640
type: object
4641+
fallback:
4642+
format: int32
4643+
type: integer
47034644
metadata:
47044645
additionalProperties:
47054646
type: string
47064647
type: object
4707-
metricType:
4708-
description: MetricTargetType specifies the type of metric being targeted, and should be either "Value", "AverageValue", or "Utilization"
4709-
type: string
47104648
name:
47114649
type: string
47124650
type:
@@ -4767,9 +4705,6 @@ spec:
47674705
originalReplicaCount:
47684706
format: int32
47694707
type: integer
4770-
pausedReplicaCount:
4771-
format: int32
4772-
type: integer
47734708
resourceMetricNames:
47744709
items:
47754710
type: string
@@ -4812,11 +4747,11 @@ apiVersion: apiextensions.k8s.io/v1
48124747
kind: CustomResourceDefinition
48134748
metadata:
48144749
annotations:
4815-
controller-gen.kubebuilder.io/version: v0.8.0
4750+
controller-gen.kubebuilder.io/version: v0.6.1
48164751
creationTimestamp: null
48174752
labels:
48184753
app.kubernetes.io/part-of: keda-operator
4819-
app.kubernetes.io/version: 2.7.1
4754+
app.kubernetes.io/version: 2.6.1
48204755
name: triggerauthentications.keda.sh
48214756
spec:
48224757
group: keda.sh
@@ -4859,72 +4794,6 @@ spec:
48594794
spec:
48604795
description: TriggerAuthenticationSpec defines the various ways to authenticate
48614796
properties:
4862-
azureKeyVault:
4863-
description: AzureKeyVault is used to authenticate using Azure Key Vault
4864-
properties:
4865-
cloud:
4866-
properties:
4867-
activeDirectoryEndpoint:
4868-
type: string
4869-
keyVaultResourceURL:
4870-
type: string
4871-
type:
4872-
type: string
4873-
required:
4874-
- type
4875-
type: object
4876-
credentials:
4877-
properties:
4878-
clientId:
4879-
type: string
4880-
clientSecret:
4881-
properties:
4882-
valueFrom:
4883-
properties:
4884-
secretKeyRef:
4885-
properties:
4886-
key:
4887-
type: string
4888-
name:
4889-
type: string
4890-
required:
4891-
- key
4892-
- name
4893-
type: object
4894-
required:
4895-
- secretKeyRef
4896-
type: object
4897-
required:
4898-
- valueFrom
4899-
type: object
4900-
tenantId:
4901-
type: string
4902-
required:
4903-
- clientId
4904-
- clientSecret
4905-
- tenantId
4906-
type: object
4907-
secrets:
4908-
items:
4909-
properties:
4910-
name:
4911-
type: string
4912-
parameter:
4913-
type: string
4914-
version:
4915-
type: string
4916-
required:
4917-
- name
4918-
- parameter
4919-
type: object
4920-
type: array
4921-
vaultUri:
4922-
type: string
4923-
required:
4924-
- credentials
4925-
- secrets
4926-
- vaultUri
4927-
type: object
49284797
env:
49294798
items:
49304799
description: AuthEnvironment is used to authenticate using environment variables in the destination ScaleTarget spec

‎namespaced/metrics-apiserver/deployment.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
labels:
99
app.kubernetes.io/name: keda-metrics-apiserver
1010
app.kubernetes.io/part-of: keda-operator
11-
app.kubernetes.io/version: 2.7.1
11+
app.kubernetes.io/version: 2.6.1
1212
name: keda-metrics-apiserver
1313
spec:
1414
ports:
@@ -28,7 +28,7 @@ metadata:
2828
app: keda-metrics-apiserver
2929
app.kubernetes.io/name: keda-metrics-apiserver
3030
app.kubernetes.io/part-of: keda-operator
31-
app.kubernetes.io/version: 2.7.1
31+
app.kubernetes.io/version: 2.6.1
3232
name: keda-metrics-apiserver
3333
spec:
3434
replicas: 1
@@ -52,7 +52,7 @@ spec:
5252
value: ""
5353
- name: KEDA_HTTP_DEFAULT_TIMEOUT
5454
value: ""
55-
image: ghcr.io/kedacore/keda-metrics-apiserver:2.7.1
55+
image: ghcr.io/kedacore/keda-metrics-apiserver:2.6.1
5656
imagePullPolicy: Always
5757
livenessProbe:
5858
httpGet:
@@ -89,8 +89,8 @@ spec:
8989
name: temp-vol
9090
nodeSelector:
9191
kubernetes.io/os: linux
92-
securityContext:
93-
runAsNonRoot: true
92+
# securityContext:
93+
# runAsNonRoot: true
9494
serviceAccountName: keda-metrics-apiserver
9595
volumes:
9696
- emptyDir: {}

0 commit comments

Comments
 (0)