Fix ci

streamnative · Jun 26, 2024 · 704e09d · 704e09d
1 parent 34186d5
commit 704e09d
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 40 deletions.
diff --git a/.ci/helm.sh b/.ci/helm.sh
@@ -85,7 +85,7 @@ function ci::install_pulsar_charts() {
     if [ -d "pulsar-charts" ]; then
         rm -rf pulsar-charts
     fi
-    git clone https://github.com/streamnative/charts.git pulsar-charts
+    git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
     cp ${values} pulsar-charts/charts/pulsar/mini_values.yaml
     cd pulsar-charts
     ./scripts/pulsar/prepare_helm_release.sh -n default -k sn-platform -c

diff --git a/.ci/tests/integration-oauth2/e2e.yaml b/.ci/tests/integration-oauth2/e2e.yaml
@@ -33,7 +33,7 @@ setup:
       command: |
         helm repo add streamnative https://charts.streamnative.io
         rm -rf pulsar-charts/
-        git clone https://github.com/streamnative/charts.git pulsar-charts
+        git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
         cd pulsar-charts/
         ./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c
         helm repo add grafana https://grafana.github.io/helm-charts

diff --git a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml
@@ -33,7 +33,7 @@ setup:
       command: |
         helm repo add streamnative https://charts.streamnative.io
         rm -rf pulsar-charts/
-        git clone https://github.com/streamnative/charts.git pulsar-charts
+        git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
         cd pulsar-charts/
         ./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c
         helm repo add grafana https://grafana.github.io/helm-charts

diff --git a/.ci/tests/integration/e2e.yaml b/.ci/tests/integration/e2e.yaml
@@ -39,7 +39,7 @@ setup:
       command: |
         helm repo add streamnative https://charts.streamnative.io
         rm -rf pulsar-charts/
-        git clone https://github.com/streamnative/charts.git pulsar-charts
+        git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
         cd pulsar-charts/
         ./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c
         helm repo add grafana https://grafana.github.io/helm-charts

diff --git a/.ci/tests/integration/e2e_with_tls.yaml b/.ci/tests/integration/e2e_with_tls.yaml
@@ -28,7 +28,7 @@ setup:
       command: |
         helm repo add streamnative https://charts.streamnative.io
         rm -rf pulsar-charts/
-        git clone https://github.com/streamnative/charts.git pulsar-charts
+        git clone --branch pulsar-operator-0.17.10 https://github.com/streamnative/charts.git pulsar-charts
         cd pulsar-charts/
         ./scripts/pulsar/prepare_helm_release.sh -n default -k ${PULSAR_RELEASE_NAME} -c
         helm repo add grafana https://grafana.github.io/helm-charts

diff --git a/Makefile b/Makefile
@@ -130,7 +130,7 @@ image-push:
 # find or download controller-gen
 # download controller-gen if necessary
 controller-gen:
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0)
 
 kustomize: ## Download kustomize locally if necessary.
 	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])

diff --git a/api/compute/v1alpha1/zz_generated.deepcopy.go b/api/compute/v1alpha1/zz_generated.deepcopy.go
diff --git a/...erator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functionmeshes.yaml b/...erator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functionmeshes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: functionmeshes.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io

diff --git a/...sh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functions.yaml b/...sh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-functions.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- if eq .Values.admissionWebhook.certificate.provider "cert-manager" }}
       {{- include "function-mesh-operator.certManager.annotation" . | nindent 4 -}}
     {{- end }}
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: functions.compute.functionmesh.io
 spec:
   conversion:

diff --git a/...n-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sinks.yaml b/...n-mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sinks.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- if eq .Values.admissionWebhook.certificate.provider "cert-manager" }}
       {{- include "function-mesh-operator.certManager.annotation" . | nindent 4 -}}
     {{- end }}
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: sinks.compute.functionmesh.io
 spec:
   conversion:

diff --git a/...mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sources.yaml b/...mesh-operator/charts/admission-webhook/templates/crd-compute.functionmesh.io-sources.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- if eq .Values.admissionWebhook.certificate.provider "cert-manager" }}
       {{- include "function-mesh-operator.certManager.annotation" . | nindent 4 -}}
     {{- end }}
-    controller-gen.kubebuilder.io/version: v0.9.2
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: sources.compute.functionmesh.io
 spec:
   conversion:

diff --git a/config/crd/bases/compute.functionmesh.io_functionmeshes.yaml b/config/crd/bases/compute.functionmesh.io_functionmeshes.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: functionmeshes.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io

diff --git a/config/crd/bases/compute.functionmesh.io_functions.yaml b/config/crd/bases/compute.functionmesh.io_functions.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: functions.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io

diff --git a/config/crd/bases/compute.functionmesh.io_sinks.yaml b/config/crd/bases/compute.functionmesh.io_sinks.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: sinks.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io

diff --git a/config/crd/bases/compute.functionmesh.io_sources.yaml b/config/crd/bases/compute.functionmesh.io_sources.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: sources.compute.functionmesh.io
 spec:
   group: compute.functionmesh.io

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:

diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
@@ -2,7 +2,6 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: mutating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
@@ -72,7 +71,6 @@ webhooks:
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
 - admissionReviewVersions:

diff --git a/controllers/spec/common.go b/controllers/spec/common.go
@@ -1852,24 +1852,6 @@ func getPythonSecretProviderArgs(secretMaps map[string]v1alpha1.SecretRef) []str
 	return ret
 }
 
-func getGenericSecretProviderArgs(secretMaps map[string]v1alpha1.SecretRef, language string) []string {
-	var ret []string
-	if len(secretMaps) > 0 {
-		if language == "python" {
-			ret = []string{
-				"--secrets_provider",
-				"secrets_provider.EnvironmentBasedSecretsProvider",
-			}
-		} else if language == "nodejs" {
-			ret = []string{
-				"--secrets_provider",
-				"EnvironmentBasedSecretsProvider",
-			}
-		}
-	}
-	return ret
-}
-
 func getTLSTrustCertPath(tlsVolume TLSConfig, path string) string {
 	return fmt.Sprintf("%s/%s", tlsVolume.GetMountPath(), path)
 }