summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-20 13:18:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-20 13:18:24 +0000
commit0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch)
tree4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /vendor
parent744144d28e3e7fddc117924fef88de5d9674fe4c (diff)
downloadgitlab-ce-0653e08efd039a5905f3fa4f6e9cef9f5d2f799c.tar.gz
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'vendor')
-rw-r--r--vendor/assets/javascripts/jasmine-jquery.js854
-rw-r--r--vendor/aws/cloudformation/eks_cluster.yaml14
-rw-r--r--vendor/project_templates/cluster_management.tar.gzbin12981 -> 14062 bytes
3 files changed, 7 insertions, 861 deletions
diff --git a/vendor/assets/javascripts/jasmine-jquery.js b/vendor/assets/javascripts/jasmine-jquery.js
deleted file mode 100644
index a1f1e892c57..00000000000
--- a/vendor/assets/javascripts/jasmine-jquery.js
+++ /dev/null
@@ -1,854 +0,0 @@
-/* eslint-disable */
-/*
- Jasmine JQuery 3.0 patched version from this fork : https://github.com/cmrd-senya/jasmine-jquery/blob/jquery3/lib/jasmine-jquery.js
-*/
-/*!
-Jasmine-jQuery: a set of jQuery helpers for Jasmine tests.
-
-Version 2.1.1
-
-https://github.com/velesin/jasmine-jquery
-
-Copyright (c) 2010-2014 Wojciech Zawistowski, Travis Jeffery
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-(function (root, factory) {
- if (typeof module !== 'undefined' && module.exports) {
- // The line below is patched from jquery => jquery/dist/jquery
- // in order to load a jQuery with ajax, so that this testing library
- // doesn't break
- factory(root, root.jasmine, require('jquery/dist/jquery'));
- } else {
- factory(root, root.jasmine, root.jQuery);
- }
-}((function() {return this; })(), function (window, jasmine, $) { "use strict";
-
- jasmine.spiedEventsKey = function (selector, eventName) {
- for(var i = 0;; i++) {
- var key = [eventName, i].toString()
- if (data.spiedEvents[key] === undefined || data.spiedEvents[key].selector.is($(selector))) {
- return key
- }
- }
- }
-
- jasmine.getFixtures = function () {
- return jasmine.currentFixtures_ = jasmine.currentFixtures_ || new jasmine.Fixtures()
- }
-
- jasmine.getStyleFixtures = function () {
- return jasmine.currentStyleFixtures_ = jasmine.currentStyleFixtures_ || new jasmine.StyleFixtures()
- }
-
- jasmine.Fixtures = function () {
- this.containerId = 'jasmine-fixtures'
- this.fixturesCache_ = {}
- this.fixturesPath = 'spec/javascripts/fixtures'
- }
-
- jasmine.Fixtures.prototype.set = function (html) {
- this.cleanUp()
- return this.createContainer_(html)
- }
-
- jasmine.Fixtures.prototype.appendSet= function (html) {
- this.addToContainer_(html)
- }
-
- jasmine.Fixtures.prototype.preload = function () {
- this.read.apply(this, arguments)
- }
-
- jasmine.Fixtures.prototype.load = function () {
- this.cleanUp()
- this.createContainer_(this.read.apply(this, arguments))
- }
-
- jasmine.Fixtures.prototype.appendLoad = function () {
- this.addToContainer_(this.read.apply(this, arguments))
- }
-
- jasmine.Fixtures.prototype.read = function () {
- var htmlChunks = []
- , fixtureUrls = arguments
-
- for(var urlCount = fixtureUrls.length, urlIndex = 0; urlIndex < urlCount; urlIndex++) {
- htmlChunks.push(this.getFixtureHtml_(fixtureUrls[urlIndex]))
- }
-
- return htmlChunks.join('')
- }
-
- jasmine.Fixtures.prototype.clearCache = function () {
- this.fixturesCache_ = {}
- }
-
- jasmine.Fixtures.prototype.cleanUp = function () {
- $('#' + this.containerId).remove()
- }
-
- jasmine.Fixtures.prototype.sandbox = function (attributes) {
- var attributesToSet = attributes || {}
- return $('<div id="sandbox" />').attr(attributesToSet)
- }
-
- jasmine.Fixtures.prototype.createContainer_ = function (html) {
- var container = $('<div>')
- .attr('id', this.containerId)
- .html(html)
-
- $(document.body).append(container)
- return container
- }
-
- jasmine.Fixtures.prototype.addToContainer_ = function (html){
- var container = $(document.body).find('#'+this.containerId).append(html)
-
- if (!container.length) {
- this.createContainer_(html)
- }
- }
-
- jasmine.Fixtures.prototype.getFixtureHtml_ = function (url) {
- if (typeof this.fixturesCache_[url] === 'undefined') {
- this.loadFixtureIntoCache_(url)
- }
- return this.fixturesCache_[url]
- }
-
- jasmine.Fixtures.prototype.loadFixtureIntoCache_ = function (relativeUrl) {
- var self = this
- , url = this.makeFixtureUrl_(relativeUrl)
- , htmlText = ''
- , request = $.ajax({
- async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
- cache: false,
- url: url,
- dataType: 'html',
- success: function (data, status, $xhr) {
- htmlText = $xhr.responseText
- }
- }).fail(function ($xhr, status, err) {
- throw new Error('Fixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + err.message + ')')
- })
-
- var scripts = $($.parseHTML(htmlText, true)).find('script[src]') || [];
-
- scripts.each(function(){
- $.ajax({
- async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
- cache: false,
- dataType: 'script',
- url: $(this).attr('src'),
- success: function (data, status, $xhr) {
- htmlText += '<script>' + $xhr.responseText + '</script>'
- },
- error: function ($xhr, status, err) {
- throw new Error('Script could not be loaded: ' + url + ' (status: ' + status + ', message: ' + err.message + ')')
- }
- });
- })
-
- self.fixturesCache_[relativeUrl] = htmlText;
- }
-
- jasmine.Fixtures.prototype.makeFixtureUrl_ = function (relativeUrl){
- return this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl
- }
-
- jasmine.Fixtures.prototype.proxyCallTo_ = function (methodName, passedArguments) {
- return this[methodName].apply(this, passedArguments)
- }
-
-
- jasmine.StyleFixtures = function () {
- this.fixturesCache_ = {}
- this.fixturesNodes_ = []
- this.fixturesPath = 'spec/javascripts/fixtures'
- }
-
- jasmine.StyleFixtures.prototype.set = function (css) {
- this.cleanUp()
- this.createStyle_(css)
- }
-
- jasmine.StyleFixtures.prototype.appendSet = function (css) {
- this.createStyle_(css)
- }
-
- jasmine.StyleFixtures.prototype.preload = function () {
- this.read_.apply(this, arguments)
- }
-
- jasmine.StyleFixtures.prototype.load = function () {
- this.cleanUp()
- this.createStyle_(this.read_.apply(this, arguments))
- }
-
- jasmine.StyleFixtures.prototype.appendLoad = function () {
- this.createStyle_(this.read_.apply(this, arguments))
- }
-
- jasmine.StyleFixtures.prototype.cleanUp = function () {
- while(this.fixturesNodes_.length) {
- this.fixturesNodes_.pop().remove()
- }
- }
-
- jasmine.StyleFixtures.prototype.createStyle_ = function (html) {
- var styleText = $('<div></div>').html(html).text()
- , style = $('<style>' + styleText + '</style>')
-
- this.fixturesNodes_.push(style)
- $('head').append(style)
- }
-
- jasmine.StyleFixtures.prototype.clearCache = jasmine.Fixtures.prototype.clearCache
- jasmine.StyleFixtures.prototype.read_ = jasmine.Fixtures.prototype.read
- jasmine.StyleFixtures.prototype.getFixtureHtml_ = jasmine.Fixtures.prototype.getFixtureHtml_
- jasmine.StyleFixtures.prototype.loadFixtureIntoCache_ = jasmine.Fixtures.prototype.loadFixtureIntoCache_
- jasmine.StyleFixtures.prototype.makeFixtureUrl_ = jasmine.Fixtures.prototype.makeFixtureUrl_
- jasmine.StyleFixtures.prototype.proxyCallTo_ = jasmine.Fixtures.prototype.proxyCallTo_
-
- jasmine.getJSONFixtures = function () {
- return jasmine.currentJSONFixtures_ = jasmine.currentJSONFixtures_ || new jasmine.JSONFixtures()
- }
-
- jasmine.JSONFixtures = function () {
- this.fixturesCache_ = {}
- this.fixturesPath = 'spec/javascripts/fixtures/json'
- }
-
- jasmine.JSONFixtures.prototype.load = function () {
- this.read.apply(this, arguments)
- return this.fixturesCache_
- }
-
- jasmine.JSONFixtures.prototype.read = function () {
- var fixtureUrls = arguments
-
- for(var urlCount = fixtureUrls.length, urlIndex = 0; urlIndex < urlCount; urlIndex++) {
- this.getFixtureData_(fixtureUrls[urlIndex])
- }
-
- return this.fixturesCache_
- }
-
- jasmine.JSONFixtures.prototype.clearCache = function () {
- this.fixturesCache_ = {}
- }
-
- jasmine.JSONFixtures.prototype.getFixtureData_ = function (url) {
- if (!this.fixturesCache_[url]) this.loadFixtureIntoCache_(url)
- return this.fixturesCache_[url]
- }
-
- jasmine.JSONFixtures.prototype.loadFixtureIntoCache_ = function (relativeUrl) {
- var self = this
- , url = this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl
-
- $.ajax({
- async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
- cache: false,
- dataType: 'json',
- url: url,
- success: function (data) {
- self.fixturesCache_[relativeUrl] = data
- },
- error: function ($xhr, status, err) {
- throw new Error('JSONFixture could not be loaded: ' + url + ' (status: ' + status + ', message: ' + err.message + ')')
- }
- })
- }
-
- jasmine.JSONFixtures.prototype.proxyCallTo_ = function (methodName, passedArguments) {
- return this[methodName].apply(this, passedArguments)
- }
-
- jasmine.jQuery = function () {}
-
- jasmine.jQuery.browserTagCaseIndependentHtml = function (html) {
- return $('<div/>').append(html).html()
- }
-
- jasmine.jQuery.elementToString = function (element) {
- return $(element).map(function () { return this.outerHTML; }).toArray().join(', ')
- }
-
- var data = {
- spiedEvents: {}
- , handlers: []
- }
-
- jasmine.jQuery.events = {
- spyOn: function (selector, eventName) {
- var handler = function (e) {
- var calls = (typeof data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] !== 'undefined') ? data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)].calls : 0
- data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = {
- selector: $(selector),
- args: jasmine.util.argsToArray(arguments),
- calls: ++calls
- }
- }
-
- $(selector).on(eventName, handler)
- data.handlers.push(handler)
-
- return {
- selector: selector,
- eventName: eventName,
- handler: handler,
- reset: function (){
- delete data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
- },
- calls: {
- count: function () {
- return data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] ?
- data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)].calls : 0;
- },
- any: function () {
- return data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] ?
- !!data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)].calls : false;
- }
- }
- }
- },
-
- args: function (selector, eventName) {
- var actualArgs = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)].args
-
- if (!actualArgs) {
- throw "There is no spy for " + eventName + " on " + selector.toString() + ". Make sure to create a spy using spyOnEvent."
- }
-
- return actualArgs
- },
-
- wasTriggered: function (selector, eventName) {
- return !!(data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)])
- },
-
- wasTriggeredWith: function (selector, eventName, expectedArgs, util, customEqualityTesters) {
- var actualArgs = jasmine.jQuery.events.args(selector, eventName).slice(1)
-
- if (Object.prototype.toString.call(expectedArgs) !== '[object Array]')
- actualArgs = actualArgs[0]
-
- return util.equals(actualArgs, expectedArgs, customEqualityTesters)
- },
-
- wasPrevented: function (selector, eventName) {
- var spiedEvent = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
- , args = (jasmine.util.isUndefined(spiedEvent)) ? {} : spiedEvent.args
- , e = args ? args[0] : undefined
-
- return e && e.isDefaultPrevented()
- },
-
- wasStopped: function (selector, eventName) {
- var spiedEvent = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)]
- , args = (jasmine.util.isUndefined(spiedEvent)) ? {} : spiedEvent.args
- , e = args ? args[0] : undefined
-
- return e && e.isPropagationStopped()
- },
-
- cleanUp: function () {
- data.spiedEvents = {}
- data.handlers = []
- }
- }
-
- var hasProperty = function (actualValue, expectedValue) {
- if (expectedValue === undefined)
- return actualValue !== undefined
-
- return actualValue === expectedValue
- }
-
- beforeEach(function () {
- jasmine.addMatchers({
- toHaveClass: function () {
- return {
- compare: function (actual, className) {
- return { pass: $(actual).hasClass(className) }
- }
- }
- },
-
- toHaveCss: function () {
- return {
- compare: function (actual, css) {
- var stripCharsRegex = /[\s;\"\']/g
- for (var prop in css) {
- var value = css[prop]
- // see issue #147 on gh
- ;if ((value === 'auto') && ($(actual).get(0).style[prop] === 'auto')) continue
- var actualStripped = $(actual).css(prop).replace(stripCharsRegex, '')
- var valueStripped = value.replace(stripCharsRegex, '')
- if (actualStripped !== valueStripped) return { pass: false }
- }
- return { pass: true }
- }
- }
- },
-
- toBeVisible: function () {
- return {
- compare: function (actual) {
- return { pass: $(actual).is(':visible') }
- }
- }
- },
-
- toBeHidden: function () {
- return {
- compare: function (actual) {
- return { pass: $(actual).is(':hidden') }
- }
- }
- },
-
- toBeSelected: function () {
- return {
- compare: function (actual) {
- return { pass: $(actual).is(':selected') }
- }
- }
- },
-
- toBeChecked: function () {
- return {
- compare: function (actual) {
- return { pass: $(actual).is(':checked') }
- }
- }
- },
-
- toBeEmpty: function () {
- return {
- compare: function (actual) {
- return { pass: $(actual).is(':empty') }
- }
- }
- },
-
- toBeInDOM: function () {
- return {
- compare: function (actual) {
- return { pass: $.contains(document.documentElement, $(actual)[0]) }
- }
- }
- },
-
- toExist: function () {
- return {
- compare: function (actual) {
- return { pass: $(actual).length }
- }
- }
- },
-
- toHaveLength: function () {
- return {
- compare: function (actual, length) {
- return { pass: $(actual).length === length }
- }
- }
- },
-
- toHaveAttr: function () {
- return {
- compare: function (actual, attributeName, expectedAttributeValue) {
- return { pass: hasProperty($(actual).attr(attributeName), expectedAttributeValue) }
- }
- }
- },
-
- toHaveProp: function () {
- return {
- compare: function (actual, propertyName, expectedPropertyValue) {
- return { pass: hasProperty($(actual).prop(propertyName), expectedPropertyValue) }
- }
- }
- },
-
- toHaveId: function () {
- return {
- compare: function (actual, id) {
- return { pass: $(actual).attr('id') == id }
- }
- }
- },
-
- toHaveHtml: function () {
- return {
- compare: function (actual, html) {
- return { pass: $(actual).html() == jasmine.jQuery.browserTagCaseIndependentHtml(html) }
- }
- }
- },
-
- toContainHtml: function () {
- return {
- compare: function (actual, html) {
- var actualHtml = $(actual).html()
- , expectedHtml = jasmine.jQuery.browserTagCaseIndependentHtml(html)
-
- return { pass: (actualHtml.indexOf(expectedHtml) >= 0) }
- }
- }
- },
-
- toHaveText: function () {
- return {
- compare: function (actual, text) {
- var actualText = $(actual).text()
- var trimmedText = $.trim(actualText)
-
- if (text && $.isFunction(text.test)) {
- return { pass: text.test(actualText) || text.test(trimmedText) }
- } else {
- return { pass: (actualText == text || trimmedText == text) }
- }
- }
- }
- },
-
- toContainText: function () {
- return {
- compare: function (actual, text) {
- var trimmedText = $.trim($(actual).text())
-
- if (text && $.isFunction(text.test)) {
- return { pass: text.test(trimmedText) }
- } else {
- return { pass: trimmedText.indexOf(text) != -1 }
- }
- }
- }
- },
-
- toHaveValue: function () {
- return {
- compare: function (actual, value) {
- return { pass: $(actual).val() === value }
- }
- }
- },
-
- toHaveData: function () {
- return {
- compare: function (actual, key, expectedValue) {
- return { pass: hasProperty($(actual).data(key), expectedValue) }
- }
- }
- },
-
- toContainElement: function () {
- return {
- compare: function (actual, selector) {
- return { pass: $(actual).find(selector).length }
- }
- }
- },
-
- toBeMatchedBy: function () {
- return {
- compare: function (actual, selector) {
- return { pass: $(actual).filter(selector).length }
- }
- }
- },
-
- toBeDisabled: function () {
- return {
- compare: function (actual, selector) {
- return { pass: $(actual).is(':disabled') }
- }
- }
- },
-
- toBeFocused: function (selector) {
- return {
- compare: function (actual, selector) {
- return { pass: $(actual)[0] === $(actual)[0].ownerDocument.activeElement }
- }
- }
- },
-
- toHandle: function () {
- return {
- compare: function (actual, event) {
- if ( !actual || actual.length === 0 ) return { pass: false };
- var events = $._data($(actual).get(0), "events")
-
- if (!events || !event || typeof event !== "string") {
- return { pass: false }
- }
-
- var namespaces = event.split(".")
- , eventType = namespaces.shift()
- , sortedNamespaces = namespaces.slice(0).sort()
- , namespaceRegExp = new RegExp("(^|\\.)" + sortedNamespaces.join("\\.(?:.*\\.)?") + "(\\.|$)")
-
- if (events[eventType] && namespaces.length) {
- for (var i = 0; i < events[eventType].length; i++) {
- var namespace = events[eventType][i].namespace
-
- if (namespaceRegExp.test(namespace))
- return { pass: true }
- }
- } else {
- return { pass: (events[eventType] && events[eventType].length > 0) }
- }
-
- return { pass: false }
- }
- }
- },
-
- toHandleWith: function () {
- return {
- compare: function (actual, eventName, eventHandler) {
- if ( !actual || actual.length === 0 ) return { pass: false };
- var normalizedEventName = eventName.split('.')[0]
- , stack = $._data($(actual).get(0), "events")[normalizedEventName]
-
- for (var i = 0; i < stack.length; i++) {
- if (stack[i].handler == eventHandler) return { pass: true }
- }
-
- return { pass: false }
- }
- }
- },
-
- toHaveBeenTriggeredOn: function () {
- return {
- compare: function (actual, selector) {
- var result = { pass: jasmine.jQuery.events.wasTriggered(selector, actual) }
-
- result.message = result.pass ?
- "Expected event " + $(actual) + " not to have been triggered on " + selector :
- "Expected event " + $(actual) + " to have been triggered on " + selector
-
- return result;
- }
- }
- },
-
- toHaveBeenTriggered: function (){
- return {
- compare: function (actual) {
- var eventName = actual.eventName
- , selector = actual.selector
- , result = { pass: jasmine.jQuery.events.wasTriggered(selector, eventName) }
-
- result.message = result.pass ?
- "Expected event " + eventName + " not to have been triggered on " + selector :
- "Expected event " + eventName + " to have been triggered on " + selector
-
- return result
- }
- }
- },
-
- toHaveBeenTriggeredOnAndWith: function (j$, customEqualityTesters) {
- return {
- compare: function (actual, selector, expectedArgs) {
- var wasTriggered = jasmine.jQuery.events.wasTriggered(selector, actual)
- , result = { pass: wasTriggered && jasmine.jQuery.events.wasTriggeredWith(selector, actual, expectedArgs, j$, customEqualityTesters) }
-
- if (wasTriggered) {
- var actualArgs = jasmine.jQuery.events.args(selector, actual, expectedArgs)[1]
- result.message = result.pass ?
- "Expected event " + actual + " not to have been triggered with " + jasmine.pp(expectedArgs) + " but it was triggered with " + jasmine.pp(actualArgs) :
- "Expected event " + actual + " to have been triggered with " + jasmine.pp(expectedArgs) + " but it was triggered with " + jasmine.pp(actualArgs)
-
- } else {
- // todo check on this
- result.message = result.pass ?
- "Expected event " + actual + " not to have been triggered on " + selector :
- "Expected event " + actual + " to have been triggered on " + selector
- }
-
- return result
- }
- }
- },
-
- toHaveBeenPreventedOn: function () {
- return {
- compare: function (actual, selector) {
- var result = { pass: jasmine.jQuery.events.wasPrevented(selector, actual) }
-
- result.message = result.pass ?
- "Expected event " + actual + " not to have been prevented on " + selector :
- "Expected event " + actual + " to have been prevented on " + selector
-
- return result
- }
- }
- },
-
- toHaveBeenPrevented: function () {
- return {
- compare: function (actual) {
- var eventName = actual.eventName
- , selector = actual.selector
- , result = { pass: jasmine.jQuery.events.wasPrevented(selector, eventName) }
-
- result.message = result.pass ?
- "Expected event " + eventName + " not to have been prevented on " + selector :
- "Expected event " + eventName + " to have been prevented on " + selector
-
- return result
- }
- }
- },
-
- toHaveBeenStoppedOn: function () {
- return {
- compare: function (actual, selector) {
- var result = { pass: jasmine.jQuery.events.wasStopped(selector, actual) }
-
- result.message = result.pass ?
- "Expected event " + actual + " not to have been stopped on " + selector :
- "Expected event " + actual + " to have been stopped on " + selector
-
- return result;
- }
- }
- },
-
- toHaveBeenStopped: function () {
- return {
- compare: function (actual) {
- var eventName = actual.eventName
- , selector = actual.selector
- , result = { pass: jasmine.jQuery.events.wasStopped(selector, eventName) }
-
- result.message = result.pass ?
- "Expected event " + eventName + " not to have been stopped on " + selector :
- "Expected event " + eventName + " to have been stopped on " + selector
-
- return result
- }
- }
- }
- })
-
- jasmine.getEnv().addCustomEqualityTester(function(a, b) {
- if (a && b) {
- if (a instanceof $ || jasmine.isDomNode(a)) {
- var $a = $(a)
-
- if (b instanceof $)
- return $a.length == b.length && a.is(b)
-
- return $a.is(b);
- }
-
- if (b instanceof $ || jasmine.isDomNode(b)) {
- var $b = $(b)
-
- if (a instanceof $)
- return a.length == $b.length && $b.is(a)
-
- return $(b).is(a);
- }
- }
- })
-
- jasmine.getEnv().addCustomEqualityTester(function (a, b) {
- if (a instanceof $ && b instanceof $ && a.size() == b.size())
- return a.is(b)
- })
- })
-
- afterEach(function () {
- jasmine.getFixtures().cleanUp()
- jasmine.getStyleFixtures().cleanUp()
- jasmine.jQuery.events.cleanUp()
- })
-
- window.readFixtures = function () {
- return jasmine.getFixtures().proxyCallTo_('read', arguments)
- }
-
- window.preloadFixtures = function () {
- jasmine.getFixtures().proxyCallTo_('preload', arguments)
- }
-
- window.loadFixtures = function () {
- jasmine.getFixtures().proxyCallTo_('load', arguments)
- }
-
- window.appendLoadFixtures = function () {
- jasmine.getFixtures().proxyCallTo_('appendLoad', arguments)
- }
-
- window.setFixtures = function (html) {
- return jasmine.getFixtures().proxyCallTo_('set', arguments)
- }
-
- window.appendSetFixtures = function () {
- jasmine.getFixtures().proxyCallTo_('appendSet', arguments)
- }
-
- window.sandbox = function (attributes) {
- return jasmine.getFixtures().sandbox(attributes)
- }
-
- window.spyOnEvent = function (selector, eventName) {
- return jasmine.jQuery.events.spyOn(selector, eventName)
- }
-
- window.preloadStyleFixtures = function () {
- jasmine.getStyleFixtures().proxyCallTo_('preload', arguments)
- }
-
- window.loadStyleFixtures = function () {
- jasmine.getStyleFixtures().proxyCallTo_('load', arguments)
- }
-
- window.appendLoadStyleFixtures = function () {
- jasmine.getStyleFixtures().proxyCallTo_('appendLoad', arguments)
- }
-
- window.setStyleFixtures = function (html) {
- jasmine.getStyleFixtures().proxyCallTo_('set', arguments)
- }
-
- window.appendSetStyleFixtures = function (html) {
- jasmine.getStyleFixtures().proxyCallTo_('appendSet', arguments)
- }
-
- window.loadJSONFixtures = function () {
- return jasmine.getJSONFixtures().proxyCallTo_('load', arguments)
- }
-
- window.getJSONFixture = function (url) {
- return jasmine.getJSONFixtures().proxyCallTo_('read', arguments)[url]
- }
-}));
diff --git a/vendor/aws/cloudformation/eks_cluster.yaml b/vendor/aws/cloudformation/eks_cluster.yaml
index 5ad25dcd533..8d93734fd46 100644
--- a/vendor/aws/cloudformation/eks_cluster.yaml
+++ b/vendor/aws/cloudformation/eks_cluster.yaml
@@ -7,13 +7,13 @@ Parameters:
KubernetesVersion:
Description: The Kubernetes version to install
Type: String
- Default: 1.19
+ Default: "1.20"
AllowedValues:
- - 1.15
- - 1.16
- - 1.17
- - 1.18
- - 1.19
+ - "1.16"
+ - "1.17"
+ - "1.18"
+ - "1.19"
+ - "1.20"
KeyName:
Description: The EC2 Key Pair to allow SSH access to the node instances
@@ -21,7 +21,7 @@ Parameters:
NodeImageIdSSMParam:
Type: "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>"
- Default: /aws/service/eks/optimized-ami/1.15/amazon-linux-2/recommended/image_id
+ Default: /aws/service/eks/optimized-ami/1.17/amazon-linux-2/recommended/image_id
Description: AWS Systems Manager Parameter Store parameter of the AMI ID for the worker node instances.
NodeInstanceType:
diff --git a/vendor/project_templates/cluster_management.tar.gz b/vendor/project_templates/cluster_management.tar.gz
index a7ed11e7ce3..9b168724c79 100644
--- a/vendor/project_templates/cluster_management.tar.gz
+++ b/vendor/project_templates/cluster_management.tar.gz
Binary files differ